commit | c4e64bc449475f16c0ef3afa76ca168ac24a9a41 | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Wed Jun 08 17:23:34 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 17:23:34 2016 +0000 |
tree | 1a72ac426fe8503b607eaffd79d804f8617f0c4e | |
parent | d714e834bf4e710867b34e25577ec1f7da97ac58 [diff] | |
parent | a3a56ab9d16a542931249d6e7b8fd68eabbc16d5 [diff] |
Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006 am: a3a56ab9d1 Change-Id: Id5e39a35db803223a89100a8e23a7b3309cd9dd3