tree 2b1d625e5856ed2ed5de26b99adc111cab3156d6
parent 6baa899e28699571ec3e7f5a3852e2b4066af5c7
parent cf9bd8d74326da59610cd178d8f91966f8903953
author Dianne Hackborn <hackbod@google.com> 1278641417 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278641417 -0700

am 49159f07: am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread

Merge commit '49159f0748c704e53a7bd754f26113d9ab844a97'

* commit '49159f0748c704e53a7bd754f26113d9ab844a97':
  Add new glue code for writing native apps.