| commit | 2ce2c76498a29e91bba9f53ec80da2ed48bcc031 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:16 2015 +0000 |
| tree | 18c580693446704f3d1e39d971c7b9d293e4c25b | |
| parent | eafe2996e76744e0c4b1de5c68cb5d43f5b8069c [diff] | |
| parent | 69032a7a237f58a4b7f8f273cbce8cd25285b84b [diff] |
am 69032a7a: (-s ours) am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '69032a7a237f58a4b7f8f273cbce8cd25285b84b': Import translations. DO NOT MERGE