OSDN Git Service

[automerger skipped] Merge "Move safety & regulatory manual closer to legal settings...
authorFan Zhang <zhfan@google.com>
Fri, 7 Sep 2018 01:40:20 +0000 (18:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Sep 2018 01:40:20 +0000 (18:40 -0700)
am: d735f982d2  -s ours

Change-Id: Ida1b0fc4ccd3a903752151c0a9227283150cccc6


Trivial merge