diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-06-30 00:04:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-30 00:04:25 +0000 |
| commit | 2194bf522cd116e1d2b3d7944330b64f1cf1e8d7 (patch) | |
| tree | 974f01ad5e3a5ba347329851e3550f74841b1680 /tools/aapt2/diff/Diff.cpp | |
| parent | 4bed53a081780caa9eb65c36d47af90a7a55e7dd (diff) | |
| parent | bc8e0052fdf92efd0471b97092ee6a7e1eb2320d (diff) | |
Merge \"Fix updateShortcuts() with icons\" into nyc-mr1-dev
am: bc8e0052fd
Change-Id: I009387abcbb24e3051611eee708fedd86f1b9dcd
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions