tree f1548891fab33ca03923f70cf25a2ffeab50be82
parent 3be9523784cc4038f601e510faee595117cdacb3
parent efe6039f71e9bac2138003b3287e94a7ab7e5c55
author Jean-Baptiste Queru <jbq@google.com> 1280516911 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1280516911 -0700

resolved conflicts for merge of 27eecb70 to gingerbread

Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1