diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-01 00:50:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-01 00:50:50 +0000 |
| commit | bebe4540537c42bbdcaef88cae988bfdc40a83d6 (patch) | |
| tree | c5dfa3125d9960e10a398de0bb88fcd7daa40f8d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8fa408caae8a28fd6e643f5e2c8c8a5c070df897 (diff) | |
| parent | 79b8ebab1ef167dce2b59c8edbd5ef99f90c2c9a (diff) | |
Merge changes from topic 'am-6888cf31d8e14dab98bec7df0b9168c6' into oc-mr1-dev-plus-aosp
* changes:
Merge "Show error code in WFC error notification." into oc-dr1-dev am: d2063214a5 am: 3961ac3945
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am: 0891411cfd am: 2940beda60
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions