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