tree bb0045141fa75598f01a7da9e67da13756499e3d
parent db204e9ada8605392fdc90fd3030b4e51db9e48d
author Jan Nordqvist <jannq@google.com> 1454533263 -0800
committer Jan Nordqvist <jannq@google.com> 1454533263 -0800

Fixed API merge issue in master.

Change-Id: I4bf0104ee703daa4da78d6637c1fa82ace57f073