| commit | 40c0d8c8ac2d0f8778c6a94a860ff655cadedfb7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:11:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:54 2015 +0000 |
| tree | c41fe1f1ce7fc514e92d7b05aa20394ff25be18b | |
| parent | 5cdeb956fdd62718f3957514f573dcb6ff3a24e3 [diff] | |
| parent | 78b6e6c742a7872ba23c3684c47ff714dbd80cf6 [diff] |
am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '78b6e6c742a7872ba23c3684c47ff714dbd80cf6': Import translations. DO NOT MERGE