OSDN Git Service

am 94335cc8: Merge "Put back inline definitions if using an old API."
authorDan Albert <danalbert@google.com>
Fri, 30 Jan 2015 19:44:02 +0000 (19:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jan 2015 19:44:02 +0000 (19:44 +0000)
* commit '94335cc8e2f32638d9e38741ddabfd19a38e0840':
  Put back inline definitions if using an old API.


Trivial merge