tree 4ee772f8769322b0900e9bacc1e506fa3807fa81
parent 483f7130b593bb79f8ad0740356963aab42ccf54
parent b842629c020f2bdb26998a7332800d32f60e3c31
author Scott Main <smain@google.com> 1298086949 -0800
committer Scott Main <smain@google.com> 1298086949 -0800

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

Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6