| commit | c4713add20ea9dace661b17a7ca477df1530f5db | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 05:38:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 05:38:32 2014 +0000 |
| tree | d88ea15417463074a30a194685ff5d90d81682b5 | |
| parent | 35b147ac0f6259ba98de7bfba0a9df7d034f9dd6 [diff] | |
| parent | b1fd8a50bd77528ee3aa687fe5c1be9eeb6447eb [diff] |
am b1fd8a50: (-s ours) am 4e375cfa: (-s ours) am fa91ffe9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b1fd8a50bd77528ee3aa687fe5c1be9eeb6447eb':