tree c24de96e5d6f038f451d8dc8da078f14f95a4be8
parent 954f2567f90f1fa8b3d3d7d0c426ebd35494e182
parent 9b32f9a46687c1f9d720452f8972e43f1d15294b
author Sreeram Ramachandran <sreeram@google.com> 1415139084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415139084 +0000

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

* commit '9b32f9a46687c1f9d720452f8972e43f1d15294b':
  Don't use framework permission strings for netd permissions.