OSDN Git Service

Merge "Extend adoptable override to force on or off." into pi-dev
authorJeff Sharkey <jsharkey@google.com>
Sat, 21 Apr 2018 00:20:16 +0000 (17:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 Apr 2018 00:20:16 +0000 (17:20 -0700)
commit64a615eefe13fca8c68064c01ae6aca930073775
treea37c147f82d9b41115603d3c777441a4515672c3
parent33fd905c37e2d175b9818f9308bfee6f53094a9c
parent130a2503d8e8138be33b81179e5aabcc209fdd13
Merge "Extend adoptable override to force on or off." into pi-dev
am: 130a2503d8

Change-Id: Ic5bb21ec16f4603d87b5b659f041ee0a08b8d039