diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-01-06 00:54:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 00:54:34 +0000 |
| commit | 8ddd54fb384dfbba0776adef11e78aa6559a9e73 (patch) | |
| tree | edb979f2429b2ef2745ded152a6788df36f71777 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b15f21effb8d5be988bb46eea00b6ff28222aa98 (diff) | |
| parent | 08fb858f82c29467ba6e4bf1f54c56a4791b625d (diff) | |
am 08fb858f: am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
* commit '08fb858f82c29467ba6e4bf1f54c56a4791b625d':
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