OSDN Git Service

am dac56db6: Merge "Fix the build." into klp-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Sat, 7 Sep 2013 00:02:28 +0000 (17:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 7 Sep 2013 00:02:28 +0000 (17:02 -0700)
* commit 'dac56db680251dd9bd3913b6152d33457366c722':
  Fix the build.


Trivial merge