tree 70288e2585beeaed0bd9c3fc2d616a21360116b1
parent 1cc1b10f0b17fbeca0837578582cba2e98a74f23
parent 853d146585b8f0c0820f21a9d6b607efa11e156e
author Jean-Baptiste Queru <jbq@google.com> 1307545742 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1307545742 -0700

Reconcile with gingerbread-release

Change-Id: Iade0c3ecab1c6d6a0b8c3ab7381c60975393d9a1