tree 9e72ad211356e1d63a6c3af40b2bfdc660f78927
parent f09b0ae832569ad5e32728c5bb74c93f65c2470d
parent 68aab7630353898d71f7a4085c15139ee27b3fb7
author Hung-ying Tyan <tyanh@google.com> 1281521382 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281521382 -0700

am 03381faf: (-s ours) am 1777a274: SIP: remove unused file.

Merge commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f'

* commit '03381faf3492cd1360b3d239c6f23a801c9d4b7f':
  SIP: remove unused file.