tree 6910d17d99ad18d502812a1587bd53064260b01c
parent 3659d42b32c9569af6c7afcd0b56ed5127fed56c
parent 139fbb78b5dbf04f3ff90815b967f2bb4040cee0
author Sunny Goyal <sunnygoyal@google.com> 1466527692 +0000
committer android-build-merger <android-build-merger@google.com> 1466527692 +0000

Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
am: 139fbb78b5

Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a