| commit | f658b88fd1ee3bd92a8c7f32560217fd9805f7d6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 29 22:53:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 22:53:54 2014 +0000 |
| tree | a1f319ff506a3d52627d2a081f3b4c1bcb00f165 | |
| parent | 550fa6b6751387a83b09392d9e042e8ccd2751d0 [diff] | |
| parent | 9bff44bdc4d91a1502bf2d30c0cbbe76751657f1 [diff] |
am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '9bff44bdc4d91a1502bf2d30c0cbbe76751657f1': Import translations. DO NOT MERGE