OSDN Git Service

Fixed API merge issue in master.
authorJan Nordqvist <jannq@google.com>
Wed, 3 Feb 2016 21:01:03 +0000 (13:01 -0800)
committerJan Nordqvist <jannq@google.com>
Wed, 3 Feb 2016 21:01:03 +0000 (13:01 -0800)
commitf52a8f6ef7baed21af72bef81b8ed8a92437ee2f
treebb0045141fa75598f01a7da9e67da13756499e3d
parentdb204e9ada8605392fdc90fd3030b4e51db9e48d
Fixed API merge issue in master.

Change-Id: I4bf0104ee703daa4da78d6637c1fa82ace57f073
api/test-current.txt