commit | 6f38bd7620abd00865c116686d15971bc29d7a2c | [log] [tgz] |
---|---|---|
author | Sunny Goyal <sunnygoyal@google.com> | Tue Jun 21 16:48:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 16:48:12 2016 +0000 |
tree | 6910d17d99ad18d502812a1587bd53064260b01c | |
parent | 3659d42b32c9569af6c7afcd0b56ed5127fed56c [diff] | |
parent | 139fbb78b5dbf04f3ff90815b967f2bb4040cee0 [diff] |
Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev am: 139fbb78b5 Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a