summaryrefslogtreecommitdiffstats
path: root/include/private
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-13 21:34:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-13 21:34:31 -0700
commitbfcbd9a9e1bc3a8d721e906e4c621f85104c7d93 (patch)
tree4d5681e965225422ca8d44f2e63d03c3a9e3334c /include/private
parentd91ac162d196a232d3cec58a8486384eaa8847c3 (diff)
parentd48e0382c3db1827ccb79fe912d271d426dd46ad (diff)
downloadframeworks_base-bfcbd9a9e1bc3a8d721e906e4c621f85104c7d93.zip
frameworks_base-bfcbd9a9e1bc3a8d721e906e4c621f85104c7d93.tar.gz
frameworks_base-bfcbd9a9e1bc3a8d721e906e4c621f85104c7d93.tar.bz2
am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
Merge commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken * commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad': Doc change: adjustments for ndk feature description
Diffstat (limited to 'include/private')
0 files changed, 0 insertions, 0 deletions