tree aee87b7058701d4bfabe151d9f4592be50048da0
parent b387571c42aa08b5b9aa9833edb94c16a623e535
parent 01937f63dc0e4071f0b6d7513ca31a28d2489181
author Jean-Baptiste Queru <jbq@google.com> 1284305694 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1284305704 -0700

resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp

Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617