OSDN Git Service

am 3cd153a0: another attempt to fix the build
authorMathias Agopian <mathias@google.com>
Thu, 7 Mar 2013 17:31:05 +0000 (17:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Mar 2013 17:31:05 +0000 (17:31 +0000)
* commit '3cd153a0330d4234a536fc5f4e4346413bde5a44':
  another attempt to fix the build


Trivial merge