OSDN Git Service

Merge "Extend adoptable override to force on or off." into pi-dev am: 130a2503d8
authorJeff Sharkey <jsharkey@google.com>
Sat, 21 Apr 2018 00:39:45 +0000 (17:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 Apr 2018 00:39:45 +0000 (17:39 -0700)
commitc50d08a80770ae51102ebde73a6a85f63f4a5c00
treefa04bfea88558de87100075290aef35766b440d9
parent98fdc42d9a9d0b3945c4af8167bc87915708bd7e
parent64a615eefe13fca8c68064c01ae6aca930073775
Merge "Extend adoptable override to force on or off." into pi-dev am: 130a2503d8
am: 64a615eefe

Change-Id: Ic80dd00d179adac426daed862236b03936b60bd7