summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLucas Lin <lucaslin@google.com>2019-03-22 03:27:52 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-22 03:27:52 -0700
commit5b4dfcda1f9e7db17593b20461c7d21b3d0e033f (patch)
treed9b3453f84dd12079f0c0bfdd55dbd3b0a5dc161 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent22cdf526d9209c51cf583eb7c7cdef21f1b61fcf (diff)
parent04bd7a8badd3f4ea1f94da43b4c7929050c9400a (diff)
[automerger skipped] Merge "Modify SettingsLib for partial connectivity" am: 64bb980f45 am: 1eb23ba267
am: 04bd7a8bad -s ours am skip reason: change_id I4791abe9351c62d9549ada383aa4cc8aa34ddaf2 with SHA1 fc731abf72 is in history Change-Id: I2829c7d9c54f2e3ce0e067a39d446fb7b73667ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions