| commit | 8d5bd9f385e5c89a32e58c994c28c22e711749a4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 02:01:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:01:43 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | df0ef08db5f9ea23f186ad2b34fde31bf32a2cd8 [diff] | |
| parent | 53c13a8766a4a758ee572acaa4121350050f25c7 [diff] |
am 53c13a87: (-s ours) am b17186c7: (-s ours) am bc566e74: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '53c13a8766a4a758ee572acaa4121350050f25c7':