| commit | ceeee91fee80042576640bb314f59a2b977eaf14 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Jul 17 18:29:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 18:29:54 2014 +0000 |
| tree | 085cc72560a1a97ccd0b7812d04e7bedecae2dc5 | |
| parent | 0477d902ac574abfb63e39ec2333f5fec1da4aa1 [diff] | |
| parent | f7450ea45a3873dcfd6ee4b06f76db981db82daa [diff] |
am f7450ea4: (-s ours) am 0ec8dc76: (-s ours) am 20452f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f7450ea45a3873dcfd6ee4b06f76db981db82daa':