diff options
author | The Android Automerger <android-build@google.com> | 2015-03-26 22:38:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-26 22:38:08 +0000 |
commit | 1b92a0f66de0f9f76422cd610e988e289ba690e0 (patch) | |
tree | c74c5c440a1a421ab9ba84a8dc4dba0a99c28c7e /res/values-zh-rCN | |
parent | 511f9dfce6b20ef36d8ff27043fe52a25a869339 (diff) | |
parent | 51160caf9cb3f85a5ad3e89cbf794563c017c7af (diff) | |
download | android_packages_apps_Trebuchet-1b92a0f66de0f9f76422cd610e988e289ba690e0.tar.gz android_packages_apps_Trebuchet-1b92a0f66de0f9f76422cd610e988e289ba690e0.tar.bz2 android_packages_apps_Trebuchet-1b92a0f66de0f9f76422cd610e988e289ba690e0.zip |
am 51160caf: (-s ours) am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '51160caf9cb3f85a5ad3e89cbf794563c017c7af':
Diffstat (limited to 'res/values-zh-rCN')
0 files changed, 0 insertions, 0 deletions