OSDN Git Service

am 284e3ae1: Merge "NDK access to the Asset Manager" into gingerbread
authorChristopher Tate <ctate@google.com>
Thu, 15 Jul 2010 22:03:26 +0000 (15:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jul 2010 22:03:26 +0000 (15:03 -0700)
commit3589326ba70415180245e2d6845f6281458ba04a
tree92dad5e330bafad07cad0b07b6bad4a0f75ec1a3
parentbcc3a3c0a1d413b2e1b89ed2a54fd074dd4745ce
parent284e3ae11c6f1fee5b2d417eea16b3a2126a04a5
am 284e3ae1: Merge "NDK access to the Asset Manager" into gingerbread

Merge commit '284e3ae11c6f1fee5b2d417eea16b3a2126a04a5' into gingerbread-plus-aosp

* commit '284e3ae11c6f1fee5b2d417eea16b3a2126a04a5':
  NDK access to the Asset Manager