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)
Change-Id: I01bd9c391b6adaabbad233b308c5dbecfd9f2827


Trivial merge