OSDN Git Service

am 41bcf3e4: (-s ours) Fix build.
authorTao Bao <tbao@google.com>
Thu, 2 Jul 2015 03:28:43 +0000 (03:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Jul 2015 03:28:43 +0000 (03:28 +0000)
commit414b80e17e6e5c5f90ddd00131987f4a860b8d69
tree2676dec08ec9e787d93a6d180b77c09fc0a4c6eb
parent94a52c3609c04fa94027597ec29f6382a433594e
parent41bcf3e425b9a1792b65b16b1c115b018348bde7
am 41bcf3e4: (-s ours) Fix build.

* commit '41bcf3e425b9a1792b65b16b1c115b018348bde7':
  Fix build.