commit | e096bb20aeabb908277504918410597434fea178 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Sep 21 12:45:00 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 21 12:45:00 2012 -0700 |
tree | 93409c38ad50c8df8c34efdda872642dde170fa3 | |
parent | d5740fa0899e73db11b943c68fac8dcf1294af6d [diff] | |
parent | 9742238da426e3a02f47063d0ae7008ae2a57f73 [diff] |
am 9742238d: (-s ours) am c613f1e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '9742238da426e3a02f47063d0ae7008ae2a57f73': Import translations. DO NOT MERGE