tree f2d9e7272da146c09e0458df11991e3e8e9eee62
parent 0faa1ac00820fd8bd244f3dfb7cffefa831f1acb
parent ef5dd65446869a14d742d88dcfb64f95e8f4f163
author Shijian Li <shijianli@google.com> 1484877709 +0000
committer android-build-merger <android-build-merger@google.com> 1484877709 +0000

Merge "Partial cherry-pick changes on permission model change. am: b8e4193e57 am: 3c17d8a871" into nyc-mr2-dev-plus-aosp
am: ef5dd65446

Change-Id: Ia303bbf624576ebe6aba282003c27d09069cb264