summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2016-05-25 13:15:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-25 13:15:20 +0000
commite629990e348c8afcca49f79dfa900ebcffce0737 (patch)
tree30b1a5497f4f7f609705fc5541e311064996767f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent63cb0fbf07322b715521e8127217ee2c80cd3020 (diff)
parent8d5ab52c6c9a5987bc1cd1fcc000a458ba619acb (diff)
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4
am: 8d5ab52c6c * commit '8d5ab52c6c9a5987bc1cd1fcc000a458ba619acb': Do not tie managed profile synchronously in onUnlockUser() Change-Id: I5e2bb7364c957b41deb9389d0ee75efe68a8bc0b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions