OSDN Git Service

am 15b0d0c8: am 07e0af0d: am 91c8c66e: am 17aa06f6: Fix build.
authorleozwang <leozwang@google.com>
Tue, 15 Sep 2015 09:53:22 +0000 (09:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Sep 2015 09:53:22 +0000 (09:53 +0000)
* commit '15b0d0c8e15418e64e99eee3c0e4a43883a6e8fc':
  Fix build.


Trivial merge