tree 6dbf435420f3d5474a1456147c335b10cab203d4
parent f03e2d3f3104a85d64f66a18ab13d5ba5fb4131c
parent ff24286911ec8760174296e2228722e19a4d2bd6
author Brad Fitzpatrick <bradfitz@android.com> 1296000702 -0800
committer Brad Fitzpatrick <bradfitz@android.com> 1296000702 -0800

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

Change-Id: I560f07374589a844bdf611da8ec5e358dc451ba4