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:23:20 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 23:23:20 +0000 (23:23 +0000)
commitd733ff11ea34d7702018b888bfd73eac3e3d2d99
tree359ad9c33eef85c8236c6e58b3b9257f2880431f
parentb0fd5ba1229d68a58db4c1e91238f5e587e3c7c2
parent5584ee213148b28fe008f9d099739ef743f2d127
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18
am: 5584ee2131

Change-Id: I84a7d1b5eb89fa5c796e2db7838aee0af9114486