commit b2201e44d7a5c217ea635bccf08625f6d9535f98
author Andres Morales <anmorales@google.com> Mon Nov 10 17:45:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 10 17:45:55 2014 +0000
tree 16a02fe60c7e44f0b09448ef9be3558f0dc31208
parent af0d3eb64ebffe3629187df6de3060e284b2575a
parent 089792aef91ff3978b487337d3e9f8a2df14e790

am 089792ae: am 3a868411: am 2885c6ba: Merge "Fix build" into lmp-mr1-dev

* commit '089792aef91ff3978b487337d3e9f8a2df14e790':
  Fix build

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 8f8ed12..d8b53bc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22615,6 +22615,7 @@
     field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";
     field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";
     field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media";
+    field public static final java.lang.String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";
     field public static final java.lang.String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls";
     field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";
     field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location";