tree d08ec738e8574d51151103be5ac582fe8bfeb947
parent 343fe48adedd23a5b5b9ef86da911ec2276bd31e
parent ff80940ae8358f49efbbb2d989b02e4b23dd1930
author Jean-Baptiste Queru <jbq@google.com> 1340750566 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1340750576 -0700

Reconcile AOSP master and JellyBean

Change-Id: I7c9f8c596ec815bc110922acccbb346aa7cbb2bf