tree f56869325b9a8ba8735ed6fd3155e648b114b0e3
parent 607d117aa360f74bd1b83a849fbee87f9660ad93
parent 78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f
author Mathias Agopian <mathias@google.com> 1279158538 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279158538 -0700

am 78983a91: am 4055b780: Merge "move native services under services/" into gingerbread

Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f'

* commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f':
  move native services under services/