diff options
| author | Adam Powell <adamp@google.com> | 2016-06-09 21:08:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 21:08:50 +0000 |
| commit | 948b94ff2f024139aa8fee0034956af23411724b (patch) | |
| tree | 96a8c0cf6bf234f76dd42be73c1a53d8967766eb /tools/aapt2/diff/Diff.cpp | |
| parent | 219e11ef9d25501677e51b6497ae71cea1717141 (diff) | |
| parent | 64e3a6d76047c460ff702e85f8d8ec77e571cbd1 (diff) | |
Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f
am: 64e3a6d760
Change-Id: I7167b5f8112fff8c1e47c2cc954742f1f368d01c
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions