OSDN Git Service

am c13a958f: Merge "fix build. optional tests broke" into klp-dev
authorMathias Agopian <mathias@google.com>
Thu, 15 Aug 2013 00:14:19 +0000 (17:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Aug 2013 00:14:19 +0000 (17:14 -0700)
* commit 'c13a958fba83dae63a8cf23b76b36a8fc8580aef':
  fix build. optional tests broke


Trivial merge