diff options
author | Adam Powell <adamp@google.com> | 2016-06-09 21:15:42 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 21:15:42 +0000 |
commit | feb74c98bbde039866b80237e884e280b0442eda (patch) | |
tree | 6b00fd27a69d3b29f0565ae93a04a1257c7990d3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9c02930ea05b7c9f20032051bb3e7ef45fb0da09 (diff) | |
parent | 83bbb161fa66d66063aac54ac58c6ae6afb6369d (diff) |
Merge \"Merge \\\"Make Activity.getReferrer tolerate custom Parcelables in intents\\\" into nyc-dev am: 7a37f8945f am: fb310f6a2f\" into nyc-mr1-dev-plus-aosp
am: 83bbb161fa
Change-Id: Ifecc6a0910a14ff4c71719bc6e7c2db8638d5acf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions