tree ad4d85cf0787fa3f6f0bee41633a0783bdf79773
parent 450a1a701f9f10697ad06ef8024b8e2e94439b09
parent b0301b20dc9a51a73d0f9ec24b335378cd8386ae
author Jean-Baptiste Queru <jbq@google.com> 1342800522 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1342800526 -0700

Reconcile with AOSP

Change-Id: Id2726a0d0db1e914c88fcd6159e1e8d554a26d15