OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync" into nyc-mr1-dev
authorLingfeng Yang <lfy@google.com>
Fri, 21 Oct 2016 00:24:21 +0000 (00:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Oct 2016 00:24:21 +0000 (00:24 +0000)
am: fdf2530f33  -s ours

Change-Id: Ibf9304345439ddf50d19726e184e8ff714748004


Trivial merge