| commit | 5702f372a016128cd60edd24501c82e2b2ce1be8 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 01:09:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:09:17 2015 +0000 |
| tree | 4ff7198df257f3a36c5c5b6a522aab186600e6e7 | |
| parent | 542a1bc477bcaf28e40ede88d3a61c46e46940fe [diff] | |
| parent | f82c86c26c0ba9896b61270b48a8e4f82d7d7fde [diff] |
am f82c86c2: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'f82c86c26c0ba9896b61270b48a8e4f82d7d7fde':