tree a6c6c5a8f67d6fb814274ad1d3b78170509ff10c
parent e6f47ace30855ea7dca94256fad9983d1e916732
parent 54c2901519450c20abdd35346b8a2d78c427aa68
author Dan Bornstein <danfuzz@android.com> 1273097947 -0700
committer Dan Bornstein <danfuzz@android.com> 1273101853 -0700

resolved conflicts for merge of 54c29015 to master

Change-Id: I0b45ef84343289e84c6bcdf64b6ca4c0aff414c5