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 22:44:01 +0000 (22:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Nov 2016 22:44:06 +0000 (22:44 +0000)

Trivial merge