OSDN Git Service

am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
authorXavier Ducrohet <xav@android.com>
Mon, 11 Jul 2011 19:46:07 +0000 (12:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jul 2011 19:46:07 +0000 (12:46 -0700)
commit1e477a0fb41ad45d7704ffa4ebe87281d02410be
tree62a3555429c3caf6d6220df764adf91a9ee9b991
parent839c08876116babbe6302d7e4845f70491bca1e4
parent6ec5f34691758be379ff93ed93636e9e3893c3b8
am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.

* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
  Merge 36a3a392 from mr1.