| commit | 8c302e34220ae13eacbd997eb955f55c545601e6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 15:20:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 15:20:48 2015 +0000 |
| tree | 9f29705e17ac3a65a50f3205dca07e3a9422f39e | |
| parent | b1789780f7453822d195567f011ea926d9c67492 [diff] | |
| parent | 21df822137b4750d1be2ccf7895876758255c8d0 [diff] |
am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE * commit '21df822137b4750d1be2ccf7895876758255c8d0': Import translations. DO NOT MERGE