Xin Li 220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from ...

oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d

2017-11-14 12:31:11 -08:00

..

src/com/android/commands/locksettings

…

Android.mk

…

locksettings

…