diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-19 01:40:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 01:40:48 +0000 |
| commit | af22fa7be8883f9780a2d18283ab9f859b4a2c55 (patch) | |
| tree | df8ab54c75b347e5848fa98b076149b02b514cbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a0a6d2c5d6e4214f407911667ad2b6004fcfe2c7 (diff) | |
| parent | 448216e7b8822ae9c1c44836482c95f2becc220d (diff) | |
am 448216e7: Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
* commit '448216e7b8822ae9c1c44836482c95f2becc220d':
Revert "Disable fingerprint when remotely reset by DPM"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions
