| commit | ffdc6e118ad32361a5e50a96e2d0b66baac9fd37 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 21 00:09:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 00:09:03 2014 +0000 |
| tree | 61deb6cff7886d7beff63da6c8c635427ac6818e | |
| parent | eba2867b621754f32f447bfb8ef7d926ff6d7a49 [diff] | |
| parent | ee65cdd53bd740e36c996ecb82d23a472a768e1d [diff] |
am 133d6e32: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '133d6e32c4e1ae3748b8529a3e23a523c1cd4663': Import translations. DO NOT MERGE