diff options
| author | Selim Cinek <cinek@google.com> | 2016-10-13 14:18:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 14:18:41 +0000 |
| commit | 8f681f72200e01c48616d2b2f84fc54bc3ba88e8 (patch) | |
| tree | d56d169ee7260c56d7c40ee62025d6645f05b48a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d975003af3e5b8365b2107fc9b6029b11ca9c88e (diff) | |
| parent | 00c553e1ba009efdeb8034ad3095623fb02fab49 (diff) | |
Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours
am: 00c553e1ba -s ours
Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions