| commit | 290b9aacd774f2477f700198df17bdb09e4c2173 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jul 28 23:37:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 28 23:37:24 2014 +0000 |
| tree | 44f476fec68c6c7a44dd3b8a28f029c0551151a2 | |
| parent | e300286c6082ba31efef92a3a98d490e5c191fd6 [diff] | |
| parent | 684934e844770e16bf0ea9d6ea4bffba6aa9ff59 [diff] |
am 684934e8: (-s ours) am 9b389233: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '684934e844770e16bf0ea9d6ea4bffba6aa9ff59': Import translations. DO NOT MERGE