OSDN Git Service

am ecd3df97: Fix generated files after upstream sync.
authorElliott Hughes <enh@google.com>
Fri, 11 Sep 2015 22:14:11 +0000 (22:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Sep 2015 22:14:11 +0000 (22:14 +0000)
* commit 'ecd3df97a36c0381ec63fca3d0762658e2efa17d':
  Fix generated files after upstream sync.


Trivial merge