diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-08-17 18:20:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-17 18:20:17 +0000 |
| commit | b373c6e3b2c44ac8c585e63e09e35276c16cdc74 (patch) | |
| tree | 7b75c7e2b95ea1b1b159cf9ab5f9deb037f398fd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b9709340bcd8df7efce0d37e51bbc24cccfe6e52 (diff) | |
| parent | 9b4da39028fca3497fb2906df70a41676388c0eb (diff) | |
Merge changes from topic 'am-0fee4bce4d374519bf38ae18517a4d79' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am: 76c973cda0 am: 464eb12320
Support auto-downgrade to audio when data disabled. am: 86d5c3fcde am: 6c678716e4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions