OSDN Git Service

am 201c74ef: am 6f68b90e: am 8825de17: Merge "Revert "Revert "Fix build.""" into...
authorFilip Gruszczynski <gruszczy@google.com>
Mon, 1 Jun 2015 19:04:10 +0000 (19:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 19:04:10 +0000 (19:04 +0000)
* commit '201c74ef59d657660b2f8018091786bb63729534':
  Revert "Revert "Fix build.""


Trivial merge