tree 8665017de55657f88b8d51265c056934aadb89bf
parent e9dab9cf84773619960aa2187c153efa57203348
parent 08fdbc5e9c6b1c70ce406327f25a4f6386f4b03c
author Android (Google) Code Review <android-gerrit@google.com> 1257384431 -0500
committer Android (Google) Code Review <android-gerrit@google.com> 1257384431 -0500

Merge change I4499ad72 into eclair

* changes:
  Fix bad merge fixes build breakage.