| commit | f132e7ef0ece5a31595153ec71ef539b4c40f706 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:23:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:23:03 2014 +0000 |
| tree | 0c17ae1eb412190fd1dc9d24bffac42e32a7b5bc | |
| parent | 3dd06aba8074fd3de68659f97d0136e05fc44c81 [diff] | |
| parent | aa5c62f35999c2dc165771740e96c30b1b932aeb [diff] |
am aa5c62f3: (-s ours) am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'aa5c62f35999c2dc165771740e96c30b1b932aeb': Import translations. DO NOT MERGE