commit 874f054b661fec3c6da45b1656f1cc46d3d367ee
author The Android Automerger <android-build@android.com> Fri Feb 01 07:10:55 2013 -0800
committer The Android Automerger <android-build@android.com> Fri Feb 01 07:10:55 2013 -0800
tree a9a6b96d49b7cb983b29636c158ae200ac718ee0
parent ef89911ed69ebde624d661f22c01e5d243869fb1
parent 7601b426e87b95477a1331062fe09257980c5616

merge in jb-mr2-release history after reset to master

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index d246070..da235dd 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -239,6 +239,7 @@
 
     AUDIO_CHANNEL_IN_MONO   = AUDIO_CHANNEL_IN_FRONT,
     AUDIO_CHANNEL_IN_STEREO = (AUDIO_CHANNEL_IN_LEFT | AUDIO_CHANNEL_IN_RIGHT),
+    AUDIO_CHANNEL_IN_FRONT_BACK = (AUDIO_CHANNEL_IN_FRONT | AUDIO_CHANNEL_IN_BACK),
     AUDIO_CHANNEL_IN_ALL    = (AUDIO_CHANNEL_IN_LEFT |
                                AUDIO_CHANNEL_IN_RIGHT |
                                AUDIO_CHANNEL_IN_FRONT |