commit | 8870e98d1a4bd582b5edbc67968e19d6d9751d57 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Jan 29 17:21:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 17:21:52 2015 +0000 |
tree | ae7a55b0364a6a0e684db417d8b1b8bb6e154d96 | |
parent | 54e4e10668f7a0f490eecc410107cca843e8384a [diff] | |
parent | 63e7219216d8e7724c86fcb8b582f482dafe6cdb [diff] |
am 63e72192: (-s ours) am 55e201fa: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '63e7219216d8e7724c86fcb8b582f482dafe6cdb': Import translations. DO NOT MERGE