diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-09-21 02:26:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-21 02:26:06 +0000 |
| commit | 75c6b5005510c24867f4ee69a860ec429a64cd8e (patch) | |
| tree | 432408aed0b62bbe5b37ea86543f774599711a4c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f53d0f4925f7cfdc4459a4402ef6cdd608ac0df0 (diff) | |
| parent | 96a00297ef699e8e73721598398572c4fb51a67c (diff) | |
Merge changes from topic 'am-15128313c71649e3bd36a27ab8405fce' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev am: 3ef3f62fa5 am: 9730f8bae2
Added new config to indicate uneditable APN fields. am: 71e9ea6770 am: 49985fb986
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions