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:40:43 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 23:40:43 +0000 (23:40 +0000)
commitfefaccb2e78237aad461b73dbb5935470ec48413
treecf752f484a2fb2baeac73180cf3bb5e679e7d4c2
parent7e1b835a4e7f3e8d29b1c294cbbd2ca1eeb2cfbf
parentd733ff11ea34d7702018b888bfd73eac3e3d2d99
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18 am: 5584ee2131
am: d733ff11ea

Change-Id: I323b294af1ea7b4a86d5eef7bd7670c965e1b5bf