OSDN Git Service

am 604019c8: Merge "Fix build." into ics-mr1
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 9 Nov 2011 19:34:50 +0000 (19:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Nov 2011 19:34:50 +0000 (19:34 +0000)
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.


Trivial merge