OSDN Git Service

Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
authorAlexandra Gherghina <alexgherghina@google.com>
Tue, 4 Nov 2014 13:50:51 +0000 (13:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Nov 2014 13:50:52 +0000 (13:50 +0000)
1  2 
res/values/strings.xml

Simple merge