diff options
author | Zhentao Sun <robinvane@google.com> | 2015-08-19 16:30:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 16:30:05 +0000 |
commit | 00447eeb99d93b135bd5ef4f7c1f6ca90000e6f7 (patch) | |
tree | e1f3a8c83cf68681d34a2574cd294dfff1109c99 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 47b04832a58ab1c52582a792c45b03d578220733 (diff) | |
parent | 4caf6b9784d0102844f74ea65da75affc0750896 (diff) |
am 4caf6b97: am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev
* commit '4caf6b9784d0102844f74ea65da75affc0750896':
Launched camera in the correct user.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions