diff options
| author | Dan Sandler <dsandler@android.com> | 2015-03-06 00:20:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-03-06 00:20:48 +0000 |
| commit | 2a23382692ef564a5c38b56ad0ad7ad161df2779 (patch) | |
| tree | b16b4382fa164fa4f6087b41a1a95933e4a0436a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ddbf13d5000646ac66361657aa779fd298446ee9 (diff) | |
| parent | 701d8166550e1ddfd62bd82b7ea0f6a91c75a699 (diff) | |
am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
automerge: 701d816
* commit '701d8166550e1ddfd62bd82b7ea0f6a91c75a699':
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