| commit | 2d429d0bb6ba19ee52f840ab92d45ea49b31a4ae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 17 13:03:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 17 13:03:51 2015 +0000 |
| tree | e6ace7934bea976f32519a290cd3f7a8abd8195b | |
| parent | 945a94f870cd9e7311788ff9cb65593846a780aa [diff] | |
| parent | 7f96022a80ed4a9b255f2f4c63cfab2a078bf1c9 [diff] |
am 7f96022a: (-s ours) am fb8a6542: (-s ours) Import translations. DO NOT MERGE * commit '7f96022a80ed4a9b255f2f4c63cfab2a078bf1c9': Import translations. DO NOT MERGE