| commit | a24fdfd317c98bfc563e20cb58bb736e6acdd6f9 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jun 19 15:45:16 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 19 15:45:25 2017 +0000 |
| tree | b8ec4cf8df595a7d03ff545d8c76eda2b4a4ff57 | |
| parent | c2b629c61ee5be8f424e5b0ce1665e3522ee3be2 [diff] | |
| parent | accfabb4fe0af463bcc6bad37f105cf9746769df [diff] |
Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10 am: 31c2f1e881" into oc-dr1-dev-plus-aosp