| commit | a32cd48a5c25d4cfb5519ec3d61530a8979ac13e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 22 12:53:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 22 12:53:36 2015 +0000 |
| tree | c82d17e5ca4de615e1882c7b0bbe16767d690584 | |
| parent | 7bc5d5d992d611de7d80a2434607cd82cf71acd7 [diff] | |
| parent | 424d59b60889fe3533e3ed11ba6daef2ab0c7e53 [diff] |
am 424d59b6: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '424d59b60889fe3533e3ed11ba6daef2ab0c7e53': Import translations. DO NOT MERGE