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