summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-07-29 11:07:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-29 11:07:49 -0700
commit302dd91b86fe56133f6760ed5d0bf6e3219e855f (patch)
tree7ba66bd8dba5f2689a8bd806d1d5731275241313 /include
parent7fd86dea00b6d64e228a30d705b12f811567fd2e (diff)
parent9c990d4d8aa736d86427b48fb00cbe9ed9b0b4d4 (diff)
downloadframeworks_native-302dd91b86fe56133f6760ed5d0bf6e3219e855f.zip
frameworks_native-302dd91b86fe56133f6760ed5d0bf6e3219e855f.tar.gz
frameworks_native-302dd91b86fe56133f6760ed5d0bf6e3219e855f.tar.bz2
am 16263d9f: Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread * commit '16263d9f8cc01392c2f3678b381ce897647c8c81': Squashed commit of the following:
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions