OSDN Git Service

am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs" into...
authorRobin Lee <rgl@google.com>
Wed, 7 Jan 2015 12:41:44 +0000 (12:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 12:41:44 +0000 (12:41 +0000)
* commit '26e2da8ff8bdd577c915620c93805f21ff1fd65e':
  Profile owner hint in warning for extra CAs

1  2 
core/res/res/values/strings.xml

Simple merge