diff options
| author | Michael Wright <michaelwr@google.com> | 2015-11-17 20:41:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 20:41:30 +0000 |
| commit | fe882edc12af5cbf67092e92fbce21935c996576 (patch) | |
| tree | afbb79a050b895a507271552df7904862e3b26ec /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e73f6141c52f9a68ea1371af8271a6c684e6c267 (diff) | |
| parent | 526c98cb7fa1e1bf7464e4cfe87115569d2a9dcc (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: 526c98cb7f -s ours
* commit '526c98cb7fa1e1bf7464e4cfe87115569d2a9dcc':
DO NOT MERGE. Prevent recents from coming up when in SUW
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions