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)
commit9a3dfc06b94a59bdc7005a8a944996c956527c19
treeb7a76062aa4ef79f679e6a510a19e311ea2cc8a1
parent386388581bb866cae7809feaac5b685d8e90ac4f
parent68eb6649fe703b083c51356526f92e4e219dc140
am 68eb6649: am 432f8d88: Reconcile with AOSP master

* commit '68eb6649fe703b083c51356526f92e4e219dc140':