From: Amith Yamasani <yamasani@google.com>
Date: Wed, 30 Jul 2014 16:39:23 +0000 (+0000)
Subject: am 736ea0e8: am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~896
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=62a188e98ff4c5f495e0a376bb481a71719200ac;p=android-x86%2Fpackages-apps-Settings.git

am 736ea0e8: am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev

* commit '736ea0e8a8943cb213b385ce8e260628d88f3b3f':
  Implement SET_PROFILE_OWNER intent
---

62a188e98ff4c5f495e0a376bb481a71719200ac