tree a681d7619fa6328d90bd904980762f6e4b369306
parent 6f0a36e691fd4c434a80631e4dda212d35745d83
parent 4894a016f41f7ccbaf3b2d03395ff6838bb0828c
author Jim Miller <jaggies@google.com> 1365719854 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365719854 +0000

Merge "Fix bug where transport shows all the time in keyguard" into jb-mr2-dev