diff options
| author | Dan Sandler <dsandler@android.com> | 2015-03-06 00:10:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-06 00:10:10 +0000 |
| commit | 701d8166550e1ddfd62bd82b7ea0f6a91c75a699 (patch) | |
| tree | 5e14affcc11a3424c275e555fa7c6bfcac15f629 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ac35ad36696bb129aa0de9c9926303ec8b941c9b (diff) | |
| parent | 3581f4c91a77ecb9313f51a2d07ed88ff61d9299 (diff) | |
am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
Avoid crashing on startup when policy forbids lockscreen camera.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions