| commit | 1e711d996936fa1fec356e3f24384d5613ba2688 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:50:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:50:44 2015 +0000 |
| tree | 1bf933ea1eafaf54e768c580fdda84e590c3d474 | |
| parent | 17df9f9e763d48753430e45b65b27637b4cd9a22 [diff] | |
| parent | 37cf19e4e7072582f1e754c6576ece7d2b8992f3 [diff] |
am 37cf19e4: (-s ours) am f24cf437: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '37cf19e4e7072582f1e754c6576ece7d2b8992f3': Import translations. DO NOT MERGE