diff options
| author | Xin Li <delphij@google.com> | 2016-11-09 20:36:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 20:36:11 +0000 |
| commit | 4146229e694b62cc3f91e9794cd7940aa36e8bfe (patch) | |
| tree | 11509652ecc97f0671cbce7945d5ef11da72e260 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d167a27c1f0a86e871e3743c4f93a9734493c97a (diff) | |
| parent | 503661118a881c958954d60733cfdd43a938402f (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
Change-Id: I1dc24f01552359d8cdaea875f399878fa55ea2e0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions