diff options
| author | Chris Tate <ctate@android.com> | 2016-05-26 00:34:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 00:34:08 +0000 |
| commit | 1964936fa8a00b79479535f14070f5be1fe19023 (patch) | |
| tree | eff62e0dcf060e080994c6c8d2b06a44397c0b83 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 14ba2e78fdef008672565901e72c46dc4fa09ae3 (diff) | |
| parent | 36a1b38e899687b217fe6e043022ed83fc37386b (diff) | |
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev
am: 36a1b38e89
* commit '36a1b38e899687b217fe6e043022ed83fc37386b':
Backport of backup transport whitelist
Change-Id: I69eec8b0c2558b00b319df0d5fa46784b08a5401
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions