summaryrefslogtreecommitdiffstats
path: root/include/binder
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2010-07-15 23:05:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-15 23:05:27 -0700
commitba57d1b9a512a56eaaed3b95b8144d0a25f2b01b (patch)
tree5322745504ef47cfeecb6b4fab70cb6332e35b95 /include/binder
parente52c769000300bbb7b377ccccda90f719261c682 (diff)
parent083b89a41c2eb8e4f1a5e7f0d911bc6e585ad35a (diff)
downloadframeworks_native-ba57d1b9a512a56eaaed3b95b8144d0a25f2b01b.zip
frameworks_native-ba57d1b9a512a56eaaed3b95b8144d0a25f2b01b.tar.gz
frameworks_native-ba57d1b9a512a56eaaed3b95b8144d0a25f2b01b.tar.bz2
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
Diffstat (limited to 'include/binder')
0 files changed, 0 insertions, 0 deletions