diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-25 13:18:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 13:18:13 +0000 |
| commit | 454bb8d526d998060d56c84b34e7a345ce7fa44d (patch) | |
| tree | 30b1a5497f4f7f609705fc5541e311064996767f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e629990e348c8afcca49f79dfa900ebcffce0737 (diff) | |
| parent | 88986c8887a2107480d896359569a8e188bbf083 (diff) | |
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4
am: 88986c8887
* commit '88986c8887a2107480d896359569a8e188bbf083':
Change-Id: I99494f984c753e574ae56d16d84841aa54838098
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions