OSDN Git Service

am 6f68b90e: am 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
authorFilip Gruszczynski <gruszczy@google.com>
Mon, 1 Jun 2015 18:49:58 +0000 (18:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 18:49:58 +0000 (18:49 +0000)
* commit '6f68b90ebf7714a628b110a2c4c534c17d7e20d2':
  Revert "Revert "Fix build.""


Trivial merge