tree 19b725877a881a4d712d7dd30509e4b18f49c7a3
parent 54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1
parent bd0c91c8b9d36fd3ed8d8ac7e66b3e1eee3bb0bb
author Ying Wang <wangying@google.com> 1301616013 -0700
committer Ying Wang <wangying@google.com> 1301616013 -0700

resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp

Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1