Merge "DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync" into nyc-mr1-dev am: fdf2530f33 -s ours

am: c81ebc10ab  -s ours

Change-Id: If258d87b29421e7bcdbf2cd850b2dc08dad642fd
This commit is contained in:
Lingfeng Yang 2016-10-21 00:32:02 +00:00 committed by android-build-merger
commit 307425d25b

Diff Content Not Available