tree 701114b5c0756dc29829857bdb8d6e8048c01ac0
parent 4569166a59e9c63b5a8272dc312f362c9d1f0916
parent 682b60cbfcb161fc1d68257ccf784d3c5bf8e72a
author Jay Shrauner <shrauner@google.com> 1386271443 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386271443 +0000

am 682b60cb: am 252147ee: Merge "Drop BIND_DIRECTORY_SEARCH permission"

* commit '682b60cbfcb161fc1d68257ccf784d3c5bf8e72a':