tree 26b7399c793e9254d00654309cb260311cadb784
parent 98288f34aed69390ea4b105e8f73f530ed0b9473
parent 8be0bc8cc088c5e4912d1bd0f2796e7011a0f6e8
author Qiwen Zhao <zhao@google.com> 1417815100 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417815100 +0000

am 8be0bc8c: (-s ours) Import translations. DO NOT MERGE. update support library

* commit '8be0bc8cc088c5e4912d1bd0f2796e7011a0f6e8':
  Import translations. DO NOT MERGE. update support library