commit | 63904d678a8884e15bd4740e0e526fa5ef6ae31a | [log] [tgz] |
---|---|---|
author | Qiwen Zhao <zhao@google.com> | Sat Feb 15 00:27:31 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 15 00:27:31 2014 +0000 |
tree | c3f7b6bda200951ea4adfdde8bd41a58bcf2664a | |
parent | 68f99541fd76a53277118800b967453f88d74044 [diff] | |
parent | 0f3e20658a2386b68f23c71a83e18b9423e939e9 [diff] |
am 0f3e2065: Merge commit \'8fa85d20\' into klp-dev-plus-aosp * commit '0f3e20658a2386b68f23c71a83e18b9423e939e9': Import translations. DO NOT MERGE