| commit | 24596f51d51d8f401d432ebf3437ddbb383b5ec0 | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Thu Apr 06 16:47:52 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 06 16:47:53 2017 +0000 |
| tree | 8eac74080333c5da8d559cceda90ddb86041084a | |
| parent | 0c4747401a26011bbbcffc236fd2fb293df333e6 [diff] | |
| parent | c50403c60689e225e8784dd2ce1c62be93f1cfe7 [diff] |
Merge "Prevent apps from displaying over Settings" into oc-dev