OSDN Git Service

am e55e5b84: am 3957b5fc: Fix the build.
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 7 Dec 2011 21:19:37 +0000 (13:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 21:19:37 +0000 (13:19 -0800)
* commit 'e55e5b84e53889791c0b6be8cad7cc134c9dfcba':
  Fix the build.


Trivial merge