OSDN Git Service

Merge "Fix build aflter conflicting changes got in."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 18 Feb 2016 16:56:42 +0000 (16:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 18 Feb 2016 16:56:43 +0000 (16:56 +0000)
commit07f7affb338b529d34e4e18b7e8a631c16bd9765
treeb821021b98e5afae4c1feebc9a45631db427fed7
parent1d01ef7f0f79b032449c35203ca9543fb8a0b22f
parent1fe26e1ca54e2f0eed6056ebdbc6b2e6c02ee0bb
Merge "Fix build aflter conflicting changes got in."