diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-27 20:07:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 20:07:09 +0000 |
| commit | 846bbf9dd565712ef2abcc9f7a090e5508138426 (patch) | |
| tree | acd3e38539512eb037d74a6af7719b655d80b613 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8695cc88f384650bf2cb28dabdd039648d29f14a (diff) | |
| parent | 29bea9d4bb13fa1dfbbfb9bbb63c996ec9111eef (diff) | |
am 29bea9d4: am af22fa7b: (-s ours) am 448216e7: Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
* commit '29bea9d4bb13fa1dfbbfb9bbb63c996ec9111eef':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions