tree d83c23872aba5205445c429059621d3397e40e28
parent c5d41884a104a70bb114813ffccee9c4b8fd3bbb
parent 80ea66b1029a72b031795cfcb2980558211a0f35
author Sandeep Siddhartha <sansid@google.com> 1410985265 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410985265 +0000

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

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