commit | cbd269e1645b1a689af4076852345ff73b4a6074 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Sep 24 18:15:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 18:15:53 2014 +0000 |
tree | ecfe4b336de47f713352654de9d57795cf21cbfd | |
parent | a4fdfc6732741676b86ec4a166ae6afefdd97236 [diff] | |
parent | 60f6aa3b38ef467e65a43651d77c8b59cb763efe [diff] |
am 60f6aa3b: (-s ours) am c17079e3: (-s ours) am 81295a0e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '60f6aa3b38ef467e65a43651d77c8b59cb763efe': Import translations. DO NOT MERGE