tree 8df9196a58f89c0f05b49e3588bc08481a1ee198
parent 085d0f55e6a2e8449961174673d43a5868874639
parent 078ccbdbb98c118aa87cab2fef61ff90dd128358
author Christopher Tate <ctate@google.com> 1279260327 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279260327 -0700

am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread

Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
  Add native C APIs for working with the Asset Manager