tree a66eaad03b6a4af3f3bf11df94c3998f705d9d4e
parent c6eeacd9341c0348c2eb29d1808eb17ea08464f4
parent e00a3b80635c830dc57510556231cc40db6651f5
author Nick Kralevich <nnk@google.com> 1366934279 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366934279 -0700

am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev

* commit 'e00a3b80635c830dc57510556231cc40db6651f5':
  Don't set ADDR_COMPAT_LAYOUT on the emulator