tree 6db5dcc9cd59535a48b71869fe8915c3e7a4384b
parent 26750711e12900aca6c7c35556b4548038cfb505
parent 52a6133f4ba8b1d08f5158d802790d6a1b16568d
author Jim Miller <jaggies@google.com> 1416595079 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416595083 +0000

Merge "Add multi-sim support to keyguard" into lmp-mr1-dev