Merge "Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev am: 430df0fdb6 am: dca21d73ce" into nyc-mr1-dev-plus-aosp

Browse Source

am: b36dacae37

* commit 'b36dacae37c341e344b443848dda02d68866ec33':

Change-Id: I2204a2d265b90a999ef7a975926722bc6c91931e

...

This commit is contained in:

Fyodor Kupolov

2016-05-05 17:27:10 +00:00

committed by android-build-merger

parent 38205c2789 b36dacae37

commit 406762d3c5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available