tree 8f156bbb021b262b6dc7abb3eec99c4e6f520fbf
parent 647ff64596399e0fa234622302e03facf84ee3f6
parent 08faac3c26e12863858e1534985dd950193f755f
author Hung-ying Tyan <tyanh@google.com> 1286498451 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286498451 -0700

am 08faac3c: Unhide SIP API.

Merge commit '08faac3c26e12863858e1534985dd950193f755f' into gingerbread-plus-aosp

* commit '08faac3c26e12863858e1534985dd950193f755f':
  Unhide SIP API.