tree 61ed2f5e2a6e685acfcda569e09cc49f01459fb9
parent a457c10023944967963120e0103621427860061f
parent 9b73b62240400a0119eaef1e783b92db3961f595
author TreeHugger Robot <treehugger-gerrit@google.com> 1477008835 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1477008835 +0000

Merge "DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync" into nyc-mr1-dev