OSDN Git Service

am c795f109: resolved conflicts for merge of b699685e to mnc-dr-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Mon, 10 Aug 2015 20:10:40 +0000 (20:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Aug 2015 20:10:40 +0000 (20:10 +0000)
* commit 'c795f109bcf2d4c8ad3e854f043fa8214effdb59':
  Fix Mac build.


Trivial merge