| commit | 30ebce48b1640965674e8cf64f288e6412604b33 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 01:08:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:08:02 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 2eb364236718340578f99385f7c0e2a5f9c33d1c [diff] | |
| parent | 1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02 [diff] |
am 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02':