tree 4b68badbd09ae1cd04cfddd6c734305fd6828b78
parent d92333f17e4bd9089d0c0712c7eb75bf7550fa06
parent 41b49aebe44cb8fc1611e2278539fe1b7033ad3b
author Jean-Baptiste Queru <jbq@google.com> 1342798796 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1342799024 -0700

Reconcile with AOSP

Change-Id: I1eb354b417c3e1c990cc9c35ae8981f949f8d916