diff options
author | Hall Liu <hallliu@google.com> | 2020-04-08 00:51:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-08 00:51:01 +0000 |
commit | d570fa14355ef7d493386ec429d1f3be8b5d927b (patch) | |
tree | 86359707e3f64a712ac021f9e0bd52bf1ef826e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 46771a3c9a5efe2083d963f3bd5a23397472ed5a (diff) | |
parent | 5000bfbdc7807cd3bffcff36ca64021942d02924 (diff) |
[automerger skipped] Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev am: a2b7cd539e am: 2994fd8537 -s ours am: 5000bfbdc7 -s ours
am skip reason: Change-Id I479c8fc123d5a994e8cbe6489aa00bea4abca1c7 with SHA-1 7e826f9531 is in history
Change-Id: I717dccf9f712c5bbfb620fbaeb91a69f8cc094b6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions