summaryrefslogtreecommitdiffstats
path: root/include/system
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-06-13 10:24:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-13 10:24:51 +0000
commit232c711795bfdbe2048222b57b1374fbea548839 (patch)
tree0b3bee37aa809c5bcf78dae2b4b23762987d87f3 /include/system
parent9ea2ad5796279435d14899c6357d56094c5feda1 (diff)
parent46ed1c8c99fce33c78e239d4155ece84feca069d (diff)
downloadsystem_core-232c711795bfdbe2048222b57b1374fbea548839.zip
system_core-232c711795bfdbe2048222b57b1374fbea548839.tar.gz
system_core-232c711795bfdbe2048222b57b1374fbea548839.tar.bz2
am 46ed1c8c: am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."
* commit '46ed1c8c99fce33c78e239d4155ece84feca069d': Fix windows sdk build.
Diffstat (limited to 'include/system')
0 files changed, 0 insertions, 0 deletions