diff options
author | Salvador Martinez <dehboxturtle@google.com> | 2018-04-20 17:30:06 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-04-20 17:30:06 -0700 |
commit | 4e6ef66fc14b39240e1bdf64f52bce066165ec4a (patch) | |
tree | 8066f0dd3a8a5cf9387aaf03b73370529eddb1a2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 652de4ec422e9e0266b68ade6e5cab55ec1c5534 (diff) | |
parent | a6b7a6fb33a843a2cea537494a5c9dfe0aa77e8f (diff) |
Merge "Add composite string for battery summary in settings" into pi-dev
am: a6b7a6fb33
Change-Id: Ia74ede8fb5f16c5ec89ca15e81b977ed272d9dda
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions