am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:09:14 +0000 (14:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:09:14 +0000 (14:09 +0000)
commit3da05cbfbad836707db214ee9a5346527fb49373
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parent562221c7219ab4d11e6efdcabc325e878ff4ab6a
parent0c7b1b05f6478270428d8f842a11727f51a15ccc
am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0c7b1b05f6478270428d8f842a11727f51a15ccc':
  Import translations. DO NOT MERGE