OSDN Git Service

am 2adffc89: (-s ours) am 718f34dd: Regenerate generated files after upstream sync.
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 10:50:06 +0000 (10:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:50:06 +0000 (10:50 +0000)
* commit '2adffc89d8d009d2c978190e3a1f0afa1387f37a':


Trivial merge