tree 52ed0994edd1c00b543b573478868a6e7e0b3b6c
parent 8bf0c015f77a4aee94a77dcef0d2a411990d9b44
parent 52ec89cfd91d7d397806780d5598dafa703540c8
author Olivier Bailly <olivier@google.com> 1291072353 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291072353 -0800

Merge "fix int vs. pointer mismatch in return statement. Add missing include header for compilation on x86 target."