tree 177ac37c59e8e057f70fc1dd4baefd6703ffe5db
parent 2c9037b2cef7404da12067d2c0f63a0956761701
parent 65ddab7c6150a7f86839d046f9f63a9a5cbb220c
author Ben Cheng <bccheng@google.com> 1363041334 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363041334 -0700

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

* commit '65ddab7c6150a7f86839d046f9f63a9a5cbb220c':
  Fix full_x86-eng build.