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)
commit9700bd9657f4a9d3780263f9229297ae2203fe8d
tree5dcf752fe771414680b62175aeaafdf526c0fa00
parent3ee3141b2909fc89299f7fa4100512a9e8e95afa
parent5d1a63eac8e719f20b76b79bef99e2bce84180c9
am 5d1a63ea: am 2f4c73d9: Merge from AOSP

* commit '5d1a63eac8e719f20b76b79bef99e2bce84180c9':