OSDN Git Service

Merge \\"Pre-setup restrictions\\" into nyc-dev am: f84c05c360
authorJason Monk <jmonk@google.com>
Tue, 19 Jul 2016 20:49:57 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Jul 2016 20:49:57 +0000 (20:49 +0000)
am: 9220e9dec9

Change-Id: Idc48e080e41d469bfb508b7fe37fd197b2119e90


Trivial merge