commit | 3cad9ae1d210535746b0714924877d97ab8f4e34 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:04:56 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:04:56 2014 +0000 |
tree | a2c99325330a6845a5be1dff4b3bb65fb115f650 | |
parent | e6f060fff0f85cf7c202e38493d56514c6b5c6b5 [diff] | |
parent | 59bde8429b1faa24e60957eca3db07214d43c1ea [diff] |
am 59bde842: (-s ours) am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '59bde8429b1faa24e60957eca3db07214d43c1ea': Import translations. DO NOT MERGE