OSDN Git Service

am 4b1a7c20: Fix build breakage
authorAlan Viverette <alanv@google.com>
Thu, 10 Apr 2014 21:38:02 +0000 (21:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Apr 2014 21:38:02 +0000 (21:38 +0000)
* commit '4b1a7c203d5e32c8b2dc7f4f54f28559ca31860a':
  Fix build breakage


Trivial merge