tree 12b21a2ec17a4326b4dfd1b90308674761a003f8
parent b161ff8f38b4601e10079c707f28f45fab87f8a9
parent 99aeac27ebc5ad54c0095122251cc0258713c263
author Makoto Onuki <omakoto@google.com> 1441052679 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441052679 +0000

Merge "Rename DeviceOwner to Owners"