diff options
| author | Felipe Leme <felipeal@google.com> | 2016-06-28 21:00:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-28 21:00:04 +0000 |
| commit | d1e16ae5c8c5f26c68215db49fc1408c826b2e3a (patch) | |
| tree | 59ecc06888601cd251c57b34071b7f64960b8843 /tools/aapt2/diff/Diff.cpp | |
| parent | 34cc5c0e4835ccbc2f7fa5335bc60ad4a0ecaa4e (diff) | |
| parent | 97f620db3de07a54c3739fed3346d560a531c462 (diff) | |
Merge \"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am: c1374208e3 am: 2f285643bf\" into nyc-mr1-dev-plus-aosp
am: 97f620db3d
Change-Id: I9e6180d74ec42b7d1286c13e1bfaa07b60bc2a0a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions