| commit | e41059eb983e787ef68fddb0f4c2c1ead7f88944 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 02:02:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:02:17 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | 990e58107eda2a925b2571293b403dc1df2a08df [diff] | |
| parent | ee82d2f21dc3f89f43601b3f60ed0155f0711c9f [diff] |
am ee82d2f2: (-s ours) am a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'ee82d2f21dc3f89f43601b3f60ed0155f0711c9f':