tree 91af25088f343404862708ff385ea3df39acca84
parent b2b3918f29ade48cae7502806056d8cacf6e52a9
parent 2328ff877e0906f7fab7fe05ebd4311517836ddc
author Ruchi Kandoi <kandoiruchi@google.com> 1513734557 +0000
committer android-build-merger <android-build-merger@google.com> 1513734557 +0000

Merge "Remove android.permission.WRITE_SECURE_SETTINGS from AndroidManifest.xml" am: 506232d1d4
am: 2328ff877e

Change-Id: Ie3586d8f32fc7b4b05051538199b0e716c9e787c