commit | a4f25e8eed50e8234df2280e293ac3a27b84cbf6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Jul 17 18:29:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 18:29:35 2014 +0000 |
tree | e1d32793a02111490bbf2caa21fd1c2f7e09c0ed | |
parent | 85f59b397076cc81eea10d46eac3e767e76dbeb2 [diff] | |
parent | 1ef3660858c3384575e8ed6cde9ee370f8252e19 [diff] |
am 1ef36608: (-s ours) am dd57bf49: (-s ours) am 56645543: (-s ours) Import translations. DO NOT MERGE * commit '1ef3660858c3384575e8ed6cde9ee370f8252e19':