tree f0dcf64c48c889735846a0cb755735b739441f4d
parent 0dda5a191df021a13c91d42109d55f4434b2c5da
parent ba3ed0c7d0be642ca84b71a1a53fa1cfe6df4409
author Jean-Baptiste Queru <jbq@google.com> 1283984646 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1283984646 -0700

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

Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb