tree 07900e7d1a829a8465ad27380e24dacaeb1b1345
parent 42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae
parent 6cce32b6adbb3a9725fc730ba0e0068a74657e60
author Christopher Tate <ctate@google.com> 1279231214 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1279231214 -0700

Merge "Add native C APIs for working with the Asset Manager" into gingerbread