tree c87e14d68123e935f3e5f826bec64acc1786005c
parent de8b6a5d99da277edf17b741805cc2992f940ab9
parent 8194bb9bd05ae4e41d3df68d37346937b9e9c487
author Jean-Baptiste Queru <jbq@google.com> 1342806107 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1342806109 -0700

Reconcile with AOSP

Change-Id: Ie9453a953131b58d303c567493915cb98b652a58