| commit | 10f3dd8ac2a325e89d4982015edafa5befc001c0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 13 00:00:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 00:00:42 2014 +0000 |
| tree | d11985f1a811c42f6248beb45789b0b36b978049 | |
| parent | dd562146ad3e0475ccaad1a0abd8eeb4b535134f [diff] | |
| parent | 42f19898136bdf07fc38586d70a6f14711997864 [diff] |
am 2e7031b6: (-s ours) am fcbba83a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '2e7031b6c379867644dab7a178b08bdd03399bb2': Import translations. DO NOT MERGE