tree ccd172507aa2c20b7850e1802d494e686497c64e
parent 4e3cc66298b8e6d97670d3ed0b4170fb161d36f3
parent ef7122278207e33b724c6360945f9eae1f9a5a58
author Jorg Pleumann <> 1240980792 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240980792 -0700

am ef71222: AI 147838: A couple of fixes for making the

Merge commit 'ef7122278207e33b724c6360945f9eae1f9a5a58' into donut

* commit 'ef7122278207e33b724c6360945f9eae1f9a5a58':
  AI 147838: A couple of fixes for making the