diff options
author | Tyler Gunn <tgunn@google.com> | 2017-09-19 17:05:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-19 17:05:49 +0000 |
commit | 2b308b51d298473454958ab7e69efdf8b411d938 (patch) | |
tree | 2dfa653eca17788be614e0f4587d49a93350a064 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cb535aa8fb86ca3eed7f5f6bc3bb966f97f50be6 (diff) | |
parent | dfcd7852a26d307227c714939139f373ac6f9dea (diff) |
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am: 99d28ebbda am: 8b2e421025 am: c26e534bef" into oc-mr1-dev-plus-aosp
am: dfcd7852a2
Change-Id: Iff9efc0b5dbb0593592f95db5924d045cc68d8e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions