diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-01-06 00:43:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 00:43:09 +0000 |
| commit | 918866778f232ce07b1c2c2d6ea43bf5f0ce827f (patch) | |
| tree | bdca693c827ef5b3f806c8e9d2f98dfd21d16c4b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 31d73dce255db34e68ee77bba8c48541378004dd (diff) | |
| parent | 8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda (diff) | |
am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
* commit '8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda':
Data quick settings - Usage shown should take into account merged IDs.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions