tree 6fd4fa9f3e207f5a0aaf50edf972374196390a49
parent 0a36cec642fb58e295d0608026890d95d0ae3cc0
parent 2433c443bb5fe96d9a39b59e10e3c03d791e2278
author Kenny Root <kroot@google.com> 1305834494 -0700
committer Kenny Root <kroot@google.com> 1305834494 -0700

resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp

Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1