| commit | fbf21f4c857a87a27f19203975c882cf29a59d1a | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Thu Apr 06 17:19:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 17:19:25 2017 +0000 |
| tree | fc17bb975ddbfe43d124b435806bf5c169e36b86 | |
| parent | ab86bf82447a5624ebc6881af5312f4c30cc3c41 [diff] | |
| parent | 8606c652d5f7d32ab5a011af96e9cd1fc9c108ab [diff] |
Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5 am: 8606c652d5 Change-Id: Idb0cbf6b0467f9fd43b1e9e40e622146640a9a7e