diff options
author | Zhentao Sun <robinvane@google.com> | 2015-09-01 01:05:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 01:05:45 +0000 |
commit | eaed83137cd06312f96b2fc5c22de4c1e94e39ca (patch) | |
tree | 7e3c837095c24eead729058d8e577d19fed2e579 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 53c5dadbb8ddf0898e91e129aee4a19f1028175a (diff) | |
parent | 0a247995d79149b891ab6fad5dc0a1cb584d111c (diff) |
am 0a247995: am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev
* commit '0a247995d79149b891ab6fad5dc0a1cb584d111c':
Don't launch the camera if it already in foreground.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions