diff options
author | Selim Cinek <cinek@google.com> | 2016-11-09 23:26:07 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 23:26:07 +0000 |
commit | a3fa81358f2134fb18ac24f97ed455b77af0ba04 (patch) | |
tree | d94db880e58fc5783c5ab9dd170f45b7c87a020e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2d29dc66bc930954e83499e3341447dbc464ca47 (diff) | |
parent | aaa70f5d3767d31cfac80901a38df657a9779cff (diff) |
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev am: 6a6bc370e9
am: aaa70f5d37
Change-Id: Ia3f4705c1a84f87629842fe13c9064b41ae4975c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions