tree c9361ec7a29e71a216cf18c29500476c35a589a7
parent d692fcf115e57fef8a15c214fb2fcde78a48b45c
parent e2a4a6ff8a83a4216824b2d40a323e56814d0463
author Rubin Xu <rubinxu@google.com> 1438348268 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438348268 +0000

Merge "Don't always transfer device owner status to other users." into mnc-dev