tree cc2aae8a08b6e1429c456596bcbfcba6485b1618
parent db5fcfd0644227aebd0b1201abd9c23a93a77660
parent 550a11455a5155b078085fd5f464d7f3e5dfb7fc
author Android (Google) Code Review <android-gerrit@google.com> 1256925212 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1256925212 -0400

Merge change I08c19bee into eclair

* changes:
  DO NOT MERGE: Another gcc 4.0.3 workaround.