OSDN Git Service

am 6a2e8695: am 5d1bf1f6: Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:59:57 +0000 (07:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Dec 2010 15:59:57 +0000 (07:59 -0800)
* commit '6a2e86958d2c1827daa0639e5e9ed9515252f3be':
  Fix compilation error:


Trivial merge