diff options
| author | Lucas Dupin <dupin@google.com> | 2019-07-18 11:45:04 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 11:45:04 -0700 |
| commit | c168fd5c1365853c66504e7be55b39e22f9fde97 (patch) | |
| tree | 7258823a088db4e6a2aa620ed2ff432ff511ab0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bdc1daf9196f2a6a684ca7f5fbb129848b6430b0 (diff) | |
| parent | bdd0cfd75d4742e92f4b5f21a08b7796842e4a72 (diff) | |
Merge "[automerger skipped] Merge "Do not animate wallpaper when wakeAndUnlock" into qt-dev am: 39fc29c72a am: e8d2d5357e -s ours
am: bdd0cfd75d -s ours
am skip reason: change_id I46574609a00712bdde5a4652ab5c9b0c04cbeeec with SHA1 bd6c92b074 is in history
Change-Id: Ic288e7c1b6e5d585cb641fd6cb39f7780de4670e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions