tree 177ac37c59e8e057f70fc1dd4baefd6703ffe5db
parent 4f1a0c315367150292da970280636d0fab54e848
parent 3711df3c1fbd2d310eb4f742a539913a3b5ce0af
author Ben Cheng <bccheng@google.com> 1363040670 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363040670 -0700

am 3711df3c: Merge "Fix full_x86-eng build."

* commit '3711df3c1fbd2d310eb4f742a539913a3b5ce0af':
  Fix full_x86-eng build.