tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent cdbe0579a5b911a563d83e53e4c20820dfdf6557
parent decc72dd5184d4cb3f898f30fa0c981acf82816e
author Xavier Ducrohet <xav@android.com> 1302563754 -0700
committer Xavier Ducrohet <xav@android.com> 1302563754 -0700

resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp

Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701