tree d87a709733e601b01538b4b1d53a795b5f27b21c
parent b3d6bd21c84273e4fb2a289047eb01e1cbbada64
parent 72615fda0cc0e7cfbb0d359e0993f767615b8176
author Winson Chung <winsonc@google.com> 1406153078 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406153078 +0000

am 96af21df: am 86bb7f0a: Merge "Fixing issue with the lock-to-app setting not being refreshed when entering recents." into lmp-dev

* commit '96af21dfc601abbf5087efe1da2ae4f51eae0fad':
  Fixing issue with the lock-to-app setting not being refreshed when entering recents.