tree 59d4d46ad3e56f2a322676955c7cde3a4528ba8e
parent 94179a509ee3f6ba7b4ba45fb90477b01049dab8
parent 1e343cb119fde897b0eb6503f114edf20e9b3532
author Jean-Baptiste Queru <jbq@google.com> 1335371368 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1335371380 -0700

Merge from AOSP

Change-Id: If2e8e4305d10df738cc4ebcf226077f273a48cbf