| commit | fa14b80793711f72f190fef5a41228776b97e6a0 | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Mon Jul 06 16:14:41 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 06 16:14:43 2015 +0000 |
| tree | 681b03ad5bf3676dcb4661e2c6d548bfdaad86ab | |
| parent | 01fd766a6a53d62f772f0b9da32655977354f1eb [diff] | |
| parent | 97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf [diff] |
Merge "Display explanatory text in 'App permissions' settings when permissions policies are enforced" into mnc-dev