tree 97250e36fdfe39e0ef7b60dd755b6ed6a2b4db8c
parent 9fe71456e6610a651d43af502bcd7042916fd2f3
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1268672755 -0700
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1268672755 -0700

resolve conflicts

Change-Id: I2af5d0c5d3c80ad598a5cd7729f8a1b9b2842502