| commit | aebead61c4eba368997446135f48e87f13ef3e3d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:05 2015 +0000 |
| tree | f87ccfc6751cbf5d0e97ea7d4dcc197baee787e3 | |
| parent | aa08bf5fc9b0f2bf1c234fc8cc3c90204f384d62 [diff] | |
| parent | d8ad46871384995e28d6c9ca29207faaee4bdc6e [diff] |
am d8ad4687: (-s ours) am 336bba89: (-s ours) Import translations. DO NOT MERGE * commit 'd8ad46871384995e28d6c9ca29207faaee4bdc6e': Import translations. DO NOT MERGE