tree 305a789cd35d3c2f2354a015c3175980c1525fa2
parent 0e6242f7e2c1181d486ae8f86592619738574dd3
parent 9915e3fd389519764436ad029ef2f172eb1cc0ca
author Brad Fitzpatrick <bradfitz@android.com> 1284497441 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284497441 -0700

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

Merge commit '9915e3fd389519764436ad029ef2f172eb1cc0ca' into gingerbread-plus-aosp

* commit '9915e3fd389519764436ad029ef2f172eb1cc0ca':
  Add dvm_lock_sample's new fields.