| commit | 66724ea2560f53478b7926387473bdca96917b6e | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Dec 13 02:29:10 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 13 02:29:10 2013 +0000 |
| tree | 314a478a5b97329bc66b54650f0c08d5f70e1c8c | |
| parent | 831904c6c9e733148134ab2a9af15e53806ce0af [diff] | |
| parent | 2f4ab417d7f167b6a53d5a2b0e41d7fd2f9ce1b6 [diff] |
am 2f4ab417: (-s ours) am ff662e8e: (-s ours) am 04b312f1: (-s ours) am 5c47cee0: (-s ours) am 6a8a163d: (-s ours) am d823988b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '2f4ab417d7f167b6a53d5a2b0e41d7fd2f9ce1b6':