| commit | 1cee9c8bdaa68936b2978a72a8187ca9a9dd7283 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 23 16:53:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 16:53:23 2015 +0000 |
| tree | 1a7c599d91a4a3dd33bbc02589c56dce1b01909a | |
| parent | 6e241f643821ea9f388158012ce5f52ff803d6d6 [diff] | |
| parent | c37feed0940b0b9b1fdd455c72bc22ae6e579280 [diff] |
am c37feed0: (-s ours) am 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'c37feed0940b0b9b1fdd455c72bc22ae6e579280': Import translations. DO NOT MERGE