Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev

author Jean-Michel Trivi <jmtrivi@google.com>

Tue, 23 Apr 2013 01:30:29 +0000 (01:30 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 23 Apr 2013 01:30:30 +0000 (01:30 +0000)
author Jean-Michel Trivi <jmtrivi@google.com>
Tue, 23 Apr 2013 01:30:29 +0000 (01:30 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 23 Apr 2013 01:30:30 +0000 (01:30 +0000)
diff --cc media/java/android/media/AudioService.java
Simple merge
author	Jean-Michel Trivi <jmtrivi@google.com>
	Tue, 23 Apr 2013 01:30:29 +0000 (01:30 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 23 Apr 2013 01:30:30 +0000 (01:30 +0000)