OSDN Git Service

am 6e1ac371: (-s ours) am c1c6de3f: (-s ours) am c2c527a6: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:24:23 +0000 (02:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:24:23 +0000 (02:24 +0000)
commit589646dc464ef7da1dc7ef28dc508136851e1f44
treefeb783ef2cbcea5887ef93264ed075b5f4dac9b4
parent6fde3fb23c6537b4ade4ecc1c86162aef2dc502d
parent6e1ac37150d840573fd8aec60ae1ea18ea91e075
am 6e1ac371: (-s ours) am c1c6de3f: (-s ours) am c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '6e1ac37150d840573fd8aec60ae1ea18ea91e075':
  Import translations. DO NOT MERGE