commit | 81265e7c79056eb0068c40ccab424173a9331394 | [log] [tgz] |
---|---|---|
author | Benjamin Franz <bfranz@google.com> | Tue Oct 28 16:44:48 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 16:44:48 2014 +0000 |
tree | 61681a5b86393aaa153ec295ecc67ca5b8936343 | |
parent | b3a23a093027ad2f55d19f0a71d50f17c0e0a908 [diff] | |
parent | 3f84197f483cb9160f3beb042e41c31bbaa57ce4 [diff] |
am 3f84197f: Merge "Stop deactivating Beam sharing in the managed profile." into lmp-mr1-dev * commit '3f84197f483cb9160f3beb042e41c31bbaa57ce4': Stop deactivating Beam sharing in the managed profile.