OSDN Git Service

am 18ef3725: DO NOT MERGE. Fix the build.
authorRomain Guy <romainguy@google.com>
Thu, 19 Aug 2010 22:18:34 +0000 (15:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Aug 2010 22:18:34 +0000 (15:18 -0700)
commitc22a9b7d8eb2e4b2162b0705376303ce9317ae64
tree849c2bad6cc17de4aabbf3d7c77473978f489cc3
parent82fff40ab0522ab6e19d9e7a43764755d396d385
parent8c02312a82908ddbd0425d610ad3cbdb5930e47c
am 18ef3725: DO NOT MERGE. Fix the build.

Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp

* commit '18ef37258d897928c68b89535a93b99d8a817d3c':
  DO NOT MERGE. Fix the build.