tree 384c78153c00b32ece0d7deaab90a07b26b0de47
parent 622fe17483874f98b0a2bba56bcc2bfea6f416cd
parent 996724ea6d121bf5aa75f1779fc7337b0fa3f0c9
author Sanket Padawe <sanketpadawe@google.com> 1418698841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418698841 +0000

am 996724ea: am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev

* commit '996724ea6d121bf5aa75f1779fc7337b0fa3f0c9':
  Prevent sim notify popup after upgrade from k to LMR1.