am ac5ba830: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:15:58 +0000 (14:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:15:58 +0000 (14:15 +0000)
commit302eaa74157841b5a9119d636f13a66e290c89ad
tree6ba8baa83accc32c603cf7c83ff68c87f46d8472
parent22b191170debc70b5bd13f0a58bcd7bb258d45db
parentac5ba83060a7ef55350afc96275cd50764408ae4
am ac5ba830: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'ac5ba83060a7ef55350afc96275cd50764408ae4':
  Import translations. DO NOT MERGE