diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-08-15 09:51:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-15 09:51:12 -0700 |
| commit | b3698abc3d538fde58bc21abc3acf3f0a324433c (patch) | |
| tree | e32f57729f0b9546b445b9ddbdc6d954547537f0 /core/java/android/annotation/StringDef.java | |
| parent | 50e54a5df64dac23a3caf13d8f2aa06dceca7ea5 (diff) | |
| parent | fa1225d0219e769b0c35e44f90f4ced0604304e4 (diff) | |
am fa1225d0: am 2241d45c: Merge "Root invalidation, write and grid flags, local." into klp-dev
* commit 'fa1225d0219e769b0c35e44f90f4ced0604304e4':
Root invalidation, write and grid flags, local.
Diffstat (limited to 'core/java/android/annotation/StringDef.java')
0 files changed, 0 insertions, 0 deletions