diff options
author | Julia Reynolds <juliacr@google.com> | 2016-07-15 14:51:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-15 14:51:53 +0000 |
commit | 3efc0a420b778d25791b74a0a03e1a64175fc871 (patch) | |
tree | 2dbb9e118210951997de66d6f600ab75d1e7c6a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d1ab0cf61336d7323b4a0dad760d19f3a196ca20 (diff) | |
parent | 38e88e249e141648113d8c98a55171ed211795f6 (diff) |
Merge \"Merge \\\\\\\"Check caller\\\\\\\'s uid before allowing notification policy access.\\\\\\\" into mnc-dev am: 234e1c25e4 am: 8e8bb6633c am: 5c6db3af89 am: e1d8b98189 -s ours am: 8e6b7c2f72 am: 837696131e\" into nyc-mr1-dev-plus-aosp
am: 38e88e249e
Change-Id: Ib4313f8eb0a0171bdfb1d8fc55f5678181c25686
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions