tree 735c9e6a8acddf64b8886b52fc557a0689bcd283
parent b8244f47053963a89ee1964fd73c859e9863a7c5
parent 70a7c92e161225f587af453e01d2b124dbf6303f
author Mathias Agopian <mathias@google.com> 1281575262 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281575262 -0700

am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread

Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'

* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
  should fix sim build, hopefully