OSDN Git Service

am d084b8d6: resolved conflicts for merge of 55ee845b to lmp-mr1-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Wed, 8 Oct 2014 07:52:09 +0000 (07:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Oct 2014 07:52:09 +0000 (07:52 +0000)
* commit 'd084b8d6b8c08fb399ba1127063c15a8c970c710':
  Inline helpers need to be exported unmangled.


Trivial merge