diff options
| author | Michael Wright <michaelwr@google.com> | 2015-11-19 03:10:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-19 03:10:13 +0000 |
| commit | 1273bc8ae4fa281186c599c4c5c18eb3b691e650 (patch) | |
| tree | 590dfa05558941d9612015df77054ffd0f22cfb1 /tools/aapt2/JavaClassGenerator_test.cpp | |
| parent | 260eec1f97bb54952c0f25c44dc5ebf1211bb7a6 (diff) | |
| parent | 1c996ff5b49d2dcfd3d9c50e41006fb70ea01947 (diff) | |
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719 am: cd00ba1a71
am: 1c996ff5b4 -s ours
* commit '1c996ff5b49d2dcfd3d9c50e41006fb70ea01947':
Diffstat (limited to 'tools/aapt2/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions