OSDN Git Service

am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp...
authorRobin Lee <rgl@google.com>
Thu, 8 Jan 2015 22:39:39 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jan 2015 22:39:39 +0000 (22:39 +0000)
commita92da1c21aba700519f51f690fad28e6ca4154a6
treea6c410317177633ace63a7fcb3ba86163f37c20c
parent3968820fc75e1eac03e54cba45b5a0adc28ee87d
parentbc7efed6941ddc63b399818608a4ec117b74af5f
am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev
automerge: bc7efed

* commit 'bc7efed6941ddc63b399818608a4ec117b74af5f':
  Revert "Profile owner hint in warning for extra CAs"
core/res/res/values/strings.xml