OSDN Git Service

Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2...
authorRobin Lee <rgl@google.com>
Wed, 7 Sep 2016 22:29:17 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Sep 2016 22:29:17 +0000 (22:29 +0000)
am: 220aadbf9f

Change-Id: I7469041bfbbde9f533fdcd4e5f39d8dff94c0aad


Trivial merge