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