summaryrefslogtreecommitdiff
path: root/core/java/android/annotation/StringDef.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-08-14 17:07:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-14 17:07:35 -0700
commitcd63115ebc73b257a73ebf03eb3a8463532eb260 (patch)
tree870c415448905c4eadb02ea9a7d454e807c2ffeb /core/java/android/annotation/StringDef.java
parent6d59c85c09a9eaf770c342a1751b760315ccb95d (diff)
parent70e907f51f75bf8d481e11e0d6411e2974b83b06 (diff)
am 70e907f5: Merge "Prevent refocus after entering touch mode" into klp-dev
* commit '70e907f51f75bf8d481e11e0d6411e2974b83b06': Prevent refocus after entering touch mode
Diffstat (limited to 'core/java/android/annotation/StringDef.java')
0 files changed, 0 insertions, 0 deletions