tree 27e55f6d55655c6a383ac8a94dba3ebca8613865
parent 59ae828834dc177c74775cf36cafda4da9927bd9
parent b6ee08aadb580341a4d80943741b80de16a88b5d
author Jason Chen <jasonchen@google.com> 1289023735 -0700
committer Jason Chen <jasonchen@google.com> 1289023735 -0700

Resolve conflicts from merge of b6ee08aa into gingerbread-plus-aosp

Change-Id: Iebd91e356bec8bec29e120aea9bb10bcf02bc356