diff options
| author | Uriel Rodriguez <urodriguez@google.com> | 2012-05-31 08:49:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-31 08:49:36 -0700 |
| commit | 4ccff69e52df1db398492e736d49bbc6e263d86a (patch) | |
| tree | d2607da0d21a14d684d71d3147c3ee5ae27851be /res/values-zh-rCN | |
| parent | f79571a202b02741be67deca1c7e6798f88483b6 (diff) | |
| parent | 3ddef8a7f208aa3d2ed889568b3bcb4673dbcdbf (diff) | |
| download | packages_apps_settings-4ccff69e52df1db398492e736d49bbc6e263d86a.zip packages_apps_settings-4ccff69e52df1db398492e736d49bbc6e263d86a.tar.gz packages_apps_settings-4ccff69e52df1db398492e736d49bbc6e263d86a.tar.bz2 | |
am 3ddef8a7: (-s ours) am c9bd848b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
* commit '3ddef8a7f208aa3d2ed889568b3bcb4673dbcdbf':
BUG 5457035 : Anti-spoofing : DO NOT MERGE
Diffstat (limited to 'res/values-zh-rCN')
0 files changed, 0 insertions, 0 deletions