tree a470c45b0ae1a464a232542bd580f7389fa1d93d
parent 58c8a7a173a8280b0b1abe59c6f61fc3cc11b819
parent da68f488bd070bbfdbe1e9cb71f9912327db9ec0
author Jean-Baptiste Queru <jbq@google.com> 1344456576 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344456576 -0700

am da68f488: Merge "Fix the compilation issue with mksnapshot for x86 target"

* commit 'da68f488bd070bbfdbe1e9cb71f9912327db9ec0':
  Fix the compilation issue with mksnapshot for x86 target