commit | efc0bbecc5dad6e1ac78b39b4f6f0c7f943d2b25 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Jan 06 22:29:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 22:29:07 2015 +0000 |
tree | 17c6b2d6fd4d93029ee90ce0e53ef8dd752fa387 | |
parent | efd72a4845a976aac5f9a8a464a1ee6fdbcec28a [diff] | |
parent | 94c4b4b2a5c368a4894bbd8a42301f7ce443129b [diff] |
am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '94c4b4b2a5c368a4894bbd8a42301f7ce443129b': Import translations. DO NOT MERGE