OSDN Git Service

am acd30108: am d17c8977: am 0b6a436f: Merge "Fix build"
authorJean-Baptiste Queru <jbq@google.com>
Tue, 27 Mar 2012 15:11:09 +0000 (08:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Mar 2012 15:11:09 +0000 (08:11 -0700)
commit3eb3d2e31afcfca6d0cc54a1f60807da50e97965
treecccd8bcb71a425f7013045cc79acbc17648424cd
parent15df921b8dd257dac828ea0f9c280a7d18da37ac
parentacd3010843b4e646ac53685054d82ad7bd88893c
am acd30108: am d17c8977: am 0b6a436f: Merge "Fix build"

* commit 'acd3010843b4e646ac53685054d82ad7bd88893c':
  Fix build