tree 141aa9cdb446d7826247d0182a8d371257c5343b
parent 69ed0b628e18570f3fc7909fcdadc1e06f42e944
parent dec3dda8730c8d2bd6e45171bf2d83bf89d5d806
author Robert Greenwalt <rgreenwalt@google.com> 1305931555 -0700
committer Robert Greenwalt <rgreenwalt@google.com> 1305931555 -0700

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

Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d