Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours
am: 6496c3757b -s ours
Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5
This commit is contained in: