tree 681b03ad5bf3676dcb4661e2c6d548bfdaad86ab
parent 01fd766a6a53d62f772f0b9da32655977354f1eb
parent 97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf
author Alex Chau <alexchau@google.com> 1436199281 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436199283 +0000

Merge "Display explanatory text in 'App permissions' settings when permissions policies are enforced" into mnc-dev