OSDN Git Service

Merge "Pre-setup restrictions" into nyc-dev
authorJason Monk <jmonk@google.com>
Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)
commit5a3d1c17f265da96007a0d615bc974e64994b083
tree832528523896c26174a39cef0ef3a8b4d90693c3
parent2703570242556b5865f6eca7dbfaabbe6a545a2f
parentfab3a5ba85aa14c368b00b8c47828b35e539d867
Merge "Pre-setup restrictions" into nyc-dev