OSDN Git Service

am 68eb6649: am 432f8d88: Reconcile with AOSP master
authorJean-Baptiste Queru <jbq@google.com>
Fri, 28 Oct 2011 15:27:07 +0000 (15:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Oct 2011 15:27:07 +0000 (15:27 +0000)
* commit '68eb6649fe703b083c51356526f92e4e219dc140':


Trivial merge