am 9b32f9a4: am 0610ff97: Merge "Don\'t use framework permission strings for...
am 9b32f9a4: am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev
* commit '9b32f9a4':
Don't use framework permission strings for netd permissions.