diff options
| author | Xin Li <delphij@google.com> | 2016-11-10 23:42:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-10 23:42:19 +0000 |
| commit | 9788dd5bd20cabbe3ff007d70841f212cce78611 (patch) | |
| tree | 643fc3ea905eaf88c9154d702117582d14e02c94 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9958eb71805bd576b655712ae9f0d66261c12419 (diff) | |
| parent | 0a568ae56e17ea68510b5831ccfefd4a1595c053 (diff) | |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours
am: 0a568ae56e
Change-Id: I49e2be8c77a13c939fe5f7bf6c16e0e80fb3bbbb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions