tree 8aa001f2c6ad60110ebe4f6462aea7fbccf977bc
parent 0205ad9c8beedae1e7096768bac3891ecb38fba8
parent bef8265f41da98604b3f12601b56460ce2d2c7a8
author Sandeep Siddhartha <sansid@google.com> 1410985997 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410985997 +0000

am 9364b830: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev

* commit '9364b830a4d78a3c76cc7eacc71c9b7808fd414b':
  Fix issues with multiple languages and multi-users