diff options
author | Robin Lee <rgl@google.com> | 2015-01-08 22:48:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-08 22:48:54 +0000 |
commit | 1ea47aa0839bb33c6bd5223c37d38616edc57181 (patch) | |
tree | 953c52900da56fb9a6cb914dfa31de45f4af7864 /core/java/android/widget/TextViewWithCircularIndicator.java | |
parent | adf1c93ff77c996be7952f98b9f554befb089543 (diff) | |
parent | a92da1c21aba700519f51f690fad28e6ca4154a6 (diff) | |
download | frameworks_base-1ea47aa0839bb33c6bd5223c37d38616edc57181.zip frameworks_base-1ea47aa0839bb33c6bd5223c37d38616edc57181.tar.gz frameworks_base-1ea47aa0839bb33c6bd5223c37d38616edc57181.tar.bz2 |
am a92da1c2: am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev automerge: bc7efed
* commit 'a92da1c21aba700519f51f690fad28e6ca4154a6':
Revert "Profile owner hint in warning for extra CAs"
Diffstat (limited to 'core/java/android/widget/TextViewWithCircularIndicator.java')
0 files changed, 0 insertions, 0 deletions