diff options
| author | Xin Li <delphij@google.com> | 2016-11-09 21:26:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 21:26:57 +0000 |
| commit | 7bd6cdf057b1c68090ea5f316a1e511d5c018145 (patch) | |
| tree | f607dcc26a14e2b9d4fb2f40b78b8a31471ac693 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a732c6925752be9d7909a3e1d3f6aa2dfc6a106a (diff) | |
| parent | a29c7c77b10422e130e824fcee563fc03a6d733a (diff) | |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f am: 0326b807fa am: d478287ab9
am: a29c7c77b1
Change-Id: Id4428dfa09f0c0d24c045ce2ae2fb1abad3aaa15
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions