tree 16c9fc32989385b5726f82ce1603b000d7ca9f16
parent 8577e8649062953a59e0ac652b5ac16c96c1c1f4
parent a817ff9cf61daeb69e8b8382c80677e3e5c573a9
author Brian Carlstrom <bdc@google.com> 1368594255 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368594255 -0700

am a817ff9c: resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp

* commit 'a817ff9cf61daeb69e8b8382c80677e3e5c573a9':
  Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().
  Add basic Darwin support to libcorkscrew.