| commit | 8606c652d5f7d32ab5a011af96e9cd1fc9c108ab | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Thu Apr 06 17:07:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 17:07:07 2017 +0000 |
| tree | d49c5186296674b70d86d096d060b22bb224ed59 | |
| parent | 0a361238d7115a1266196c3320c74b97f312e279 [diff] | |
| parent | 24596f51d51d8f401d432ebf3437ddbb383b5ec0 [diff] |
Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5 Change-Id: Ie410feec95b77b5c97b19e35a3b3642df1f062db