am 466ad118: am 9e38f2e4: am a85f449b: am c0ebbcd5: Merge commit \'720d1e962e248a30f81c1493081ff4c01e35c839\' into froyo-plus-aosp

Merge commit '466ad118ba758ca09f67adb9984ce7838f1baac2' into dalvik-dev

* commit '466ad118ba758ca09f67adb9984ce7838f1baac2':