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.
tree: 61681a5b86393aaa153ec295ecc67ca5b8936343
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml