diff options
author | Jorim Jaggi <jjaggi@google.com> | 2017-06-16 01:23:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-16 01:23:04 +0000 |
commit | 4a0e5abe0e8f36b50021bb4aa90dda26a78b08ad (patch) | |
tree | 86749049c6346d66f6af1b5ed93a4c78fadeacc1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d59b0c4d48a716245f3c28a6124d47961f2cd776 (diff) | |
parent | 69a4e37d19542a9a88c939b7a61f0c3de39b5c1b (diff) |
Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762
am: 69a4e37d19
Change-Id: I4d6d43456ec8dddb24bb4cbcf307e995362cfab5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions