OSDN Git Service

Merge "Fix stub_test after semantic conflicting merge."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 24 Mar 2016 14:38:33 +0000 (14:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Mar 2016 14:38:33 +0000 (14:38 +0000)
commit25ff18e161e098a08ff7ade7a697764fdb417669
tree0da8af75825d9e5d160782786dbdd97c6cc1f55c
parentcbf7a90e82b7c0d214167eff3a51a55947c6fd1f
parent1345aa365e8baae25d2b3a859a4858fffbe6b11f
Merge "Fix stub_test after semantic conflicting merge."
am: 1345aa3

* commit '1345aa365e8baae25d2b3a859a4858fffbe6b11f':
  Fix stub_test after semantic conflicting merge.