tree 39e315f0abd398d2e8d5d444fad30031468326a9
parent 6386eb945fddbd82e421013f76bbd537b92d6669
parent 5092d8c066a1a98343bbc16e33a6753e577b5e7f
author Jean-Baptiste Queru <jbq@google.com> 1296327835 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296327881 -0800

Merge 0ef57993 from gingerbread

Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf