OSDN Git Service

Merge changes I886a7277,I25d96c82
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 28 Nov 2017 22:43:30 +0000 (22:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Nov 2017 22:43:30 +0000 (22:43 +0000)
* changes:
  Move development test package to sdk 26
  Move OemUnlockPreferenceControllerTest to sdk 26


Trivial merge