diff options
| author | Xin Li <delphij@google.com> | 2016-11-09 21:02:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 21:02:08 +0000 |
| commit | ba293f3c284c9a748a6a23247c3e58d6b7c1f973 (patch) | |
| tree | 0ba0f714cb29fee480df3762d015cbc62f9d1102 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dac1d242ab1b60ac2cead7d6ca239fc4904e22c7 (diff) | |
| parent | 4c1922b441464e6ed1a7bc414f0631e3e45e4549 (diff) | |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520
am: 4c1922b441
Change-Id: Ia972df65c6ad3da624c16cbe911474560286ac3d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions