OSDN Git Service

Merge "Don't accept resource references in string fields" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 15 Jul 2016 23:41:10 +0000 (23:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2016 23:41:11 +0000 (23:41 +0000)
commit6fa0e4d518a67380fada76bb78b4e7b697b4d7a4
tree0bc6a45248dbd6a0105b1d32b5a7cf6af9506766
parentfff6a11438570028b99a41bbbcf1fb201ee7b1d9
parent6771d73703d35f2b28b8602dcbbed88fdffb9a0b
Merge "Don't accept resource references in string fields" into nyc-mr1-dev
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java