diff options
author | Selim Cinek <cinek@google.com> | 2016-10-10 21:23:27 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-10 21:23:27 +0000 |
commit | 00c553e1ba009efdeb8034ad3095623fb02fab49 (patch) | |
tree | d2bf33ca76139ccc0ae8adae2818e963cf1fd81b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 93c75d07c1a9e3f798a9f7a0d5e63530034e8531 (diff) | |
parent | a0322d5c5acd0c0e94f0ef6d126810006599314b (diff) |
Merge "DO NOT MERGE - Added Emergency affordance feature"
am: a0322d5c5a -s ours
Change-Id: I9de0c5ce3ab2fb3e5c44cc518a32da1432846bbc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions