tree fb51844e6d8e53dcdfc920e6684092f87b14ef11
parent 08a65d2c5b75ac57428d7da718f3e2569f321d4c
parent 6a1413b1b2a43b4a824007e853e15b832bb7a95d
author Eric Fischer <enf@google.com> 1300490240 -0700
committer Eric Fischer <enf@google.com> 1300490240 -0700

resolved conflicts for merge of 6a1413b1 to gingerbread-plus-aosp

Change-Id: I4ed72126141eadbea8630d4df5384b774260aecd