tree 4815b9e8e8e5996c213af8a715e3268f84dfc00c
parent f254ddc7616e281b59b6e68f8ad0020bf682ed0b
parent 2c42e4404bba0a1b065d223a1e84ef7184e1a987
author Brad Fitzpatrick <bradfitz@android.com> 1284578239 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284578239 -0700

am 2c42e440: am 9915e3fd: Add dvm_lock_sample\'s new fields.

Merge commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987'

* commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987':
  Add dvm_lock_sample's new fields.