| commit | 074d464d9416e60d729d50f5fa8e444235b9fd45 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 26 15:42:46 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 26 15:42:56 2012 -0700 |
| tree | d08ec738e8574d51151103be5ac582fe8bfeb947 | |
| parent | 343fe48adedd23a5b5b9ef86da911ec2276bd31e [diff] | |
| parent | ff80940ae8358f49efbbb2d989b02e4b23dd1930 [diff] |
Reconcile AOSP master and JellyBean Change-Id: I7c9f8c596ec815bc110922acccbb346aa7cbb2bf