OSDN Git Service

Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
authorKevin Hufnagle <khufnagle@google.com>
Fri, 11 Nov 2016 23:14:28 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 23:14:28 +0000 (23:14 +0000)
commit5584ee213148b28fe008f9d099739ef743f2d127
tree61cbf48f17b3313af1fcc050a892b00f28561107
parent2a3fe7d97912e9e3fd98c9aa949a409cc928307b
parent867d09fe181312f745523afe00ec0039b06cdb6d
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
am: 867d09fe18

Change-Id: Ib56e1a8895557d43aadd8eada75dce2d9b836dc9