tree 8f3105647568b60e193683184ffddb82e25fbeee
parent 51b8edb5173e84eb54fd5f7ad34fc0f67c31f5cf
parent f8a7ff191af760ee01e5c31f154f0dbc7abfef7e
author Ying Wang <wangying@google.com> 1299719110 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299719110 -0800

am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

* commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e':
  Dist build.prop in sdk builds.