| commit | 2b4aec947bebc7389b9e38f0c3e1ebbaf565e2ab | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Mar 03 08:50:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 03 08:50:01 2015 +0000 |
| tree | 9d0e312948e1765e5146c0a60f1fd1fc3fc7dcfe | |
| parent | b3ceffad185bbf53a0968e7512763b993852874b [diff] | |
| parent | e3abfc4e0520e68b67c581db2bb31ac5c58b0948 [diff] |
am e3abfc4e: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'e3abfc4e0520e68b67c581db2bb31ac5c58b0948': Import translations. DO NOT MERGE