diff options
| author | Chong Zhang <chz@google.com> | 2016-06-08 01:22:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 01:22:43 +0000 |
| commit | 5c689127ba3a1bfba8da407e4a4922cc6c1ae4cb (patch) | |
| tree | c98e8332a2d71aa7245b449412d3281f9e7a1e27 /tools/aapt2/diff/Diff.cpp | |
| parent | 53c163713438163355e8cd8c113bcbcd338385a8 (diff) | |
| parent | 723e5afa9e3a6e14271d170230da58d2649c88b6 (diff) | |
Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e
Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions