OSDN Git Service

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


Trivial merge