summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorEmber Rose <emberrose@google.com>2019-10-10 22:17:31 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-10 22:17:31 -0700
commit513087f823240c5ec89a672612f0703a46a9291a (patch)
treea6bd370371b026f2fd2faacb8b27d8d91943eb91 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb571a98dbcc25a71da0a54fb791db0928e5ac58d (diff)
parent4ac44113004ad5fae0f158d75e1c229c4aa454f5 (diff)
[automerger skipped] Merge "Update Ember's email" am: 0e6683ef7e am: bf7239e2fb am: 159091ed3f
am: 4ac4411300 -s ours am skip reason: change_id Icd9ae23a74175a98f8495f71c85b69891d387df0 with SHA1 93fc45b1a7 is in history Change-Id: Ibdf34ab9b0a5d15ce180d1e711aee840897a708a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions