tree a2ae3f44fdb0e35012858171057a9a6e6224a296
parent 202729a0c1d966345dcbfa21db7d886b5d1e6200
parent 8f1f5b061f12fd0b155c70b46796f1605e8bf292
author David 'Digit' Turner <digit@google.com> 1310427521 +0200
committer David 'Digit' Turner <digit@google.com> 1310427521 +0200

resolved conflicts for merge of 8f1f5b06 to gingerbread-plus-aosp

Change-Id: Ie5d26c5a8b31e85aa5137ddbc5eef3616df4fcba