commit | 99bc099fc26276b060627cdc7f35c0a637408a69 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Sep 12 19:01:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 19:01:18 2014 +0000 |
tree | f3669902fff1da70f637ad994a8b6bbaa3ba45c2 | |
parent | a1a6687df65f1b41dfe69e58272695934c0690fc [diff] | |
parent | 3dab765afe890c41c3a8764298abf8bdc11309b4 [diff] |
am 0f712796: (-s ours) am 6b595151: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '0f7127964e79036c11d2dd2a01559ad9500c7267': Import translations. DO NOT MERGE