OSDN Git Service

Reconcile with AOSP master
authorJean-Baptiste Queru <jbq@google.com>
Fri, 28 Oct 2011 15:23:12 +0000 (08:23 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 28 Oct 2011 15:23:21 +0000 (08:23 -0700)
commit432f8d881d22a4516aeac46fb0d80359a252d692
treee6a637bc7cf2d9ccbc0156a0d15ba9cbaef4f29e
parentb3e6fa5e6bdaf6e1e827c3e79ffda1ef796b3a1b
parentfddf23f19e7604e6c5b3c5377e7ff6293539a1da
Reconcile with AOSP master

Change-Id: I01bd9c391b6adaabbad233b308c5dbecfd9f2827