From: Barnaby James <bjames@google.com>
Date: Fri, 5 Sep 2014 20:09:11 +0000 (+0000)
Subject: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into... 
X-Git-Tag: android-x86-6.0-r1~671^2~668^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96bfc86185fe14a52f676d0d0e90dffc61f0f52d;p=android-x86%2Fpackages-apps-Settings.git

am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev

* commit '3c6f7a33398ab610ec1c734360be092db090fb50':
  Remove intent filter for Airplane mode voice activity.
---

96bfc86185fe14a52f676d0d0e90dffc61f0f52d