| commit | a0fc46ebd329a0714c91e9ea7ace7bbd5aa34a4d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 06:39:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 06:39:38 2015 +0000 |
| tree | cee3dfbd0a2df6ca7e9a8559c1a24d2b1bb4339a | |
| parent | 8862173cbd54492526102eb801b3d0c1cdc741d5 [diff] | |
| parent | 94ad9a39c44875a1959b96aab16e393b99d154de [diff] |
am 94ad9a39: (-s ours) am 9b0125da: (-s ours) Import translations. DO NOT MERGE * commit '94ad9a39c44875a1959b96aab16e393b99d154de': Import translations. DO NOT MERGE