tree 2de34eaf949bd30904e7e7343a64fce86fec4561
parent 944d50d30d738f510fefef6048e1869fde5c4212
parent ea66537c1709ba2c1547e092c0fff6323ce4ce9e
author Scott Main <smain@google.com> 1297886916 -0800
committer Scott Main <smain@google.com> 1297886916 -0800

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

Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f