Merge changes from topic "am-4d16946683654151aaf688b69a96221d"
* changes: Merge changes from topic "permTree-sc-dev" into sc-qpr1-dev am:45647e1d4dam:de697d133eam:4b8a858cdaam:71a92c38a4[automerger skipped] [automerge] RESTRICT AUTOMERGE Validate permission tree size on permission update 2p:1d86c8b299am:23e6363be7-s ours am:9470eda2a5-s ours am:96625ecbd0-s ours am:f6d7745196-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
f4e1abab7b