diff options
| author | Felipe Leme <felipeal@google.com> | 2016-06-28 20:53:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-28 20:53:43 +0000 |
| commit | 62e46e8899d79ffb058f9e47afcabc73f9426ebf (patch) | |
| tree | 73e7617f040b164fbe5e29a9e25decf20a4281e0 /tools/aapt2/diff/Diff.cpp | |
| parent | c3575b2149c00d8c1e268d913864b36c7e2795df (diff) | |
| parent | b1400b142e01ea95bcfde24efbc9d564ce9146b6 (diff) | |
Merge \"Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am: c1374208e3\" into nyc-mr1-dev
am: b1400b142e
Change-Id: I72cddf720ef8f3efd58ebbe79a2aa3e66a85c95a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions