tree 6751a9060f1cc1a1a3998898fae43978a4e53842
parent a245bea2c19eaf5e1ca1b6907b7137ec095e488a
parent 66475e12031385f256e1b63469e01268133854e0
author Dianne Hackborn <hackbod@google.com> 1410993112 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410993112 +0000

am bb28bea4: am d04770e1: Merge "Work on issue #17506095: Add ability to lock IME for specified apps" into lmp-dev

* commit 'bb28bea4efeaacfc319be3d6c6bf0142ec3ef7ae':
  Work on issue #17506095: Add ability to lock IME for specified apps