OSDN Git Service

am 996e8b1f: am 614fc178: Fix build
authorRobin Lee <rgl@google.com>
Thu, 25 Jun 2015 23:28:50 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 23:28:50 +0000 (23:28 +0000)
* commit '996e8b1fe2a0f549ffcec32255e1edc42e1e7b4a':
  Fix build


Trivial merge