summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-11-15 14:03:15 -0800
committerJean-Baptiste Queru <jbq@google.com>2009-11-15 14:03:15 -0800
commit696cfa660e024cca3ea22ca3686283f622ddfdb2 (patch)
tree834c5515edb2cfa8c29426c7a6aaba0e2ba285fd /include
parenta4f8a20b42ed4b17694c4c5ef05e41f5fc9dafd6 (diff)
parent66f4e7ea7a600c512eeb24c039610320f155e97e (diff)
downloadframeworks_av-696cfa660e024cca3ea22ca3686283f622ddfdb2.zip
frameworks_av-696cfa660e024cca3ea22ca3686283f622ddfdb2.tar.gz
frameworks_av-696cfa660e024cca3ea22ca3686283f622ddfdb2.tar.bz2
merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions