OSDN Git Service

Merge "Make part of KeyguardSecurityContainer protected" into nyc-dev am: 0418ea7
authorEvan Rosky <erosky@google.com>
Wed, 30 Mar 2016 23:21:24 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Mar 2016 23:21:24 +0000 (23:21 +0000)
commit04ecd75555287ae91cb216e438d29933d51937bc
tree271368b0f67e5a1d3bf22572957c99c349c5182d
parentf545e52e9557e357bca3ba9fc8e8b67ff8c6a292
parentbbdc4961987acba549a76272032cde78a4179634
Merge "Make part of KeyguardSecurityContainer protected" into nyc-dev am: 0418ea7
am: bbdc496

* commit 'bbdc4961987acba549a76272032cde78a4179634':
  Make part of KeyguardSecurityContainer protected

Change-Id: I7238d82c6134b57c4b7986997f90105bcd8e2b1a