OSDN Git Service

Merge "Make part of KeyguardSecurityContainer protected" into nyc-dev
authorEvan Rosky <erosky@google.com>
Wed, 30 Mar 2016 23:18:58 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Mar 2016 23:18:58 +0000 (23:18 +0000)
commitbbdc4961987acba549a76272032cde78a4179634
treedb48b3c3dfdd007364b02091669afd5cd770393e
parent882f62dd1a49bdc9ed5a7f13423de0075911d70a
parent0418ea7a7337a729d71475fd3d341180a0144b6b
Merge "Make part of KeyguardSecurityContainer protected" into nyc-dev
am: 0418ea7

* commit '0418ea7a7337a729d71475fd3d341180a0144b6b':
  Make part of KeyguardSecurityContainer protected

Change-Id: I9ebba6f7d8ebb145bcf8003f5f69b2a8e0a01721