tree 2f240b612dc80d6e63e92661aaa52d6381c75c75
parent a62bf8bb6b7a547802fb384b497e955940befa9c
parent c0728cc042bd5cc6ab520d3395deec50481f8f5a
author Gilles Debunne <debunne@google.com> 1297211638 -0800
committer Gilles Debunne <debunne@google.com> 1297211638 -0800

resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp

Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986