OSDN Git Service

am 5d1a63ea: am 2f4c73d9: Merge from AOSP
authorJean-Baptiste Queru <jbq@google.com>
Fri, 21 Sep 2012 16:11:41 +0000 (09:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Sep 2012 16:11:41 +0000 (09:11 -0700)
* commit '5d1a63eac8e719f20b76b79bef99e2bce84180c9':


Trivial merge