tree 5de91054c0b6d73707104eb6ae30d0c612e94665
parent 2a57917a5cc10cbfea9a2f7ed7b040ce80c6705b
parent 49159f0748c704e53a7bd754f26113d9ab844a97
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.