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)
commit183674b938f7f792298c56843f6d242ef5a9785c
tree02d75d3ea11aeaa49be50c326eb5b75c5ec8a7d3
parent96c1ecd50f7fa3a01e85982c99e26fedb2dd416d
parent876d3c13b29a03996c7c75e924a480cbad7ba392
Merge changes I886a7277,I25d96c82

* changes:
  Move development test package to sdk 26
  Move OemUnlockPreferenceControllerTest to sdk 26