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