diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-08-23 00:21:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-23 00:21:20 +0000 |
| commit | f6f4f1ac612500d98d6695e0cf1fb0e126d4d2f1 (patch) | |
| tree | 2251ac0b710824f67ec5cf2d65a94d4a05b78de4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b352d0a45a3bc87dcf5f4139ccde6ada32ae98e6 (diff) | |
| parent | 9b2c0bf87e62ab2cc45746da09b0e7a6948a31dc (diff) | |
Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev
* changes:
Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c
Change retail mode wallpaper (1/2) am: 6c902d0453
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions