OSDN Git Service

am 860728a3: am e5ab92a2: am cf6ab741: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 May 2010 23:20:41 +0000 (16:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 May 2010 23:20:41 +0000 (16:20 -0700)
commit7580722dd42463043e5192b86c1ca77b7fb6c4b5
tree4cf013daa72d160c2277eafa6e18c3dc4df135ef
parentd1bf0ff180ba3a6fbd9c668301be68de5c97f443
parent860728a3f0c7a0346465d0dcf64127fa87d1490c
am 860728a3: am e5ab92a2: am cf6ab741: merge from open-source master