summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDaniel Nishi <dhnishi@google.com>2016-07-07 16:44:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-07 16:44:50 +0000
commitc0c4affe076c9b2d31c8b3722a15faab91d4c940 (patch)
tree3852493da4f96af43dbab3a3ac4dfb943702a4d3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb6dfa869ea03706c5a2cc10c0b3eab7e2c6974cc (diff)
parent3c75a0380d255cd594b5999b7bc8c32ab8811d02 (diff)
Merge \"Add margins to the system icons when the user avatar is gone.\" into nyc-mr1-dev
am: 3c75a0380d Change-Id: I9a92b0501fe6cbd3a910f21ff89e893ee5d77c67
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions