| commit | a0005a45ac188f7638d275e8df4870d73c2b93d4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 23:54:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:54:45 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | 68abfc30ce1e32a2aa13e9ce78720c21e5a86c3c [diff] | |
| parent | 54c6034e576fa000aae1029e5147056961043ccf [diff] |
am 54c6034e: (-s ours) am 0e80d879: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '54c6034e576fa000aae1029e5147056961043ccf':