summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-17 15:50:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-17 15:50:22 +0000
commit914eec761f53f2b0c7855cd8ffc8a79016b52622 (patch)
tree7c1e87fe5ffc7adaacdbeb7c83ceaaa2a82ce66a /include
parentc8e20472a77b41546157caa71b6bd6478ca1985d (diff)
parent8299ff701b66caf513e6cc8807b413bf44b8c2f6 (diff)
downloadsystem_core-914eec761f53f2b0c7855cd8ffc8a79016b52622.zip
system_core-914eec761f53f2b0c7855cd8ffc8a79016b52622.tar.gz
system_core-914eec761f53f2b0c7855cd8ffc8a79016b52622.tar.bz2
am 8299ff70: Merge "init: 64-bit build issue" into klp-volantis-dev
* commit '8299ff701b66caf513e6cc8807b413bf44b8c2f6': init: 64-bit build issue
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions