| commit | 36b43401a20647a9ffeedab2adc1dcb51444f68d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 04:11:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 04:11:03 2014 +0000 |
| tree | e3b45e81753a9086747f9ae350b2ae0ba3ef2285 | |
| parent | c1b8a6f0f5b96f5ac0c660faa4dba887038b443d [diff] | |
| parent | f965f6175f6deea4633e06eb17dc635b40e6f24a [diff] |
am f965f617: (-s ours) am b0a7b3e9: (-s ours) am 619f4ace: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f965f6175f6deea4633e06eb17dc635b40e6f24a':