tree dd35c715c7298060569561e65b1e1a7a07824dbc
parent 5f18bbe034ae616be1bce2f1d60ff9d5c060a2c6
parent 7280e66e04ab7ac604b06bb065879db4d1caf5e7
author Usman Abdullah <uabdullah@google.com> 1468429086 +0000
committer android-build-merger <android-build-merger@google.com> 1468429086 +0000

Merge \"Grant Camera Permissions to DialerPackage\" into nyc-mr1-dev
am: 7280e66e04

Change-Id: I4a914460a950cfcdf481e215b4a260d06f1b9c00