commit 3a8684117db531f3d56743ffa5a9c8ab7ccd0afd
author Andres Morales <anmorales@google.com> Mon Nov 10 17:35:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 10 17:35:55 2014 +0000
tree 44abe242d7c8ae395f4764bd6c1832d39108c4a4
parent 20083734d92eb893c36278d2486404eedc0cc1f9
parent 2885c6ba63850d5fd061460683de768617ed6b31

am 2885c6ba: Merge "Fix build" into lmp-mr1-dev

* commit '2885c6ba63850d5fd061460683de768617ed6b31':
  Fix build

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 422191b..28013d7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22375,6 +22375,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";