summaryrefslogtreecommitdiff
path: root/core/java/android/annotation/StringDef.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-08-15 09:49:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-15 09:49:37 -0700
commitfa1225d0219e769b0c35e44f90f4ced0604304e4 (patch)
tree4a3952420c993c4ed90d5f56bd0842732265e75d /core/java/android/annotation/StringDef.java
parent2b5d0264b284e8de446c20d3a61aa454bcf62066 (diff)
parent2241d45c68739e5bdf187ba3325ee237ef143e21 (diff)
am 2241d45c: Merge "Root invalidation, write and grid flags, local." into klp-dev
* commit '2241d45c68739e5bdf187ba3325ee237ef143e21': Root invalidation, write and grid flags, local.
Diffstat (limited to 'core/java/android/annotation/StringDef.java')
0 files changed, 0 insertions, 0 deletions