diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-06-20 21:15:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:15:26 +0000 |
| commit | c07a7518d6bfd85fcc1ad15e72cf0fe8014ef0d0 (patch) | |
| tree | 6485cf67714903175136ecfa712664bcd9d448be /tools/aapt2/diff/Diff.cpp | |
| parent | b933c4d65c83bdd4925e678fc04da54e61dcb18f (diff) | |
| parent | 901c03faba8c73194e694222477ce8d2c594d324 (diff) | |
Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
am: 901c03faba
Change-Id: Iaccb15163fd5b795adced796ede0a56e30a544a3
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions