tree 286a4a4a32c34e16b09c2df531bd855557b7f084
parent efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700
parent c1b330818e06cf5a3dc8d342e941eba5bce0929a
author Jean-Baptiste Queru <jbq@google.com> 1292371866 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1292371943 -0800

resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221