commit | 8a57c51d2a860f95bba2b28bbb65370318479996 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 16 10:36:31 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 16 10:36:31 2012 -0800 |
tree | b35143193ef29b9ecf435c684ecac6d6f3bc6b88 | |
parent | 9dccca36e76a53b3c55074a35f071cb7323b09dd [diff] | |
parent | 93b06760ccef95a6b46b0f455ed5dbb1a46a9dae [diff] |
am 93b06760: (-s ours) am 84b8551a: am e4895175: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit '93b06760ccef95a6b46b0f455ed5dbb1a46a9dae': Import translations. DO NOT MERGE