tree a3fd45402544fdc43584175b26f5281d3fe65dd0
parent 27c782bfcdbec689fc7d195fe485e6f2c623e7cf
parent db0d59d1b4a02816832d330c0bfa86ee67f2776e
author Raphael <raphael@google.com> 1301091235 -0700
committer Raphael <raphael@google.com> 1301091235 -0700

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

Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30