tree 7272b7e915715229d5c7981db5aa1ad62e14fd2c
parent afb1dd7ecc9ff62355e338e71364bfb91e3cf824
parent 6cfcf068706591302394827b6d4bb9fda2d0692f
author Qiwen Zhao <zhao@google.com> 1418400665 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418400665 +0000

am 6cfcf068: (-s ours) Import translations. DO NOT MERGE - Update prebuilt SDK to LMX72

* commit '6cfcf068706591302394827b6d4bb9fda2d0692f':
  Import translations. DO NOT MERGE - Update prebuilt SDK to LMX72