diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-19 02:21:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 02:21:46 +0000 |
| commit | 10fe83a9b9fd4e9d1a560dfaf6505de7f14f9d67 (patch) | |
| tree | f213f9eff9a008feca6ae98f30b6bd324bb02ae4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4080a4197c8c900e0f597bf436f2f79cc76f2c93 (diff) | |
| parent | 8978d9acbaaa89be3c14ed758e7c8a8d06071779 (diff) | |
am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
* commit '8978d9acbaaa89be3c14ed758e7c8a8d06071779':
Revert "Disable fingerprint when remotely reset by DPM"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions