tree 426c8bdba27187b047fd094ed74bbbf8c456cfed
parent acc6241da915e463e46407348dcdbf60b4ca753f
parent 5ca4cc576145466e616f236e63215e2fe33df91c
author Andres Morales <anmorales@google.com> 1427480308 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1427480310 +0000

Merge "Add system prop to track if oem unlock is allowed"