| commit | 90de5f2e5f6d8f536128cf39305653b35d95cee7 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Mon Jun 19 15:56:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 19 15:56:45 2017 +0000 |
| tree | 0290eed09f8f763b2b7a704e8f467d456b72c889 | |
| parent | 1cf432610a7d4f71ae7b071a3b75e75711e8e223 [diff] | |
| parent | a24fdfd317c98bfc563e20cb58bb736e6acdd6f9 [diff] |
Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10 am: 31c2f1e881" into oc-dr1-dev-plus-aosp am: a24fdfd317 Change-Id: I5bc39949909385bd87cfffeb70a5df2e55054589