tree f8892c78c7190d078a943f15839fa7e0f55dd5f8
parent 6f4ad1df4e3c2a064e087667b4b0c82ae6beb027
parent a89c9170d2b0b20410aa96cee7a43b38035564b6
author Xia Wang <xiaw@google.com> 1299628934 -0800
committer Xia Wang <xiaw@google.com> 1299628934 -0800

resolved conflicts for merge of 978cc18d to honeycomb-mr1

Change-Id: Ic571fe4fda9d299b6b5d5e100b43fa8cc46e2ce6