OSDN Git Service

Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481...
authorJason Monk <jmonk@google.com>
Fri, 15 Jul 2016 14:14:08 +0000 (14:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 14:14:08 +0000 (14:14 +0000)
am: 3dda853d77

Change-Id: If6f655e274469d80425a15ee429a0455448a19d9


Trivial merge