OSDN Git Service

am e06f9faf: (-s ours) am 97809c21: Regenerate generated files.
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 10:50:10 +0000 (10:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:50:10 +0000 (10:50 +0000)
commita5227fddf169e635bf7d982e9bc5d4cb81f45092
tree6b475436496ddc7cfa2386232f644f9ff991476f
parent209f973b587d1ca69455a7e8d70790b8752ad4d6
parente06f9faf6fa7ec0eca850887cdc26cca09d9925c
am e06f9faf: (-s ours) am 97809c21: Regenerate generated files.

* commit 'e06f9faf6fa7ec0eca850887cdc26cca09d9925c':