| commit | 78540cea078839d7a3da995443ded38dfc49eebf | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 20 18:07:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 20 18:07:29 2014 +0000 |
| tree | 3bc736ed08cac487f4fc623b83ffdd8b6ad154a8 | |
| parent | 0cef10c1ebf323d66b81a15f226747305348a896 [diff] | |
| parent | b8f284e551dc74f02bbeaf045b102517d3fb89a6 [diff] |
am b8f284e5: (-s ours) am 7e0ae794: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b8f284e551dc74f02bbeaf045b102517d3fb89a6': Import translations. DO NOT MERGE