tree d14ab6955e4cbfee01ddd58d21faec8151c666cb
parent ca895fbc0b6bf4070c2c275945cbdfae22150590
parent 6766cc9e3c1d5dcec5db445a8d06bb6d4f301562
author Kenny Root <kroot@android.com> 1350674112 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350674112 -0700

am 6766cc9e: Merge "allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access"

* commit '6766cc9e3c1d5dcec5db445a8d06bb6d4f301562':
  allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access