| commit | e86bc05ac6c7db024858ea7838ded83b6bfdd32b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:09:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:09:56 2014 +0000 |
| tree | 77f8d2c8a1a1888c762fe8c94608c877307acfaf | |
| parent | 649c0ca2a418fed4eff92b93e5e825c5814b4870 [diff] | |
| parent | 1df8d4c5e09e0fc06d7c4a6d313e01906ea4d25e [diff] |
am 1df8d4c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '1df8d4c5e09e0fc06d7c4a6d313e01906ea4d25e': Import translations. DO NOT MERGE