grouper: Initial 4.3 update.  Updated to current release and updated cos.dependencies

Squashed commit of the following:

commit 051ae9f5c6abfbbcd843c4802fc62241cd28bab0
Author: Wizard0f0s <jamie.gilmer@gmail.com>
Date:   Tue Oct 1 17:15:44 2013 -0400

    grouper: update dependencies to use CM and Muppets

    Change-Id: Icedcd8b0e1b48187af5f0086e57ad1049853c4e4

commit 62c0ebba85147ccbbf0a50299a2b817dafc43dda
Merge: 9343fea a5a9ac1
Author: Wizard0f0s <jamie.gilmer@gmail.com>
Date:   Tue Oct 1 17:15:27 2013 -0400

    Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_device_asus_grouper into cm-10.2

    Conflicts:
    	cm.dependencies

    Change-Id: Ibc209ed547b9b198a2897a10d001892039758148

commit a5a9ac147ba385b80cc9e9d9effdddf40edf955b
Author: makelegs <makelegs@gmail.com>
Date:   Sun Sep 8 17:13:52 2013 -0500

    Electron Beam Fix

    This merely carries forward the existing commit, by Erwin Pannecoucke,
    which currently resides on the 10.1 branch.
    When enabled....the electron beam screen-off animation functions properly, on grouper.
    Without this commit....it does not.

    Change-Id: Ieac7f633d6203802dfe1aa2615042b1eb6901bfa

commit f2a4cff785ba1070a4be342f2a86b00cd2248445
Author: Manuel Francisco Naranjo <naranjo.manuel@gmail.com>
Date:   Mon Jul 29 12:23:20 2013 -0300

    Revert "Turn off BLE, GATT, and SMP of Bluetooth stack"

    This reverts commit 67b7e3ac6f697f37b709a403dbe82d7ec6a83e55.

    Enable BLE, GATT and SMP for Nexus 7 2012 grouper and tilapia

    Change-Id: I640b3b76a341efc98d1ed69b1dc60425cdc0070b

commit bb244a1dfc33b0c4f0f9646f81fe6ff4da5511a3
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun Aug 18 12:28:21 2013 +0200

    Correctly advertise that the N7 has no hardware keys.

    Change-Id: I7af7e38b538a038e837be9a8496a85151c7afc24

commit a5a9392c27d237c9594ba2fde7945e6b88fda41d
Merge: d3dae2a d7b67ba
Author: fattire <f4ttire@gmail.com>
Date:   Wed Aug 14 23:04:04 2013 +0000

    Merge "Policy updates to bring inline with AOSP." into cm-10.2

commit d3dae2a0cdcf5ccfd3fb3356f48a9a580dbfe448
Merge: 2e3dd35 5fd5e24
Author: fattire <f4ttire@gmail.com>
Date:   Wed Aug 14 23:03:33 2013 +0000

    Merge "Update selinux policy." into cm-10.2

commit 2e3dd352e473bc0fab79c067f9236e7cce0bbeeb
Author: Ed Tam <etam@google.com>
Date:   Fri Apr 5 23:42:59 2013 +0000

    Revert "Revert "Sensors: Update authority for iio attributes in init.grouper.rc.""

    Sensor library added back with fixes.

    This reverts commit 339e25347a18563fb818d9901f3a46dd2e3cdd24

    Change-Id: I8dd522f0d6dbaed1c36b374ea7cb5e6c8da1ee4a

commit d7b67ba53caf88ba47d7c266ea602f60cc92a8e9
Author: rpcraig <robertpcraig@gmail.com>
Date:   Sun Aug 4 17:16:38 2013 -0400

    Policy updates to bring inline with AOSP.

    * Move SEPOLICY vars to BoardConfigCommon.mk
      so tilapia can use.
    * Bring over rild policy from AOSP. Though not
      explicitly used by grouper, tilapia needs it.
    * Other small policy additions and subtractions.

    Change-Id: I6da76b965d44866accb9e21496fe524f70d0cdd3
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit 5fd5e245b69c63a5ffdd6f5d526ccc3ec1a6baf8
Author: Robert Craig <rpcraig@tycho.ncsc.mil>
Date:   Tue Jul 30 06:28:41 2013 -0400

    Update selinux policy.

    Small number of changes addressing
    new denials seen with 4.3

    Change-Id: I589bec371d2dbdf6cb4f03d949a1546e947acd86
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit e079b3bb5aafa4a84a326a884b8d6ce0c5ccdc25
Author: fattire <f4ttire@gmail.com>
Date:   Wed Jul 31 03:17:24 2013 -0700

    fix vold to use new fstab.grouper format

    Change-Id: I1839f2e2d697d2413b399cdfb8d617203152bff7

commit 2c45db0db46870141ee6f96f3ae074169aa13fc8
Author: fattire <f4ttire@gmail.com>
Date:   Sat Jul 27 15:58:52 2013 -0700

    set RECOVERY_FSTAB_VERSION to 2

    Change-Id: Iccad622fec83b8d55aee1eb911ab7e5bd75b7a68

commit b94ce5bd425372375136ddefbe8ac7591f79b0a3
Author: fattire <f4ttire@gmail.com>
Date:   Sat Jul 27 15:58:02 2013 -0700

    update fingerprint to 4.3/JWR66V.

    Change-Id: Id0792cf883552e9a197e7e656d96711276437fa2

commit 1815dac461d1583f3a288168e7977c6a96b73261
Author: Robert Craig <rpcraig@tycho.ncsc.mil>
Date:   Fri May 17 06:19:34 2013 -0400

    Relabel some of the device nodes.

    Updates reflect a better labeling scheme
    for specific multimedia nodes.

    Change-Id: If2e77af179a7a6427341c4f6bc8a97d6855999a8
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit 72a97d1f69b03f78362bbc780cf9061179a7990a
Author: Stephen Smalley <sds@tycho.nsa.gov>
Date:   Thu May 16 09:36:27 2013 -0400

    Move grouper-specific device labeling to its sepolicy directory.

    Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

commit 039943cff878ea62929f9c06913c2c84773938b3
Author: Robert Craig <rpcraig@tycho.ncsc.mil>
Date:   Mon Mar 25 08:05:12 2013 -0400

    Update selinux policy.

    Various policy changes and updates concerning
    sysfs and proc access, new device node domains,
    and updated btmacreader and sensors-config
    policy.

    Change-Id: I6e4c20a3f2c669427b6d60d8ac1c07dadddf1e1a
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

    Conflicts:
    	BoardConfig.mk
    	init.grouper.rc

commit 0754f4c439975231cae30fbe39271a91aa2b0451
Author: Stephen Smalley <sds@tycho.nsa.gov>
Date:   Wed Nov 14 13:45:08 2012 -0500

    Use locally built kernel with SELinux enabled.

    Conflicts:
    	device-common.mk

    Change-Id: I89a8f9020cffca8f4d28fe9398c32a7c2c1a1247

commit 935eaf9f572ce129cd7550cdd75a043275c7d1f3
Author: rpcraig <rpcraig@tycho.ncsc.mil>
Date:   Fri Nov 2 14:54:16 2012 -0400

    SELinux mods to init file.

    Change-Id: I14da24ece24bbb7183380e252fb17acf8711496f
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

    Conflicts:
    	init.grouper.rc

commit d7a8c566fe3503fcf47112e40b8a859568c400a1
Author: rpcraig <rpcraig@tycho.ncsc.mil>
Date:   Fri Nov 2 06:35:29 2012 -0400

    SELinux policy additions.

    Per-device policy additions targeting the
    grouper board.

    Change-Id: I54981e1fccd26e233149733a3c98e8b6bd61d6ed
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

    Conflicts:
    	BoardConfig.mk

commit 86ce5f6bb562e179501982c92517618cb549d340
Author: fattire <f4ttire@gmail.com>
Date:   Fri Jul 26 16:31:12 2013 -0700

    remove sepolicy stuff as 10.2 uses same as 10.1 not AOSP

    Change-Id: I0c472b858842836ad984534800930a88ccb80900

commit 72b91f8d254dd435d2c5cafffb42111fc5daceeb
Author: repo sync <gcondra@google.com>
Date:   Wed May 22 14:32:53 2013 -0700

    Take care of remaining denials.

    Change-Id: I87ec97f96de07fc3dcb10b4e5c3c9ad0f9ba5b15

commit ebef4bc296751dc1d279b80bb2985423bad3fb0a
Author: repo sync <gcondra@google.com>
Date:   Tue May 14 21:39:10 2013 -0700

    Mark all domains permissive.

    Bug: 4070557
    Change-Id: Ibdedc451568ffb35b86e4cba3a58f41acb26adec

commit f5aca4bf9f95f5b37bd44bd406171c65da38efdb
Author: repo sync <gcondra@google.com>
Date:   Tue May 14 12:44:57 2013 -0700

    Add compatibility.te.

    This file is a clearinghouse for automatically generated policy,
    generated based on denials seen in the wild.

    Change-Id: I379e27882d8bdcc9e4eb9815094494d831b8f719

commit 2ded2edfd617f7df5f603a1d0dc236c600a2eca6
Author: Matthew Xie <mattx@google.com>
Date:   Thu May 9 17:15:25 2013 -0700

    Clean up bluetooth le feature file

    bug 8664724

    Change-Id: If667932f4e966a612d28f2384ca53eec7711d9af

commit 67b7e3ac6f697f37b709a403dbe82d7ec6a83e55
Author: Matthew Xie <mattx@google.com>
Date:   Wed May 8 15:52:23 2013 -0700

    Turn off BLE, GATT, and SMP of Bluetooth stack

    bug 8664724
    Change-Id: Iba679cc0feb7eb2e1cf667862e47f8e710b5e8ed

commit 1e031f8d92cd3905b15956622c72cf2e75c82478
Author: repo sync <gcondra@google.com>
Date:   Tue May 7 13:34:19 2013 -0700

    Add bootup policy for grouper.

    Change-Id: Ie5f43d767c375051987f9113c4a5b75b9dbd0cd3

commit dd9f270fa86eb5b2241d49fa10ab3735e30d0b39
Author: Alex Klyubin <klyubin@google.com>
Date:   Mon May 6 14:39:07 2013 -0700

    Adjust asus/grouper SELinux policy due to shell -> init_shell.

    Change-Id: I9e35d485bac91f3d0e4f3704acdbb9af7d617173

commit d5f7f4871361677af201381920c3345ff7143b9b
Author: repo sync <gcondra@google.com>
Date:   Wed May 1 14:01:31 2013 -0700

    Add /dev/diag support in policy.

    Change-Id: Ife106263a39501959f9779c601dfbe17d5854c3f

commit 5398c33f6cd82dd22f1837235916673e5ef5c2a0
Author: Robert Craig <rpcraig@tycho.ncsc.mil>
Date:   Wed Mar 27 06:12:51 2013 -0400

    DO NOT MERGE Update SELinux policy.

    Various policy changes and updates concerning
    sysfs and proc access, new device node domains,
    and updated btmacreader and sensors-config
    policy.

    Change-Id: I6e4c20a3f2c669427b6d60d8ac1c07dadddf1e1a
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit f1c97c0f19d72a08088874036a9a1f475af3cb88
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Mon Apr 29 10:24:50 2013 -0700

    Remove wifi_p2p network.

    The state tracker wasn't really reporting p2p info anyway
    so this was broken and was confusing people as it used
    straight wifi as its type, giving 2 wifi networks and
    generating extra broadcasts.

    bug:8658717
    Change-Id: I3deb0c62e8112abb0bbd546f00f167d58047775f

commit 9ec1ceae48558c7b258d228885a5594b1bdd2d75
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Apr 25 19:14:56 2013 -0700

    grouper: wlan: Add wpa_supplicant overlay file support

    Bug: 8725307

    Change-Id: Icb10617f8514070745f53f45d88f695fc6f2e05e
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 841a1d3b3c7a2aa694bc3a4e131ea1009ce06c7a
Author: repo sync <gcondra@google.com>
Date:   Wed Apr 24 19:32:08 2013 -0700

    Move type to general policy.

    Change-Id: Icbd9bfa5c7a38492215ac1f0270adbee99b277b1

commit de7a280d1404532247728c3f4e17a178fa8f7c56
Author: Matthew Xie <mattx@google.com>
Date:   Tue Apr 23 12:00:18 2013 -0700

    Copy android.hardware.bluetooth_le.xml permission file

    bug 8369273

    Change-Id: Ia6f9c5cc00f18ea1db59b8d8ea11d2cca9cb8e41

commit d9de988a25504f43184de7f9a14fda0514796067
Author: Ken Sumrall <ksumrall@android.com>
Date:   Thu Apr 11 19:52:30 2013 -0700

    Remove the ext4 discard mount option.

    Now that fstrim is being used, the discard mount option
    is no longer needed.

    Change-Id: I7f7157c00daa3e3782d9ec237a9991cf8cf3a10f

commit f0c5ac4658c1cb0b7ff5c2f7b08fb87d3d0e76b3
Author: Ken Sumrall <ksumrall@android.com>
Date:   Thu Apr 11 15:18:42 2013 -0700

    Removed vold.fstab from grouper build.

    It only contained comments, never should have been there, and
    that file is now deprecated with the unified fstab.

    Change-Id: Ie477cd36447eaa187b90a251b1667668df666b2a

    Conflicts:
    	vold.fstab

commit 2b48553a4f730361d49bf2d599ea7207560d8f3b
Author: Ken Sumrall <ksumrall@android.com>
Date:   Wed Apr 10 20:49:22 2013 -0700

    Remove deprecated recovery.fstab

    Change-Id: I3fa840b917dda5fb26d3322949bbc7c792077ace

    Conflicts:
    	recovery.fstab

commit cb5ded0af1663d6b89ba8d16e2f68cf2b338e831
Author: Ed Tam <etam@google.com>
Date:   Wed Apr 3 01:10:06 2013 +0000

    Revert "Sensors: Update authority for iio attributes in init.grouper.rc."

    This reverts commit 9fdeec860b3dc4c06f60743674c6d02c881f47d3

    Change-Id: Iac490e7442c27b3df289a734e953425a39fd48b4

commit 69ca79a7ff35e66f01ef9829efc844d218ace216
Author: Joseph Wu <Joseph_Wu@asus.com>
Date:   Fri Mar 15 16:01:04 2013 +0800

    Sensors: Update authority for iio attributes in init.grouper.rc.

    - To support DMP back features.

    Change-Id: Ia0199c04f3a98eb9ff94ad13f97cd33d94be5a22
    Signed-off-by: Ed Tam <etam@google.com>

commit 4d3d7a0170aa2a4d308b54a34a66612d63bb883c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Mar 22 15:53:55 2013 -0700

    Rename AOSP builds to aosp_*

    Change-Id: I188a1780f28bae032b2d0528d007bc8c23d412a2

    Conflicts:
    	full_grouper.mk

commit b2ae62071806a476956821a4ce7513c4faf46272
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Mar 22 15:30:25 2013 -0700

    grouper: wifi: Remove obsolete path to P2P FW

    Change-Id: I406090bdcc79c45dff7c4c00f94f0cf302a63d4c
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit f505843d20ea8049bc55eac4de66db4fb79dee48
Author: Elliott Hughes <enh@google.com>
Date:   Thu Mar 21 18:55:47 2013 -0700

    Remove unused asus/grouper ARCH_ARM_HAVE_TLS_REGISTER.

    Change-Id: I5165185b7fb36a78a734402c639857f4b7a81ef1

commit 9455d23228b55477bbd59770d297e1beea2badc0
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Mar 13 17:06:45 2013 -0700

    Use dumpstate directly for bugreports.

    Use new broadcast flag on dumpstate to notify framework when a
    bugreport finished.  Remove older shell scripts.

    Bug: 7005318
    Change-Id: I6bdf1843cadfb14ced3efdf78bd4591b905bc56f

commit 19c2de909f584e989a7e1313a6208860c3d2ba29
Author: vito1_lee <vito1_lee@asus.com>
Date:   Tue Mar 5 10:31:09 2013 +0800

    bluetooth: nakasi: Don't need btmacreader binary, it only for Nakasi ER-stage. (2/2)

    Change-Id: I67c11c30743190a92aabd471404a5f49ba1b4b3e

commit df0481543cd334d75a3e933eac311c6567accdc0
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Mar 8 13:49:10 2013 -0800

    auto-generated blob list

    Bug: 4295425
    Change-Id: Ibd314456c96735ae5723aae601e25e00f67b959d

commit bcdb6ec44846a3cf75c7dc88618b80a9e9ea8dfd
Author: Martijn Coenen <maco@google.com>
Date:   Thu Mar 7 17:52:14 2013 -0800

    Grouper: NFC: Enable NFC provisioning for EDU.

    Bug: 8275527
    Change-Id: I11a06991951b4e242f112c4aa9e1a2ef7fbc4072

commit 9174cb2702bfc5803e1cefdb6ea3b2e7843f80dd
Author: Christopher Ferris <cferris@google.com>
Date:   Wed Feb 27 13:44:58 2013 -0800

    Remove unneeded ARCH_ARM_USE_NON_NEON_MEMCPY value. DO NOT MERGE

    Bug: 8005082

    (cherry picked from commit e0f6895de8ca1c92f97f3ac2d4529e5265960025)

    Change-Id: Id269322c0e9e933e708adca8cde5df4c243ddc86

commit 1ad9399232715dd5c6b9c8ff1b0d35ccde5f96c8
Author: Ken Sumrall <ksumrall@android.com>
Date:   Fri Feb 22 17:38:08 2013 -0800

    Separate the fstab file between grouper and tilapia

    Because tilapia has the radio image partition which recovery
    knows how to update, we can no longer have a unified fstab
    for the two products.

    Change-Id: I8c45d4e813e1e0a7379524ba4d7465d2d6568641

    Conflicts:
    	device-common.mk

commit 1f277b9a435bbc65e99a041645a8fb0eb008c623
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Feb 13 11:20:54 2013 -0800

    Move keymaster files to the Open Source side of the world

    Bug: 7251227
    Change-Id: Ib6def3e73796d8cc209a4bd9b0251b2d5bc5bf83

commit 42b681bd53bc8ba09a949dbb3b41c70f504cec90
Author: Ken Sumrall <ksumrall@android.com>
Date:   Wed Feb 13 20:06:08 2013 -0800

    Update unified fstab.grouper to support recovery

    Add entries to the unified fstab needed by recovery.
    Also, copy the unified fstab to /etc/recovery.fstab in the recovery
    ramdisk.

    Change-Id: I3e94b988a59a61b91abfba0f6e69f90240112621

commit f6f26a04890804a3e9493eefadea3a7291282955
Author: Christopher Ferris <cferris@google.com>
Date:   Tue Feb 5 15:46:53 2013 -0800

    Adding TARGET_CPU_VARIANT to config file.

    Bug: 8005082
    Change-Id: I401197f64796b4bc5badef9d75b2320647c8c699

commit 81a72c4cfa9840f8c5e92b95ba366defd4273c38
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Fri Dec 21 14:19:53 2012 +0800

    Remove unnecessary lines in PRODUCT_PACKAGES

    After applied https://android-review.googlesource.com/48504,
    Nfc now depends on libnfc_jni, and libnfc_jni depends on libnfc.
    No need to list the libs in PRODUCT_PACKAGES.

    Change-Id: Ibaff9c6af80c91a9031e6a0fbf7742416442587f

commit 2b8b7ef466e6cc29412bf1956a1a01a0ad3fac2d
Author: James Dong <jdong@google.com>
Date:   Tue Feb 12 17:40:52 2013 -0800

    Make software vp8 video encoder available to MediaCodec on Grouper

    Change-Id: Ibfb6b02ec5b946abe362f3565de481ad0d48e2da

commit 79d87307a3576531b5b0ee47965fd44cadf11266
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Jan 28 17:00:41 2013 -0800

    audio: factor out audio_route into a separate library

    audio_route is mature enough now to belong in its
    own library and will help remove duplication across
    audio HALs.

    Change-Id: If3a2a0b4a6d9bbed93d206e61d22a155066a23d4

commit 51a1af724c526707073eb50d1249c6b9ed4d5ad8
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Wed Dec 5 12:22:07 2012 -0800

    Fix BT rev-tether iface name.

    Change-Id: I633329bc437851104d0c245ea9f52d8150675341

commit 15fa16a5d753f1f2f72fc8677a082893dd889fb8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 19 08:39:17 2012 -0800

    Run fastboot oem unlock before flashing

    Change-Id: I395bc0ce77bab5a80af9e49ac0815ab23b679eba

commit 32028156af1a342a575da43e168aa551d85febd0
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Nov 15 16:34:03 2012 -0800

    Add gsm decoder to media codec list

    b/6620569

    Change-Id: I8887adf11d616e5ab4d2f5d69efff124b3a9a0dc

commit 1c77cf559481d0bb333b791a15e7964d0237dd82
Merge: 932d695 88738fe
Author: fattire <f4ttire@gmail.com>
Date:   Fri Jul 26 11:21:09 2013 -0700

    Merge commit '6051692' into cm-10.2

commit 932d695713cf13dc9e217d46acd6aee413385f99
Merge: c4627d2 7662d05
Author: fattire <f4ttire@gmail.com>
Date:   Fri Jul 26 11:20:59 2013 -0700

    Merge commit 'fce0ec7' into cm-10.2

commit c4627d2dd5e361db0b05e3a097227c156124db3d
Merge: 242342c 78f7d84
Author: fattire <f4ttire@gmail.com>
Date:   Fri Jul 26 11:20:38 2013 -0700

    Merge commit 'a71387e' into cm-10.2

commit 242342c66749c24340bf26c5a25eab604c693d9a
Author: rpcraig <rpcraig@tycho.ncsc.mil>
Date:   Fri Nov 2 14:54:16 2012 -0400

    SELinux mods to init file.

    Change-Id: I14da24ece24bbb7183380e252fb17acf8711496f
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit 95f72416783a3a1975ff3385b8ac211a8941cad7
Merge: d4260fc 06d7bbc
Author: fattire <f4ttire@gmail.com>
Date:   Fri Jul 26 11:20:01 2013 -0700

    Merge commit 'd6d3db0' into cm-10.2

commit d4260fc81cbe780148a5aea48d9f19cdcbd5ddff
Author: Robert Burns <burnsra@gmail.com>
Date:   Thu Mar 7 06:59:19 2013 -0500

    Remove branch from cm.dependencies

    Change-Id: I952dcb71bebe28b0e90ba325c05f0b73e1bf798f

commit 19918d95d1dc24daab9c2b564777832694c203f5
Author: eak1080 <ethan.kaley@gmail.com>
Date:   Tue Jan 22 11:06:36 2013 -0500

    Grouper: Enable USB Tethering

    - Enables USB tethering to utilize device's Wi-Fi connection

    Change-Id: I42f8829b608717e327af02f24bd25549554be550

commit f851b03bc967234e82c9310de50018d79851677b
Author: Robert Burns <burnsra@gmail.com>
Date:   Sun Feb 17 16:03:43 2013 -0500

    Update fingerprint for 4.2.2(JDQ39)

    Change-Id: I1011fb132ce1266b364f9b3a9fc3c1f1482a3d4c

commit 7cebd49418150b830bafcb8fb9733fa0129a2e79
Author: Robert Burns <burnsra@gmail.com>
Date:   Sat Dec 29 19:06:30 2012 -0500

    Add overlay for Trebuchet default workspace

    Change-Id: I4a36b801227393c8d6949fb25588d08a9c74e058

commit 88738fe8c622fbe92f279339d473a85ae947346f
Merge: 7662d05 78f7d84
Author: Kenny Root <kroot@android.com>
Date:   Wed Nov 14 09:42:48 2012 -0800

    am a71387e6: Merge "SELinux mods to init file."

    * commit 'a71387e656fc0e482089b4b34e10c586a94e0214':
      SELinux mods to init file.

commit 7662d0510d5a4b97f7c8ec60ec49aa604d7a6fed
Merge: 2c56641 06d7bbc
Author: Kenny Root <kroot@android.com>
Date:   Wed Nov 14 09:42:48 2012 -0800

    am d6d3db0f: Merge "SELinux policy additions."

    * commit 'd6d3db0f8e75fc6aae5f5f92fe5c3a4fc7aba16c':
      SELinux policy additions.

commit 78f7d84450b7a1f32ed660b40c94eb06327be630
Merge: 06d7bbc b531740
Author: Kenny Root <kroot@android.com>
Date:   Wed Nov 14 08:45:22 2012 -0800

    Merge "SELinux mods to init file."

commit b53174087b318ff61bb427ea57415efe4090f134
Author: rpcraig <rpcraig@tycho.ncsc.mil>
Date:   Fri Nov 2 14:54:16 2012 -0400

    SELinux mods to init file.

    Change-Id: I14da24ece24bbb7183380e252fb17acf8711496f
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit 06d7bbc8babe09b4a5b48d4634d29ce7b7bd4f99
Merge: 87b359a aa5f1f5
Author: Kenny Root <kroot@android.com>
Date:   Wed Nov 14 08:42:14 2012 -0800

    Merge "SELinux policy additions."

commit 2c56641dd04a6d60c28950ae3d7cfebc7326ddea
Merge: 9d371db 87b359a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 09:07:12 2012 -0800

    am 2598a87b: Grouper factory images for JOP40C

    * commit '2598a87be27b94821e833b9759616fc5cc48ae5b':
      Grouper factory images for JOP40C

commit 87b359a702b3da08c61e7e07246e5db5ed18aaba
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:58:20 2012 -0800

    Grouper factory images for JOP40C

    Change-Id: Ibb98c32ba25f161b143a2ba139925960112bd587

commit 9d371dbed4098321eda100c169519edc84d03cc8
Merge: c741130 951c6cc
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:47:54 2012 -0800

    am 7b797c3c: Grouper self-extractors for JOP40C

    * commit '7b797c3c28f7763ebfcf7372e10db7513481908a':
      Grouper self-extractors for JOP40C

commit 951c6cca3d9cd8bdba5bd86993572d3f9ba94373
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Nov 12 08:34:37 2012 -0800

    Grouper self-extractors for JOP40C

    Change-Id: Ib3fca543e243fd478a2dc537866588ddcedf82fd

commit c741130380b8ea97bde7d33ec1038b16cc7f2145
Merge: c317405 12c76bf
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 22:44:20 2012 -0800

    am f89e9a99: Merge "Grouper binaries for JOP40" into stage-aosp-master

    * commit 'f89e9a99962656485292792da6026202fa2b7561':
      Grouper binaries for JOP40

commit c31740503ee7466c495c68a660c834ea6175170a
Merge: 5054f52 61fca4f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 22:44:19 2012 -0800

    am 5bf77785: Grouper factory images for JOP40

    * commit '5bf777859fd76159fd4963437717d3a8adabc178':
      Grouper factory images for JOP40

commit 12c76bf4b92b26b5565e4319aab926d12142f626
Merge: 61fca4f ec5d8ce
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 15:16:07 2012 -0800

    Merge "Grouper binaries for JOP40" into stage-aosp-master

commit ec5d8cec094ff5f9f585a8f5596da35179fe250b
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 13:27:24 2012 -0800

    Grouper binaries for JOP40

    Change-Id: I63fb7d14dc2bdab6a7b98ba338796e81ad7eab82

commit 61fca4f5ee7e5a2dd26baf3739ca01169e62db1f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 13:00:42 2012 -0800

    Grouper factory images for JOP40

    Change-Id: I70596fe87be1af465ef2baefde75c022e7c7d8b9

commit 5054f5223eac40f7cfdbd5802d5af855e0859c51
Merge: 0760330 739760a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 11:34:16 2012 -0800

    am 5903c3a6: Grouper factory images for JOP39B

    * commit '5903c3a69f34f7713e2d3f609a602ec75d064ec6':
      Grouper factory images for JOP39B

commit 739760a8c3d82f9cb822145e5aa3e2775934bc42
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 9 08:53:12 2012 -0800

    Grouper factory images for JOP39B

    Change-Id: Icfea5401b7651032f00d6d6eba40a6dc539fcd9c

commit 076033070071931c6b85f667468c7c753a32af82
Merge: f30b441 f0883b0
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:25:43 2012 -0800

    am 85a1f3ff: (-s ours) am 78d3d6b2: am da522b59: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '85a1f3ff6f21de87f55903eb80944eba46c0bf38':

commit f0883b0ad2e052527af96ad2c3de79736d0fcbb0
Merge: 6b5bed8 78d3d6b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:22:48 2012 -0800

    am 78d3d6b2: am da522b59: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '78d3d6b2d2bc2c558e15aed6bb773be19667e184':

commit 78d3d6b2d2bc2c558e15aed6bb773be19667e184
Merge: dece71e da522b5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:18:23 2012 -0800

    am da522b59: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'da522b59db32b9bf5407b87182eb8ebbe21dcf24':
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel
      Bring back ADB_EXTERNAL_STORAGE.
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel

commit da522b59db32b9bf5407b87182eb8ebbe21dcf24
Merge: 0f4b393 d910725 c384f5f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:16:07 2012 -0800

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: I32cd46ce0e2303f8402e887e934ba8ce5c52bcb7

commit f30b44123161c86fca5e2030a33c9597d16363ce
Merge: 3b506ac 6b5bed8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 09:55:08 2012 -0800

    am 6232c644: Grouper self-extractors for JOP36

    * commit '6232c64495b3355ec9e0fc4e129f4cdd87273b0e':
      Grouper self-extractors for JOP36

commit 6b5bed8714d1b777beaee7c41c803a89112c7e1e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Nov 6 09:26:07 2012 -0800

    Grouper self-extractors for JOP36

    Change-Id: I31ed87f3194bd7b7a4a1d76fc2b8a6d5e38f9afd

commit 3b506aca8b57fa326133cdf720844f638109676c
Merge: eaf0c90 19624d0
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Nov 5 07:58:21 2012 -0800

    am ffb16ec8: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'ffb16ec8cb4b58c6486880b5992090b752b1d0ae':
      grouper: update prebuilt kernel

commit 19624d0888e293fd38a33fd70896eb563ebeb870
Merge: c3f95fa c384f5f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Nov 5 07:55:57 2012 -0800

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Icee59f9095456e577fc394abf69bda423ae6043e

commit eaf0c909b0fab5a6930bd578814d7da55965bf58
Merge: 2ec15b6 c3f95fa
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 2 15:05:24 2012 -0700

    am 2aa5cd71: Merge "Update grouper self-extractors for JOB32B" into jb-mr1-dev-plus-aosp

    * commit '2aa5cd7105fd378bd55f521a8e2a7390c9ace798':
      Update grouper self-extractors for JOB32B

commit c3f95fa734c887df5034b447bee1eca0938c43bf
Merge: 18e30e8 f270c1f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 2 15:02:55 2012 -0700

    Merge "Update grouper self-extractors for JOB32B" into jb-mr1-dev-plus-aosp

commit 2ec15b61c48944e27542f0738d14336cdb0aeea3
Merge: ae13ca8 18e30e8
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Nov 2 14:35:58 2012 -0700

    am eba61878: am dece71ee: am 0f4b3932: grouper: update prebuilt kernel

    * commit 'eba618784a2bf3e63863d2d40a52f745f54f4338':
      grouper: update prebuilt kernel

commit 18e30e8c75903fec4462d41f8663abe6f6fdb09c
Merge: 9f433e6 dece71e
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Nov 2 14:33:26 2012 -0700

    am dece71ee: am 0f4b3932: grouper: update prebuilt kernel

    * commit 'dece71eee053f42f84ad529948d10558a6c7b8cb':
      grouper: update prebuilt kernel

commit dece71eee053f42f84ad529948d10558a6c7b8cb
Merge: dd48ae6 0f4b393
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Nov 2 14:31:01 2012 -0700

    am 0f4b3932: grouper: update prebuilt kernel

    * commit '0f4b39323c0ce365a494d45ed01a40929eab259e':
      grouper: update prebuilt kernel

commit f270c1f10831b0038d0189dca12d34294b983d72
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Nov 2 13:31:12 2012 -0700

    Update grouper self-extractors for JOB32B

    Change-Id: I7dcf37830d85ad7addd4d86262c938df81fa5c8b

commit 0f4b39323c0ce365a494d45ed01a40929eab259e
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Nov 2 11:00:17 2012 -0700

    grouper: update prebuilt kernel

    22b4fcd Revert "net: wireless: bcmdhd: Fix WD wakelock behavior"
    f4d9951 use clamp_t in UNAME26 fix
    96b6693 kernel/sys.c: fix stack memory content leak via UNAME26

    Change-Id: I8314d8fa78fd2c43f6e63402e40cf439e9247575

commit aa5f1f5cc33b6e3b2cf6c274cf0f18a5e5b31407
Author: rpcraig <rpcraig@tycho.ncsc.mil>
Date:   Fri Nov 2 06:35:29 2012 -0400

    SELinux policy additions.

    Per-device policy additions targeting the
    grouper board.

    Change-Id: I54981e1fccd26e233149733a3c98e8b6bd61d6ed
    Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

commit ae13ca866c60936bbbb873cff8ad34236e7c4fdb
Merge: b006858 9f433e6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 2 07:30:29 2012 -0700

    am 2963ce8b: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '2963ce8bae6cd09f9cc7bb19049c5511511e5852':

commit 9f433e6fed8c870f3837d5da083fb28f5ca05d5d
Merge: f968389 02ba54d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 2 07:27:53 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I84aa6312c38fa1062227d1ffc4cbcb1125cf0bf3

commit b0068589d69b056ec81ffcbc72742a9a9cbd5db0
Merge: 8595bcb f968389
Author: Matthew Xie <mattx@google.com>
Date:   Thu Nov 1 12:55:32 2012 -0700

    am 44f17f40: am dd48ae62: am 559fb43a: Define platform specific config for address validation as true

    * commit '44f17f40367670a9b5b194851cb53d461c4d19fc':
      Define platform specific config for address validation as true

commit f968389efba879f27313e11b0929760b9f10d40a
Merge: 179d4db dd48ae6
Author: Matthew Xie <mattx@google.com>
Date:   Thu Nov 1 12:53:34 2012 -0700

    am dd48ae62: am 559fb43a: Define platform specific config for address validation as true

    * commit 'dd48ae62522b3c8d3f0fc246881e149f00975202':
      Define platform specific config for address validation as true

commit dd48ae62522b3c8d3f0fc246881e149f00975202
Merge: bb6487d 559fb43
Author: Matthew Xie <mattx@google.com>
Date:   Thu Nov 1 12:50:53 2012 -0700

    am 559fb43a: Define platform specific config for address validation as true

    * commit '559fb43a2b3aca9d65fcedddc6c1e2e00d875b31':
      Define platform specific config for address validation as true

commit 8595bcb2dfaec1eddd740b9b5a366b922e345172
Merge: 3e2ebb1 179d4db
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:19:19 2012 -0700

    am 53b69bb3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '53b69bb3dbdc72a68f5fa64623a79bcfc1409d09':

commit 179d4dbb7d97a35fc812488f9baecc120d6054b0
Merge: e765efa 77fc5da
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:15:46 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Id4ce4c7dc06adace230b5af5be7e2fbd99f6cfee

commit 3e2ebb154a1dc69cfb20d793af50ceb963e96f44
Merge: fb658c4 e765efa
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Oct 30 10:12:06 2012 -0700

    am 3017b0a1: am bb6487df: am 42a16d0d: Safe headphone volume limit.

    * commit '3017b0a1c968a4a8289c6876913ea458fb07b791':
      Safe headphone volume limit.

commit fb658c43fe33fe0028099c54e09e8fdf721ee46a
Merge: 1beed19 4dba07b
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Oct 30 09:54:59 2012 -0700

    am 27656980: am 63ada710: am 41a563c0: grouper: update prebuilt kernel

    * commit '276569804ec733575bbe337a719264cecde3e43b':
      grouper: update prebuilt kernel

commit 1beed19f3c7f912482c1365f7d0467a11352ac7c
Merge: 39c38a8 3485591
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Oct 30 09:54:58 2012 -0700

    am c83647a5: am d09c623e: am 21907692: added setting for dock audio

    * commit 'c83647a5a22e3b12828c493d26ce973d7bf907eb':
      added setting for dock audio

commit 39c38a82e336f2aaf32a973ae2e3ce8658493f35
Merge: 24ddf71 7474510
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Oct 30 09:54:58 2012 -0700

    am 5df7fbb6: am 3d14923a: am c6e5c50b: audio: add dock support

    * commit '5df7fbb6415ff5e4ae049275f4d5140ce765406e':
      audio: add dock support

commit 24ddf710dcda776746a87aef823392fa5190fbcf
Merge: 592889d de12356
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Oct 30 09:54:57 2012 -0700

    am c41a1cf5: am 1eca07e9: am 0e113579: Revert "Audio: Support audio dock."

    * commit 'c41a1cf5b57f77a339ae8e038ceb117592472942':
      Revert "Audio: Support audio dock."

commit 592889d8130a0357ec08fdfbfaf5cc1da6a91f92
Merge: 40fcf51 41a84b3
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Oct 30 09:54:56 2012 -0700

    am c90957ee: am e64c088a: am a99f5635: Revert "Audio: fix incorrect routing path."

    * commit 'c90957eee5272128f666214308ad280fac679929':
      Revert "Audio: fix incorrect routing path."

commit 40fcf51a64c0b59582d496cffd322f9c1523b494
Merge: 24bc7f4 33e9254
Author: Simon Wilson <simonwilson@google.com>
Date:   Tue Oct 30 09:54:55 2012 -0700

    am a794156e: am e13c5989: am cbecc652: Revert "Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly."

    * commit 'a794156e423ce47ee70122d5bb58b0290b6c0826':
      Revert "Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly."

commit e765efa3248b698b5c52610d2b2c649d6846fdf8
Merge: 4dba07b bb6487d
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Oct 30 08:39:47 2012 -0700

    am bb6487df: am 42a16d0d: Safe headphone volume limit.

    * commit 'bb6487df381215767294d75c0b8b4134c871c6f6':
      Safe headphone volume limit.

commit bb6487df381215767294d75c0b8b4134c871c6f6
Merge: 63ada71 42a16d0
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Oct 30 08:37:38 2012 -0700

    am 42a16d0d: Safe headphone volume limit.

    * commit '42a16d0dedb0028ef74266a17e14eee71af9d313':
      Safe headphone volume limit.

commit 4dba07b2e404bd9474638777794bf1b593b3462d
Merge: 3485591 63ada71
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 29 14:32:04 2012 -0700

    am 63ada710: am 41a563c0: grouper: update prebuilt kernel

    * commit '63ada710ed9d4cef259bc62eb6408a7baa8a5cf9':
      grouper: update prebuilt kernel

commit 34855910181783e8f0073d61b83a0c983f13930a
Merge: 7474510 d09c623
Author: Eric Laurent <elaurent@google.com>
Date:   Mon Oct 29 14:32:03 2012 -0700

    am d09c623e: am 21907692: added setting for dock audio

    * commit 'd09c623efc2866db4afeb3ef6bbcce35cb8ec013':
      added setting for dock audio

commit 747451025632f06e319a0ddc633d583a8d7afe4f
Merge: de12356 3d14923
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:32:02 2012 -0700

    am 3d14923a: am c6e5c50b: audio: add dock support

    * commit '3d14923a7df16ec9cef9581b78775df05d1a2657':
      audio: add dock support

commit de12356428b81883556f0b689314de53a4bf303a
Merge: 41a84b3 1eca07e
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:32:02 2012 -0700

    am 1eca07e9: am 0e113579: Revert "Audio: Support audio dock."

    * commit '1eca07e9e3b72203acb70e191bfe263351ccd516':
      Revert "Audio: Support audio dock."

commit 41a84b3b66a14ae9e1c2b83980301cbc72f2f60d
Merge: 33e9254 e64c088
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:32:01 2012 -0700

    am e64c088a: am a99f5635: Revert "Audio: fix incorrect routing path."

    * commit 'e64c088a053e84aa844f96b621c73f3641b5cd4a':
      Revert "Audio: fix incorrect routing path."

commit 33e92549edf9530d476436501bf64142aba1a11e
Merge: 36d8c37 e13c598
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:32:00 2012 -0700

    am e13c5989: am cbecc652: Revert "Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly."

    * commit 'e13c5989a3c21507c25aab1b698538e1ee097327':
      Revert "Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly."

commit 63ada710ed9d4cef259bc62eb6408a7baa8a5cf9
Merge: d09c623 41a563c
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 29 14:11:39 2012 -0700

    am 41a563c0: grouper: update prebuilt kernel

    * commit '41a563c0e3430308828b692f01cc493e2550a2a9':
      grouper: update prebuilt kernel

commit d09c623efc2866db4afeb3ef6bbcce35cb8ec013
Merge: 3d14923 2190769
Author: Eric Laurent <elaurent@google.com>
Date:   Mon Oct 29 14:02:28 2012 -0700

    am 21907692: added setting for dock audio

    * commit '2190769280b5e6b190d994dfc6f5dca92edf1346':
      added setting for dock audio

commit 3d14923a7df16ec9cef9581b78775df05d1a2657
Merge: 1eca07e c6e5c50
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:02:13 2012 -0700

    am c6e5c50b: audio: add dock support

    * commit 'c6e5c50be53f6143e18ad96b884a0426267b3ee4':
      audio: add dock support

commit 1eca07e9e3b72203acb70e191bfe263351ccd516
Merge: e64c088 0e11357
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:02:13 2012 -0700

    am 0e113579: Revert "Audio: Support audio dock."

    * commit '0e11357983dd104c72370e27441040e30d140c9e':
      Revert "Audio: Support audio dock."

commit e64c088a053e84aa844f96b621c73f3641b5cd4a
Merge: e13c598 a99f563
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:02:12 2012 -0700

    am a99f5635: Revert "Audio: fix incorrect routing path."

    * commit 'a99f56358c47b2ed4ffe31cdae9747f3e56f8034':
      Revert "Audio: fix incorrect routing path."

commit e13c5989a3c21507c25aab1b698538e1ee097327
Merge: 9be6875 cbecc65
Author: Simon Wilson <simonwilson@google.com>
Date:   Mon Oct 29 14:02:11 2012 -0700

    am cbecc652: Revert "Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly."

    * commit 'cbecc652f08d1851ed0cd4f0f308c53afee4f308':
      Revert "Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly."

commit 24bc7f42fc0ac308efcd65f26ce98ae080955edc
Merge: 9cf2de4 36d8c37
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Oct 24 15:21:10 2012 -0700

    am fee4a164: am 9be68752: am 45d005b6: grouper: update prebuilt kernel

    * commit 'fee4a164bb45c94a50bebb4ebf9cab35580c3eae':
      grouper: update prebuilt kernel

commit 36d8c372abf64bb5459f65d924caa13dad2c7f28
Merge: d88b02f 9be6875
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Oct 24 15:19:43 2012 -0700

    am 9be68752: am 45d005b6: grouper: update prebuilt kernel

    * commit '9be6875257ca80bab64850b15585917b77ced4e9':
      grouper: update prebuilt kernel

commit 9be6875257ca80bab64850b15585917b77ced4e9
Merge: 5573bb5 45d005b
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Oct 24 15:17:42 2012 -0700

    am 45d005b6: grouper: update prebuilt kernel

    * commit '45d005b680b2d351766357dc3e82cdae9f1fadbd':
      grouper: update prebuilt kernel

commit 9cf2de4509110c5400045f04db43a43ec92575a7
Merge: 515e0de d88b02f
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Oct 23 22:11:54 2012 -0700

    am 700fc307: am 5573bb56: am 29905ffb: Merge "grouper: update prebuilt kernel" into jb-mr1-dev

    * commit '700fc307fc697840806ea67068dc792a221c63a0':
      grouper: update prebuilt kernel

commit 515e0de6eee5442931fdcd63426eaefedbccc40c
Merge: e39d892 7a9e3b8
Author: able_liao <able_liao@asus.com>
Date:   Tue Oct 23 22:11:54 2012 -0700

    am b33eb99b: am 1abb3f1c: am fc3bd5eb: Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly.

    * commit 'b33eb99bc7f30538352247cde4a1256e144961a9':
      Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly.

commit d88b02fbb9037af86c74262ae1d44720643e61a1
Merge: 7a9e3b8 5573bb5
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Oct 23 22:09:20 2012 -0700

    am 5573bb56: am 29905ffb: Merge "grouper: update prebuilt kernel" into jb-mr1-dev

    * commit '5573bb56c9a5b2cef1ec74fabe767fd7df026530':
      grouper: update prebuilt kernel

commit 7a9e3b89af1330e8215eff6d1aacae1707122d5a
Merge: d6f3c94 1abb3f1
Author: able_liao <able_liao@asus.com>
Date:   Tue Oct 23 22:09:20 2012 -0700

    am 1abb3f1c: am fc3bd5eb: Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly.

    * commit '1abb3f1cdf0c91f5969f50c055154c5833cb213f':
      Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly.

commit 5573bb56c9a5b2cef1ec74fabe767fd7df026530
Merge: 1abb3f1 29905ff
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Oct 23 22:06:14 2012 -0700

    am 29905ffb: Merge "grouper: update prebuilt kernel" into jb-mr1-dev

    * commit '29905ffbd4b0e53582a344aac7c8946573a74d24':
      grouper: update prebuilt kernel

commit 1abb3f1cdf0c91f5969f50c055154c5833cb213f
Merge: 876e952 fc3bd5e
Author: able_liao <able_liao@asus.com>
Date:   Tue Oct 23 22:06:13 2012 -0700

    am fc3bd5eb: Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly.

    * commit 'fc3bd5eb75c3723fab25a66420379f783e0d31ba':
      Audio: Dock: fix speaker silent issue after inserting and removing headset rapidly.

commit e39d89254185579a3ebbd4d2a83f4da7124671f5
Merge: 3182359 d6f3c94
Author: Matthew Xie <mattx@google.com>
Date:   Tue Oct 23 10:40:40 2012 -0700

    am 6574e2a7: am 876e9527: am a9c269b0: Change group owner of Bluetooth sleep node to net_bt_stack

    * commit '6574e2a7fac32e019e49b8a6cfbd27b95ec53476':
      Change group owner of Bluetooth sleep node to net_bt_stack

commit d6f3c943276098f221153538b5a6761a65f82779
Merge: 093a7de 876e952
Author: Matthew Xie <mattx@google.com>
Date:   Tue Oct 23 10:38:33 2012 -0700

    am 876e9527: am a9c269b0: Change group owner of Bluetooth sleep node to net_bt_stack

    * commit '876e9527c04277139ce73628c081faa069345b21':
      Change group owner of Bluetooth sleep node to net_bt_stack

commit 876e9527c04277139ce73628c081faa069345b21
Merge: 885450b a9c269b
Author: Matthew Xie <mattx@google.com>
Date:   Tue Oct 23 10:35:13 2012 -0700

    am a9c269b0: Change group owner of Bluetooth sleep node to net_bt_stack

    * commit 'a9c269b0171da7e6e87c1b892c870b12e88b8043':
      Change group owner of Bluetooth sleep node to net_bt_stack

commit 318235941d4d96ac67f1a91ee22b04349af2fcca
Merge: 5cae7d9 093a7de
Author: vito1_lee <vito1_lee@asus.com>
Date:   Mon Oct 22 17:38:56 2012 -0700

    am bdb32acd: am 885450be: am d60d6397: Bluetooth: Change bluesleep procfs permission for bluedroid.

    * commit 'bdb32acddb5e8a641de27f636bfc28f64c810cb5':
      Bluetooth: Change bluesleep procfs permission for bluedroid.

commit 093a7de4f07e72d7778b4758fba9a754bbaa2068
Merge: 79a3c38 885450b
Author: vito1_lee <vito1_lee@asus.com>
Date:   Mon Oct 22 17:35:28 2012 -0700

    am 885450be: am d60d6397: Bluetooth: Change bluesleep procfs permission for bluedroid.

    * commit '885450be008f5706ed3e7ec3f3b4f36971aac7d9':
      Bluetooth: Change bluesleep procfs permission for bluedroid.

commit 885450be008f5706ed3e7ec3f3b4f36971aac7d9
Merge: 0461f58 d60d639
Author: vito1_lee <vito1_lee@asus.com>
Date:   Mon Oct 22 17:32:46 2012 -0700

    am d60d6397: Bluetooth: Change bluesleep procfs permission for bluedroid.

    * commit 'd60d63974982da0db761b9907656a7b6c41ed60d':
      Bluetooth: Change bluesleep procfs permission for bluedroid.

commit 5cae7d9fde53836439300b22c097b305fb3065bd
Merge: d563903 79a3c38
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 22 17:27:10 2012 -0700

    am 43907080: am 0461f580: am 1fb9db71: grouper: update prebuilt kernel

    * commit '439070803608617e8523ea7d8b625653837e8e44':
      grouper: update prebuilt kernel

commit 79a3c385241e7ea5b47c5d079b95a00b309d0ea2
Merge: 99b0a4b 0461f58
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 22 17:24:49 2012 -0700

    am 0461f580: am 1fb9db71: grouper: update prebuilt kernel

    * commit '0461f580ae8ad89a7e6af4e10dbec8f36683283f':
      grouper: update prebuilt kernel

commit 0461f580ae8ad89a7e6af4e10dbec8f36683283f
Merge: 06e6fe8 1fb9db7
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 22 17:22:22 2012 -0700

    am 1fb9db71: grouper: update prebuilt kernel

    * commit '1fb9db71017e56a3f657b5fde1085ff224e53627':
      grouper: update prebuilt kernel

commit d5639030862eb262c2ef7b340a7fce703e28533f
Merge: c15b834 99b0a4b
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 18 12:46:20 2012 -0700

    am a5631e2e: am 06e6fe81: am 12e8e594: Merge "Remove the Google specific location config." into jb-mr1-dev

    * commit 'a5631e2ef0d172bb8489c674e7df35b52b0da725':
      Remove the Google specific location config.

commit 99b0a4b7bc5d98f074c4e597d68d065bd99c76c9
Merge: 28d0bd4 06e6fe8
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 18 12:44:29 2012 -0700

    am 06e6fe81: am 12e8e594: Merge "Remove the Google specific location config." into jb-mr1-dev

    * commit '06e6fe811ec0a2dc0fcedca6ce01a7b89f24849b':
      Remove the Google specific location config.

commit 06e6fe811ec0a2dc0fcedca6ce01a7b89f24849b
Merge: a86fe24 12e8e59
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 18 12:41:24 2012 -0700

    am 12e8e594: Merge "Remove the Google specific location config." into jb-mr1-dev

    * commit '12e8e594ee7a2bd77e0269487adeeb29d88925e9':
      Remove the Google specific location config.

commit c15b8342b96984bac5325eb1463b8e1b269c8da2
Merge: 83ca077 28d0bd4
Author: James Dong <jdong@google.com>
Date:   Thu Oct 18 12:34:09 2012 -0700

    am 28b76d46: am a86fe24a: am 4103c5d2: Fixed the unsupported min frame rate for camcorder profile setting

    * commit '28b76d46c943fe1f6c4a73e47ff5430c2873e1f0':
      Fixed the unsupported min frame rate for camcorder profile setting

commit 28d0bd4dda0d485c373986ab848f7d6c134fe2a5
Merge: d89fc81 a86fe24
Author: James Dong <jdong@google.com>
Date:   Thu Oct 18 12:32:09 2012 -0700

    am a86fe24a: am 4103c5d2: Fixed the unsupported min frame rate for camcorder profile setting

    * commit 'a86fe24a6aab35b5e00d7c13af3238b9bee5e3e8':
      Fixed the unsupported min frame rate for camcorder profile setting

commit a86fe24a6aab35b5e00d7c13af3238b9bee5e3e8
Merge: 0ece760 4103c5d
Author: James Dong <jdong@google.com>
Date:   Thu Oct 18 12:30:15 2012 -0700

    am 4103c5d2: Fixed the unsupported min frame rate for camcorder profile setting

    * commit '4103c5d2863bf30acf5f49432996ee78d581d987':
      Fixed the unsupported min frame rate for camcorder profile setting

commit 83ca0771171d4dc6b4df967c72d6f6e45fe82bf8
Merge: eb98ecd d89fc81
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:42:51 2012 -0700

    am 1bf720b3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '1bf720b3e7a617d656419f8e1b63316d4b8178bd':

commit d89fc81a76497c2d8f9d0f77533eec5b2e4d4178
Merge: 6231d1b d910725 3ba2f49
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:38:11 2012 -0700

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: I1e321a6cf73ae413de2ab61fb42bc100faeabfb4

commit d910725c558fc63525de340838e78962b8785f46
Merge: dd5f9af 93a9e2a
Author: The Android Automerger <android-build@android.com>
Date:   Fri Oct 12 16:34:23 2012 -0700

    merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit eb98ecdfc2f80bbba05ee5bbe5ed0ccc8a95fe01
Merge: 11578f9 6231d1b
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Oct 12 11:14:09 2012 -0700

    am d0360e9b: am 0ece7601: am dd5f9afc: grouper: update prebuilt kernel

    * commit 'd0360e9bb52a4ca4b6c13688b467cd070b9a910b':
      grouper: update prebuilt kernel

commit 6231d1b4581f60ef093756a715897a6c8b76a048
Merge: bf3116b 0ece760
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Oct 12 11:04:20 2012 -0700

    am 0ece7601: am dd5f9afc: grouper: update prebuilt kernel

    * commit '0ece76019b6cb6cd1744504c71c180e73a469add':
      grouper: update prebuilt kernel

commit 93a9e2ac4502c5f48e54c4d796c0291af747fe16
Merge: 9939756 c13fad2
Author: The Android Automerger <android-build@android.com>
Date:   Fri Oct 12 10:26:07 2012 -0700

    merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit 0ece76019b6cb6cd1744504c71c180e73a469add
Merge: 90f1024 dd5f9af
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Oct 12 07:43:00 2012 -0700

    am dd5f9afc: grouper: update prebuilt kernel

    * commit 'dd5f9afcda36c8c7119980b74aa917f554dbf035':
      grouper: update prebuilt kernel

commit 11578f9e6c5fcadbe2f2acc978d0a2dbee0050d5
Merge: f04365b bf3116b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 12 07:33:39 2012 -0700

    am b2ac4d6c: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'b2ac4d6cac7eeebc96bc6f13980473544d06485a':

commit bf3116b5fe116a4e9e0adf8336367787a2603e68
Merge: 2f1bc2d 53e91f8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 12 07:30:44 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I7a169065f1ec4e36acacdb02c37b51c7036a27bf

commit f04365b42e365400ce7fd20f5dc94c7e371d497f
Merge: 79624b9 2f1bc2d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:16:05 2012 -0700

    am f1a7c43c: am 90f10248: am 9939756b: auto-generated blob list

    * commit 'f1a7c43c98cfa552e800e3ad3b8282870aa57703':
      auto-generated blob list

commit 79624b990386482987109488a168f4fd89cc52e8
Merge: 4d60900 e80f0aa
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:16:05 2012 -0700

    am fe832d91: am 30c3dba0: auto-generated blob list

    * commit 'fe832d917ce13c0d9d98b52212c67438fa01c361':
      auto-generated blob list

commit 2f1bc2dc60f5751b9375846654ef4ac1c97c29ed
Merge: e80f0aa 90f1024
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:10:23 2012 -0700

    am 90f10248: am 9939756b: auto-generated blob list

    * commit '90f102489f12c55b3c8c9bea4133fe0502531298':
      auto-generated blob list

commit e80f0aabd5cc0a871136db1aeb3df79fb8204808
Merge: c5f7c3e 30c3dba
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 17:10:20 2012 -0700

    am 30c3dba0: auto-generated blob list

    * commit '30c3dba093f70fba9046a40446aab7f26a49d8f4':
      auto-generated blob list

commit 4d60900a9d109cd31ed36e6a540deff6253a1c30
Merge: 68c2a50 c5f7c3e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 12:28:49 2012 -0700

    am d46d9277: am ecf1f7be: License for NXP binaries

    * commit 'd46d9277c65a589d8fc512e94e699c30241037d2':
      License for NXP binaries

commit c5f7c3e8472a061b24f801c734ddfde734db37f0
Merge: 72bef5e ca7e772
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 12:26:38 2012 -0700

    am ecf1f7be: License for NXP binaries

    * commit 'ecf1f7bec80db2da475c764c3915e01253e64187':
      License for NXP binaries

commit ca7e7728785258214f04785b5662529c019eaca4
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 10:01:44 2012 -0700

    License for NXP binaries

    Change-Id: If5a0cd2d141a3a16235a25f50320a4eb28972d6a

commit 90f102489f12c55b3c8c9bea4133fe0502531298
Merge: 30c3dba 9939756
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 09:52:59 2012 -0700

    am 9939756b: auto-generated blob list

    * commit '9939756bf4ecafe8e8b545f00eef78bf53622025':
      auto-generated blob list

commit 30c3dba093f70fba9046a40446aab7f26a49d8f4
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Oct 11 02:58:06 2012 -0700

    auto-generated blob list

    Bug: 4295425
    Change-Id: I502607d39c856d220a7d29a10c8b62c038d408af

commit 68c2a504e486a1b2072d82126e58246fe9793802
Merge: f052f00 72bef5e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 10 09:45:44 2012 -0700

    am c5fdc939: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'c5fdc939d44b137caf975138293c7e150fd1c247':

commit 72bef5e952de4d32af444a57d14e5a6f4c7b30bc
Merge: 6237fb5 c13fad2 dcb95df
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 10 09:44:08 2012 -0700

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: I2aa7b529ff2118578e20b857973f1763922a96a7

commit c13fad21c74626dbe42e2d2f6218a5724956d7af
Merge: 47922cd e6c23e0
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 10 08:38:58 2012 -0700

    merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit f052f00832a0586f8fe18ffde491f032031a48dc
Merge: 4db742d 6237fb5
Author: Joy Huang <joy_huang@asus.com>
Date:   Tue Oct 9 19:58:05 2012 -0700

    am 79b0c8fc: am 96edf8cb: am 47922cd7: Modified the RF setting dynamically by project.

    * commit '79b0c8fc2aebeb2a16dca76b4b31ae70d97079d6':
      Modified the RF setting dynamically by project.

commit 6237fb5b3b98843f4666d9fddd00134af9dd530b
Merge: ceb6f39 96edf8c
Author: Joy Huang <joy_huang@asus.com>
Date:   Tue Oct 9 19:55:57 2012 -0700

    am 96edf8cb: am 47922cd7: Modified the RF setting dynamically by project.

    * commit '96edf8cb730b1caa22b70e1d2c288f0954637570':
      Modified the RF setting dynamically by project.

commit 96edf8cb730b1caa22b70e1d2c288f0954637570
Merge: 17f3860 47922cd
Author: Joy Huang <joy_huang@asus.com>
Date:   Tue Oct 9 19:53:47 2012 -0700

    am 47922cd7: Modified the RF setting dynamically by project.

    * commit '47922cd7ba7490bb362b38d7bfb230be5c8fac5c':
      Modified the RF setting dynamically by project.

commit 4db742d52f250a3f4610d7ea4c67434e84d37d6b
Merge: b0f39d0 ceb6f39
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:31:39 2012 -0700

    am 928cfc96: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '928cfc96c42e8088a9d1932011120542f2d99bf0':
      grouper: update prebuilt kernel

commit ceb6f399818130467959c0ef7b263463b725a04e
Merge: 317ed18 e6c23e0
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:28:28 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ia387c3d7d5aa9b1dfb21756ec05b48608abe33e7

commit b0f39d035f886acbf97e379b178d0e5f846e977b
Merge: c80ae00 317ed18
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Oct 5 08:54:31 2012 -0700

    am 1a62d79a: am 17f3860d: am 02967b58: grouper: update prebuilt kernel

    * commit '1a62d79a17ddb901063d6031a3f01768ffe809ba':
      grouper: update prebuilt kernel

commit 317ed18588a332450e0cede9817579a6ff4d24ef
Merge: d0c80a8 17f3860
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Oct 5 08:52:49 2012 -0700

    am 17f3860d: am 02967b58: grouper: update prebuilt kernel

    * commit '17f3860dc502fd9bd6a281f171a9642efcdece78':
      grouper: update prebuilt kernel

commit 17f3860dc502fd9bd6a281f171a9642efcdece78
Merge: 25ab29d 02967b5
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Oct 5 08:51:21 2012 -0700

    am 02967b58: grouper: update prebuilt kernel

    * commit '02967b587a95a6d9180fd30c9fd7166c218ebad5':
      grouper: update prebuilt kernel

commit c80ae00eb7008c952e331da987a43202737dde1c
Merge: 8607647 d0c80a8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 5 08:18:27 2012 -0700

    am 0175ec0b: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '0175ec0b42cc0bf1fc45f0ba0ca3721b8eb9724c':

commit d0c80a8672fbd482b410fd8a8105f39808ed5dc7
Merge: 15e4fe6 869cc71
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 5 08:16:09 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I54a9b1b224c20945107cf34f88203cfdeeee91cc

commit 8607647fbea0c22e50882727efaadb8d43b318c2
Merge: daf37f0 15e4fe6
Author: Jeff Hamilton <jham@android.com>
Date:   Fri Oct 5 00:54:14 2012 -0700

    am cca28d2b: am 25ab29d6: am fe5e1f6b: Revert "Remove the Google specific location config."

    * commit 'cca28d2b1c442c5ca57af1767d07a0485869b3a6':
      Revert "Remove the Google specific location config."

commit 15e4fe613daeb69615e271da7198d17c626270dd
Merge: 8de68ad 25ab29d
Author: Jeff Hamilton <jham@android.com>
Date:   Fri Oct 5 00:52:41 2012 -0700

    am 25ab29d6: am fe5e1f6b: Revert "Remove the Google specific location config."

    * commit '25ab29d6fcb1451aca1b07a7683367a746d36603':
      Revert "Remove the Google specific location config."

commit 25ab29d6fcb1451aca1b07a7683367a746d36603
Merge: ae8d840 fe5e1f6
Author: Jeff Hamilton <jham@android.com>
Date:   Fri Oct 5 00:48:44 2012 -0700

    am fe5e1f6b: Revert "Remove the Google specific location config."

    * commit 'fe5e1f6b7837bd11753735bf018fb3e3b259e99b':
      Revert "Remove the Google specific location config."

commit daf37f0aa0603a5146eaf55d5c69384011c2c7cc
Merge: 7756fb3 8de68ad
Author: Matthew Xie <mattx@google.com>
Date:   Thu Oct 4 23:31:43 2012 -0700

    am ab21128f: am ae8d840f: am e2d55e55: Merge "Change Bluetooth file group id to net_bt_stack" into jb-mr1-dev

    * commit 'ab21128fa833c8a4bdf888a5e9c745c660fcc69b':
      Change Bluetooth file group id to net_bt_stack

commit 8de68ad5f6259bfe12fe3ed4cf452fae1f8f42d1
Merge: 1758fe7 ae8d840
Author: Matthew Xie <mattx@google.com>
Date:   Thu Oct 4 23:28:55 2012 -0700

    am ae8d840f: am e2d55e55: Merge "Change Bluetooth file group id to net_bt_stack" into jb-mr1-dev

    * commit 'ae8d840feefb051416b3c209e035ae04f682dfa5':
      Change Bluetooth file group id to net_bt_stack

commit ae8d840feefb051416b3c209e035ae04f682dfa5
Merge: f838942 e2d55e5
Author: Matthew Xie <mattx@google.com>
Date:   Thu Oct 4 23:26:09 2012 -0700

    am e2d55e55: Merge "Change Bluetooth file group id to net_bt_stack" into jb-mr1-dev

    * commit 'e2d55e553b299bdb272047c529df475d40ed640d':
      Change Bluetooth file group id to net_bt_stack

commit 7756fb37ce5ecc45908c404578630ced74c59c1b
Merge: 8303ef2 1758fe7
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 4 20:34:09 2012 -0700

    am c8d97d7f: am f838942c: am c94500c0: Remove the Google specific location config.

    * commit 'c8d97d7ff37cce105720079ba55770b8e4b0ec6a':
      Remove the Google specific location config.

commit 1758fe714d8de1b28cb03604970927c4a4c6ad88
Merge: 11ae567 f838942
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 4 18:29:47 2012 -0700

    am f838942c: am c94500c0: Remove the Google specific location config.

    * commit 'f838942cd3738bcbf27c754d33fa7b6c710bd81b':
      Remove the Google specific location config.

commit f838942cd3738bcbf27c754d33fa7b6c710bd81b
Merge: e1ed041 c94500c
Author: Jeff Hamilton <jham@android.com>
Date:   Thu Oct 4 18:25:51 2012 -0700

    am c94500c0: Remove the Google specific location config.

    * commit 'c94500c02a1309ba43434eafb1aeff3670352ab8':
      Remove the Google specific location config.

commit 8303ef2bc47f6eaab3b56253bea1c0d33f973668
Merge: 2817fbb 11ae567
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 14:04:48 2012 -0700

    am c999d0cb: (-s ours) am 7fce7d56: (-s ours) Reconcile with jb-release - do not merge

    * commit 'c999d0cb7a886c49e71f0760b1bfc533b96474d2':

commit 11ae5676729215b40c0a61857c0cd1ee4b5a755e
Merge: 46472b2 6237033
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 13:55:32 2012 -0700

    am 7fce7d56: (-s ours) Reconcile with jb-release - do not merge

    * commit '7fce7d56cb077e869b9509cd2770d92e8cf29dcc':

commit 62370335a7fa4ba3b5791a7af77073a28820a700
Merge: 734bf8a 505d795
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 13:01:26 2012 -0700

    Reconcile with jb-release - do not merge

    Change-Id: Ia3f31a8ec0a6ca08ee8555124019a0f89e57d671

commit 2817fbbca3fce97d0e8224d382b1ef7ef877f3fe
Merge: 24a611c 46472b2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 07:44:42 2012 -0700

    am 46472b22: am 734bf8af: Distributables for JZO54K for grouper

    * commit '46472b228b2d1ccb79dab699100774e4a8521d5b':
      Distributables for JZO54K for grouper

commit 46472b228b2d1ccb79dab699100774e4a8521d5b
Merge: d2cc3e4 734bf8a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Oct 3 07:42:51 2012 -0700

    am 734bf8af: Distributables for JZO54K for grouper

    * commit '734bf8afd38d97ce311adb9140b8156280b3e585':
      Distributables for JZO54K for grouper

commit 734bf8afd38d97ce311adb9140b8156280b3e585
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Oct 2 15:40:15 2012 -0700

    Distributables for JZO54K for grouper

    Change-Id: I5570f56d46d0dda4bd2773282cdcb0b85fccfa77

commit 24a611cfd195c94c0e530dd5c95efd7fbdb116e7
Merge: d76c4b3 d2cc3e4
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:19:02 2012 -0700

    am d2cc3e44: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'd2cc3e44b585f13e1b6feb9b86fec360b017ff41':
      grouper: update prebuilt kernel

commit d2cc3e44b585f13e1b6feb9b86fec360b017ff41
Merge: bc2d913 c5ed6ce
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:17:08 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I240e1773fa72a3e8725243a3dc84bdf02025e93d

commit d76c4b30fda13b35c86f79d1425057b399e83b40
Merge: 0789415 bc2d913
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Oct 1 14:20:30 2012 -0700

    am bc2d913c: am 6e8b4c26: Factory image for JZO54J

    * commit 'bc2d913cdb6662b2939dbbefee5e264a3db05bd6':
      Factory image for JZO54J

commit bc2d913cdb6662b2939dbbefee5e264a3db05bd6
Merge: 3bcd03b 6e8b4c2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Oct 1 14:19:09 2012 -0700

    am 6e8b4c26: Factory image for JZO54J

    * commit '6e8b4c26d5d1b7b0d34cacc9763f3128236ae596':
      Factory image for JZO54J

commit 078941515d5160108755bae9bc64276ac7105d1e
Merge: e437dff 3bcd03b
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 1 14:00:44 2012 -0700

    am 3bcd03b6: am e1ed041f: am 57f97708: grouper: update prebuilt kernel

    * commit '3bcd03b61af3ffd6736049e6e1e2c4e13b19cc55':
      grouper: update prebuilt kernel

commit e437dffe2d3be82e57e17acf3f83213ccf0be074
Merge: 9c81d7f 49f6849
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Oct 1 13:46:20 2012 -0700

    am 49f68492: am 84b1913a: am 4ca93562: Allow traversal into /storage/emulated.

    * commit '49f6849288de2439be670c85f1073725cdfa4be2':
      Allow traversal into /storage/emulated.

commit 9c81d7f9d84016eeab5f7b4cfbfd999dae1019f4
Merge: 78acd07 f6b399d
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Oct 1 13:46:20 2012 -0700

    am f6b399df: am db6425b8: am 06fae846: Merge "Final shuffle to make /sdcard work in shell." into jb-mr1-dev

    * commit 'f6b399df81f09ad004d8f865aa4c169e5225d59f':
      Final shuffle to make /sdcard work in shell.

commit 3bcd03b61af3ffd6736049e6e1e2c4e13b19cc55
Merge: 49f6849 e1ed041
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 1 13:37:56 2012 -0700

    am e1ed041f: am 57f97708: grouper: update prebuilt kernel

    * commit 'e1ed041f10a6415aed6956bf197091655119cdf6':
      grouper: update prebuilt kernel

commit e1ed041f10a6415aed6956bf197091655119cdf6
Merge: 84b1913 57f9770
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Oct 1 13:35:59 2012 -0700

    am 57f97708: grouper: update prebuilt kernel

    * commit '57f97708fb4ca004472e4c0ab3941da8ff4090a0':
      grouper: update prebuilt kernel

commit 49f6849288de2439be670c85f1073725cdfa4be2
Merge: f6b399d 84b1913
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Oct 1 10:16:36 2012 -0700

    am 84b1913a: am 4ca93562: Allow traversal into /storage/emulated.

    * commit '84b1913a5610725b60efc6cbe79db466dfa3ec6c':
      Allow traversal into /storage/emulated.

commit f6b399df81f09ad004d8f865aa4c169e5225d59f
Merge: c2c69c5 db6425b
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Oct 1 10:15:48 2012 -0700

    am db6425b8: am 06fae846: Merge "Final shuffle to make /sdcard work in shell." into jb-mr1-dev

    * commit 'db6425b8052538e22b69b14a88c4537a18925ba6':
      Final shuffle to make /sdcard work in shell.

commit 84b1913a5610725b60efc6cbe79db466dfa3ec6c
Merge: db6425b 4ca9356
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Sun Sep 30 17:26:41 2012 -0700

    am 4ca93562: Allow traversal into /storage/emulated.

    * commit '4ca9356229b6ea32fa005707cd28379738c98683':
      Allow traversal into /storage/emulated.

commit db6425b8052538e22b69b14a88c4537a18925ba6
Merge: 2a00d7f 06fae84
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Sun Sep 30 13:25:01 2012 -0700

    am 06fae846: Merge "Final shuffle to make /sdcard work in shell." into jb-mr1-dev

    * commit '06fae846873d7f1a6e6798a5b300b75dba2a56bb':
      Final shuffle to make /sdcard work in shell.

commit 78acd07fab2444cb57e2afcefc6e88d340606deb
Merge: b226a15 c2c69c5
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 15:52:06 2012 -0700

    am c2c69c56: Merge from jb-mr1-aah-dev

    * commit 'c2c69c56231a156e009649b2ec3cd0e92dd41393':

commit c2c69c56231a156e009649b2ec3cd0e92dd41393
Merge: be4248f 2a00d7f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 14:19:10 2012 -0700

    Merge from jb-mr1-aah-dev

    Change-Id: Ic3655193a45d0770a5f5cb215b59ca173636d23d

commit b226a1534625a5e85b76e4e6d926ad89160467b6
Merge: 4bc2144 be4248f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 13:03:28 2012 -0700

    am be4248f1: (-s ours) am c8bd877b: am 2c068da0: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'be4248f11eed4df0e21ce023564774822b4504e8':
      bootloader: nakasi: subject bootloader version to 3.41. DO NOT MERGE
      take 6c1dc2eaffd380710917ec8a61ebfb3da340aff5
      Add "discard" mount option for data and cache partition.

commit 2a00d7f7c3edf98eb67bff785d32d564c5c7f706
Merge: 5487b2d c8bd877
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 13:01:41 2012 -0700

    am c8bd877b: (-s ours) am 2c068da0: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'c8bd877b5e8dc219888a8cfd7ee30ab3c9b3f76f':
      bootloader: nakasi: subject bootloader version to 3.41. DO NOT MERGE
      take 6c1dc2eaffd380710917ec8a61ebfb3da340aff5
      Add "discard" mount option for data and cache partition.

commit be4248f11eed4df0e21ce023564774822b4504e8
Merge: db0a6ee c8bd877
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 13:01:30 2012 -0700

    am c8bd877b: am 2c068da0: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'c8bd877b5e8dc219888a8cfd7ee30ab3c9b3f76f':
      bootloader: nakasi: subject bootloader version to 3.41. DO NOT MERGE
      take 6c1dc2eaffd380710917ec8a61ebfb3da340aff5
      Add "discard" mount option for data and cache partition.

commit 6e8b4c26d5d1b7b0d34cacc9763f3128236ae596
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 12:56:46 2012 -0700

    Factory image for JZO54J

    Change-Id: Ie3b899795ae98123c09f9e4efc6fdbe7fe4ee1d3

commit 4bc2144943fdbe05115dd2c609442a85228e5428
Merge: 350a37b db0a6ee
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Sep 28 07:45:41 2012 -0700

    am db0a6ee7: am c19274cf: am 56cefbce: resolved conflicts for merge of 806dcd02 to jb-dev-plus-aosp

    * commit 'db0a6ee7a1f68670923e1065d1639d8b4c4e0e2f':
      bootloader: nakasi: subject bootloader version to 3.41. DO NOT MERGE

commit db0a6ee7a1f68670923e1065d1639d8b4c4e0e2f
Merge: 6286190 c19274c
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Sep 28 07:44:23 2012 -0700

    am c19274cf: am 56cefbce: resolved conflicts for merge of 806dcd02 to jb-dev-plus-aosp

    * commit 'c19274cf053752c921fd6f379db0fcb563a293e6':
      bootloader: nakasi: subject bootloader version to 3.41. DO NOT MERGE

commit 5487b2dc46ca8f812b57a7166c37a4fb0644a22a
Merge: 9d56890 c19274c
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Sep 28 07:44:18 2012 -0700

    am c19274cf: am 56cefbce: resolved conflicts for merge of 806dcd02 to jb-dev-plus-aosp

    * commit 'c19274cf053752c921fd6f379db0fcb563a293e6':
      bootloader: nakasi: subject bootloader version to 3.41. DO NOT MERGE

commit 350a37bddeab1c6eec8dc0be18d6c450b1f80968
Merge: f23afc7 6286190
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 00:32:26 2012 -0700

    am 62861909: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '62861909f682f89ba7666bf8b39fece72f67c270':

commit 62861909f682f89ba7666bf8b39fece72f67c270
Merge: b5cd7c5 c56ed60
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 27 09:57:18 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I732a30dbf2d94690e316a066e5b8d6fa19a190bb

commit f23afc7599b96c301d36ec395998c1db846a3c46
Merge: 74b2fec b5cd7c5
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 14:30:12 2012 -0700

    am b5cd7c5e: am 6b5967f7: Merge "Revert "Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL."" into jb-mr1-dev

    * commit 'b5cd7c5e143e81d8fb6b5cdfc22ff3cd35c9f8d0':
      Revert "Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL."

commit 9d56890b93920624770b7e95d5ba2ba4d42b57dc
Merge: d45db41 6b5967f
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 14:28:51 2012 -0700

    am 6b5967f7: Merge "Revert "Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL."" into jb-mr1-dev

    * commit '6b5967f7e8333467caa4f856fe63c388039eea74':
      Revert "Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL."

commit b5cd7c5e143e81d8fb6b5cdfc22ff3cd35c9f8d0
Merge: dfd6d84 6b5967f
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 14:28:20 2012 -0700

    am 6b5967f7: Merge "Revert "Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL."" into jb-mr1-dev

    * commit '6b5967f7e8333467caa4f856fe63c388039eea74':
      Revert "Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL."

commit 74b2fec3b901befb414cc689c8551da2dfb0e08a
Merge: 78f629d dfd6d84
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 14:05:26 2012 -0700

    am dfd6d845: am b1f43079: am a068d3aa: (-s ours) am 0575d7ed: Merge "grouper: update prebuilt kernel" into jb-dev

    * commit 'dfd6d845908e2dcb69a39dc0ad8e86ceeaa71e66':
      grouper: update prebuilt kernel

commit dfd6d845908e2dcb69a39dc0ad8e86ceeaa71e66
Merge: 2516c49 b1f4307
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 14:04:08 2012 -0700

    am b1f43079: am a068d3aa: (-s ours) am 0575d7ed: Merge "grouper: update prebuilt kernel" into jb-dev

    * commit 'b1f43079a07db741f34b7e762b11379ac55410df':
      grouper: update prebuilt kernel

commit d45db41457cf675511e848dacc3ae6310c016f64
Merge: 789355e b1f4307
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 14:03:38 2012 -0700

    am b1f43079: am a068d3aa: (-s ours) am 0575d7ed: Merge "grouper: update prebuilt kernel" into jb-dev

    * commit 'b1f43079a07db741f34b7e762b11379ac55410df':
      grouper: update prebuilt kernel

commit 78f629da304a4b56f40004ad67142c817be1d905
Merge: 73ce1b1 2516c49
Author: johnny1_lin <johnny1_lin@asus.com>
Date:   Wed Sep 26 14:03:02 2012 -0700

    am 2516c49a: am 7c1f8695: am 3b15a0d9: am 9f940351: Add "discard" mount option for data and cache partition.

    * commit '2516c49a59b19f05e7e1d85b470be6de403c2ec9':
      Add "discard" mount option for data and cache partition.

commit 2516c49a59b19f05e7e1d85b470be6de403c2ec9
Merge: fcc2911 7c1f869
Author: johnny1_lin <johnny1_lin@asus.com>
Date:   Wed Sep 26 14:00:41 2012 -0700

    am 7c1f8695: am 3b15a0d9: am 9f940351: Add "discard" mount option for data and cache partition.

    * commit '7c1f8695788d74a841cdb086f7f64970aaf00476':
      Add "discard" mount option for data and cache partition.

commit 789355ef06e985579b0569c85fd6d7db04076e1c
Merge: 6810854 7c1f869
Author: johnny1_lin <johnny1_lin@asus.com>
Date:   Wed Sep 26 14:00:09 2012 -0700

    am 7c1f8695: am 3b15a0d9: am 9f940351: Add "discard" mount option for data and cache partition.

    * commit '7c1f8695788d74a841cdb086f7f64970aaf00476':
      Add "discard" mount option for data and cache partition.

commit 73ce1b174f6908b8198f43e3112e66e89c829d63
Merge: 1ab5e4b fcc2911
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 13:44:17 2012 -0700

    am fcc2911b: am 0a8e6780: Merge "Add "discard" mount option for data and cache partition." into jb-mr1-dev

    * commit 'fcc2911b3df773f3afac98b02fafb73eb7e9cc5d':
      Add "discard" mount option for data and cache partition.

commit 1ab5e4b427a1a08f1d13d29d7c5c98f868fb276e
Merge: 280f4ef 0738597
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 13:44:16 2012 -0700

    am 07385979: am 3946b7d7: grouper: update prebuilt kernel

    * commit '073859797a0fff53521a8afe0c354ab0118995fd':
      grouper: update prebuilt kernel

commit 6810854c3f004a167ea07f9d9a618ea2ec175a6a
Merge: 35caf5f 0a8e678
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 13:42:48 2012 -0700

    am 0a8e6780: Merge "Add "discard" mount option for data and cache partition." into jb-mr1-dev

    * commit '0a8e67806f3265fbb8882a65965e7289539ae839':
      Add "discard" mount option for data and cache partition.

commit 35caf5f38433968591df6777e45190ee7abef861
Merge: acce94c 3946b7d
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 13:42:47 2012 -0700

    am 3946b7d7: grouper: update prebuilt kernel

    * commit '3946b7d7e00e834e7aa0f2bceb55b52760fee1b4':
      grouper: update prebuilt kernel

commit fcc2911b3df773f3afac98b02fafb73eb7e9cc5d
Merge: 0738597 0a8e678
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 13:42:32 2012 -0700

    am 0a8e6780: Merge "Add "discard" mount option for data and cache partition." into jb-mr1-dev

    * commit '0a8e67806f3265fbb8882a65965e7289539ae839':
      Add "discard" mount option for data and cache partition.

commit 073859797a0fff53521a8afe0c354ab0118995fd
Merge: 2452764 3946b7d
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 26 13:42:31 2012 -0700

    am 3946b7d7: grouper: update prebuilt kernel

    * commit '3946b7d7e00e834e7aa0f2bceb55b52760fee1b4':
      grouper: update prebuilt kernel

commit 280f4ef769007e5a95dec98d93190769a866c91d
Merge: 17b3c69 2452764
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Sep 26 13:29:53 2012 -0700

    am 2452764e: am f83c38f8: JZO54I factory images for nakasi

    * commit '2452764e96d186cc5e427e9cc72aa3cbb3bd949f':
      JZO54I factory images for nakasi

commit 2452764e96d186cc5e427e9cc72aa3cbb3bd949f
Merge: 9f4613a f83c38f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Sep 26 13:28:07 2012 -0700

    am f83c38f8: JZO54I factory images for nakasi

    * commit 'f83c38f8f01cd3a1d38c0b2bab608cb87ade9adc':
      JZO54I factory images for nakasi

commit f83c38f8f01cd3a1d38c0b2bab608cb87ade9adc
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Sep 26 13:15:46 2012 -0700

    JZO54I factory images for nakasi

    Change-Id: Ic60bb1ab67dbdc4f0d20884bbad326369f2dbd87

commit 17b3c692add540a2f9a119169feec6689220292a
Merge: e9599f0 9f4613a
Author: Joseph Wu <Joseph_Wu@asus.com>
Date:   Wed Sep 26 12:27:36 2012 -0700

    am 9f4613a3: am cc625e78: Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL.

    * commit '9f4613a3c51d00756121e450e38e829086968bac':
      Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL.

commit 9f4613a3c51d00756121e450e38e829086968bac
Merge: ecdca32 cc625e7
Author: Joseph Wu <Joseph_Wu@asus.com>
Date:   Wed Sep 26 12:25:34 2012 -0700

    am cc625e78: Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL.

    * commit 'cc625e78cde781e1c51c621fdaef741ac9a9e4c2':
      Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL.

commit acce94c6312e32884ec22b687e20a2f0b2baf04c
Merge: 2e8324e cc625e7
Author: Joseph Wu <Joseph_Wu@asus.com>
Date:   Wed Sep 26 12:25:14 2012 -0700

    am cc625e78: Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL.

    * commit 'cc625e78cde781e1c51c621fdaef741ac9a9e4c2':
      Sensors: [PATCH 2/3] Enable flags to load correct sensors HAL.

commit e9599f00607afe55c4dc60cd8dc28ea14cdebc5e
Merge: ce7e4c6 ecdca32
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 10:08:05 2012 -0700

    am ecdca327: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'ecdca3270ccaa34ae9c3c48061152334521e9c55':

commit ecdca3270ccaa34ae9c3c48061152334521e9c55
Merge: 052acc1 7084f26
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 09:06:15 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Iad425cc337858b3794718e0ff8540bb04b6e9a6b

commit 2e8324e5f8dc8ffd9de5f5fc948e0fb05b26d318
Merge: f3a94da b4b81c1
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 25 12:46:17 2012 -0700

    am b4b81c1b: Merge "Move TARGET_RELEASETOOLS_EXTENSIONS from BoardConfigCommon.mk" into jb-mr1-dev

    * commit 'b4b81c1beea540343cb8336cd65ef9d8f0b89c81':
      Move TARGET_RELEASETOOLS_EXTENSIONS from BoardConfigCommon.mk

commit f3a94dadb0ed56cae4996789d400481bb167071b
Merge: fb8e8e7 01e2a5b
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 25 12:46:17 2012 -0700

    am 01e2a5b7: grouper: update prebuilt kernel

    * commit '01e2a5b760904bec1f8bf70b4540426aafb83e32':
      grouper: update prebuilt kernel

commit ce7e4c66c644425276a8fd2ae6c1d905119f28ba
Merge: d82d992 052acc1
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 25 12:35:28 2012 -0700

    am 052acc1c: am b4b81c1b: Merge "Move TARGET_RELEASETOOLS_EXTENSIONS from BoardConfigCommon.mk" into jb-mr1-dev

    * commit '052acc1cacaf370d68658439c3261f8e6c658884':
      Move TARGET_RELEASETOOLS_EXTENSIONS from BoardConfigCommon.mk

commit d82d9923bc656d1fe8c3db703dd29439a525e8ec
Merge: 175482c 069824f
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 25 12:35:27 2012 -0700

    am 069824f1: am 01e2a5b7: grouper: update prebuilt kernel

    * commit '069824f13205982d52cd005c756a880e4dd31c2b':
      grouper: update prebuilt kernel

commit 052acc1cacaf370d68658439c3261f8e6c658884
Merge: 069824f b4b81c1
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 25 12:28:28 2012 -0700

    am b4b81c1b: Merge "Move TARGET_RELEASETOOLS_EXTENSIONS from BoardConfigCommon.mk" into jb-mr1-dev

    * commit 'b4b81c1beea540343cb8336cd65ef9d8f0b89c81':
      Move TARGET_RELEASETOOLS_EXTENSIONS from BoardConfigCommon.mk

commit 069824f13205982d52cd005c756a880e4dd31c2b
Merge: eb76f64 01e2a5b
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 25 12:28:18 2012 -0700

    am 01e2a5b7: grouper: update prebuilt kernel

    * commit '01e2a5b760904bec1f8bf70b4540426aafb83e32':
      grouper: update prebuilt kernel

commit 175482c2a5c2b228759cbe59a098346691d45c57
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 25 05:18:36 2012 -0700

    auto-generated blob list

    Bug: 4295425
    Change-Id: I7560b6b18c146f7f7cf0dfb5ed60d612ff278782

commit 62759f5084445a7a77d8c957963fec465711b58d
Merge: 5615cba eb76f64
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:14:49 2012 -0700

    am eb76f646: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'eb76f64651a2cee6f79af2b995c1d7105309a62e':
      grouper: update prebuilt kernel

commit eb76f64651a2cee6f79af2b995c1d7105309a62e
Merge: 9533a10 ebc84f5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:11:37 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I72d47478ce1d175543ddf66953c487c5b0f1eced

commit 5615cba0f883477972ed2200028a4886ee7d3237
Merge: 4ef68f2 9533a10
Author: Matthew Xie <mattx@google.com>
Date:   Mon Sep 24 00:50:45 2012 -0700

    am 9533a107: am 831fd3e2: Merge "Configure nexus 7 device class as major Computer minor PDA" into jb-mr1-dev

    * commit '9533a1079d43356491b3fad7d4ccaa491564eda5':
      Configure nexus 7 device class as major Computer minor PDA

commit 4ef68f2d27a65679e3cc9429330f72ca84394b08
Merge: 0bd7f85 5b7e100
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 24 00:50:17 2012 -0700

    am 5b7e1004: am 502602de: am 60e5d259: am 042f71fb: Self-extractors for JRO03R binaries for grouper

    * commit '5b7e1004b64981667c5c20a849ae6cacea622918':
      Self-extractors for JRO03R binaries for grouper

commit fb8e8e77600b21753151401873f882510ca85c6d
Merge: 5d2b315 831fd3e
Author: Matthew Xie <mattx@google.com>
Date:   Fri Sep 21 17:49:16 2012 -0700

    am 831fd3e2: Merge "Configure nexus 7 device class as major Computer minor PDA" into jb-mr1-dev

    * commit '831fd3e250dd685b1456e30e450599abe447926a':
      Configure nexus 7 device class as major Computer minor PDA

commit 5d2b3153cf771b2226148f4d76d3ed3e75384912
Merge: b61b2d0 502602d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 21 17:48:55 2012 -0700

    am 502602de: am 60e5d259: am 042f71fb: Self-extractors for JRO03R binaries for grouper

    * commit '502602de9f8ecdb5e09a3ed39f3cae41eb5f3eec':
      Self-extractors for JRO03R binaries for grouper

commit 9533a1079d43356491b3fad7d4ccaa491564eda5
Merge: 5b7e100 831fd3e
Author: Matthew Xie <mattx@google.com>
Date:   Fri Sep 21 15:36:47 2012 -0700

    am 831fd3e2: Merge "Configure nexus 7 device class as major Computer minor PDA" into jb-mr1-dev

    * commit '831fd3e250dd685b1456e30e450599abe447926a':
      Configure nexus 7 device class as major Computer minor PDA

commit 5b7e1004b64981667c5c20a849ae6cacea622918
Merge: 1837eee 502602d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 21 15:19:43 2012 -0700

    am 502602de: am 60e5d259: am 042f71fb: Self-extractors for JRO03R binaries for grouper

    * commit '502602de9f8ecdb5e09a3ed39f3cae41eb5f3eec':
      Self-extractors for JRO03R binaries for grouper

commit b61b2d0d34c993cc1ba5a2e2c7756e8a02d338f6
Merge: 746f44b 505454a
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Fri Sep 21 13:34:22 2012 -0700

    am 505454a5: ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

    * commit '505454a546d39203848b1faa85aaa1c34a12881b':
      ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

commit 746f44baf90428b0cd2947c238104d2c8134ece5
Merge: 07c7cfa e9741a3
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Fri Sep 21 13:32:26 2012 -0700

    am e9741a3b: grouper: dhcp: Add CLIENTID request to dhcpcd service

    * commit 'e9741a3b23348c0cca047e7225656bc9691fc8b7':
      grouper: dhcp: Add CLIENTID request to dhcpcd service

commit 0bd7f85de2ba1d1f0c76134e18bea0c595abfc2f
Merge: acba1d8 1837eee
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Thu Sep 20 20:31:31 2012 -0700

    am 1837eeef: am 505454a5: ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

    * commit '1837eeef48aebce1ab25ef221e2be39826a73b9c':
      ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

commit 1837eeef48aebce1ab25ef221e2be39826a73b9c
Merge: 757340f 505454a
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Thu Sep 20 20:23:08 2012 -0700

    am 505454a5: ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

    * commit '505454a546d39203848b1faa85aaa1c34a12881b':
      ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

commit acba1d8d38bf12567d2f0973f2a4ee25481c7728
Merge: 80d7b68 757340f
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Sep 20 15:45:57 2012 -0700

    am 757340f5: am e9741a3b: grouper: dhcp: Add CLIENTID request to dhcpcd service

    * commit '757340f569e328d9201e2b14f69e1e2d2c075ac8':
      grouper: dhcp: Add CLIENTID request to dhcpcd service

commit 757340f569e328d9201e2b14f69e1e2d2c075ac8
Merge: 6c900b1 e9741a3
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Thu Sep 20 13:49:41 2012 -0700

    am e9741a3b: grouper: dhcp: Add CLIENTID request to dhcpcd service

    * commit 'e9741a3b23348c0cca047e7225656bc9691fc8b7':
      grouper: dhcp: Add CLIENTID request to dhcpcd service

commit 80d7b68c8bcf422dd6540ea47eb0c6ce98361e01
Merge: 5da678c 6c900b1
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Sep 20 13:00:34 2012 -0700

    am 6c900b1e: am 01a57cb2: Merge "grouper: update prebuilt kernel" into jb-mr1-dev

    * commit '6c900b1e6e889e6b7e8a563d19d4009061e69342':
      grouper: update prebuilt kernel

commit 5da678cb1068d198c14381f651d966ee7246f8b0
Merge: cb7932c 4343243
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Sep 20 12:56:49 2012 -0700

    am 4343243c: am 924b516f: auto-generated blob list

    * commit '4343243c2fbae8648a06537ae10eebba3a5962b9':
      auto-generated blob list

commit 6c900b1e6e889e6b7e8a563d19d4009061e69342
Merge: 4343243 01a57cb
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Sep 20 12:51:17 2012 -0700

    am 01a57cb2: Merge "grouper: update prebuilt kernel" into jb-mr1-dev

    * commit '01a57cb2b5c940c0e7c3691be88bf27cd1e0e4a1':
      grouper: update prebuilt kernel

commit 4343243c2fbae8648a06537ae10eebba3a5962b9
Merge: 4e59921 924b516
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Sep 20 12:51:17 2012 -0700

    am 924b516f: auto-generated blob list

    * commit '924b516f2cfc5e762d7b1f6dc9f0cec140d8fbe5':
      auto-generated blob list

commit 07c7cfa37e3dc2a3500e3d140a1673dd4454aff8
Merge: 4375391 01a57cb
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Sep 20 12:50:43 2012 -0700

    am 01a57cb2: Merge "grouper: update prebuilt kernel" into jb-mr1-dev

    * commit '01a57cb2b5c940c0e7c3691be88bf27cd1e0e4a1':
      grouper: update prebuilt kernel

commit 43753911f454d4969327e3be042fe08607e8bf02
Merge: 3623ba7 924b516
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Sep 20 12:50:41 2012 -0700

    am 924b516f: auto-generated blob list

    * commit '924b516f2cfc5e762d7b1f6dc9f0cec140d8fbe5':
      auto-generated blob list

commit 3623ba7fc2459a2505ee289024832d52bf83e590
Merge: ac9bfbd f578be0
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 20 06:21:23 2012 -0700

    am f578be05: Migrate UI to supportsMultipleUsers().

    * commit 'f578be051d6125b594c6ba73e84fa68289e20930':
      Migrate UI to supportsMultipleUsers().

commit cb7932cbbfb011486ab9bba07e9d83b4f9af02ca
Merge: 918a5b3 4e59921
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 20 06:18:52 2012 -0700

    am 4e59921f: am f578be05: Migrate UI to supportsMultipleUsers().

    * commit '4e59921fa6c698dec6fe0f64f0a443f70cef5746':
      Migrate UI to supportsMultipleUsers().

commit 4e59921fa6c698dec6fe0f64f0a443f70cef5746
Merge: 831b2b7 f578be0
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 20 06:07:32 2012 -0700

    am f578be05: Migrate UI to supportsMultipleUsers().

    * commit 'f578be051d6125b594c6ba73e84fa68289e20930':
      Migrate UI to supportsMultipleUsers().

commit 918a5b3e2de2dc5be386a56d72f13d497009f4ae
Merge: 06cc22f 831b2b7
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 19 15:18:58 2012 -0700

    am 831b2b7d: am 42409a8d: grouper: update prebuilt kernel

    * commit '831b2b7deb28f50ba88b137ed880311928e7338b':
      grouper: update prebuilt kernel

commit ac9bfbd81033b86e69bb44156bb89499aa4c4e2c
Merge: 7ef1281 42409a8
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 19 05:50:30 2012 -0700

    am 42409a8d: grouper: update prebuilt kernel

    * commit '42409a8d69b4d0d91ad115f82719de1e85ce6c2a':
      grouper: update prebuilt kernel

commit 831b2b7deb28f50ba88b137ed880311928e7338b
Merge: 72c40c9 42409a8
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 18 21:05:59 2012 -0700

    am 42409a8d: grouper: update prebuilt kernel

    * commit '42409a8d69b4d0d91ad115f82719de1e85ce6c2a':
      grouper: update prebuilt kernel

commit 06cc22f722592a6fbe264a2e6fb674b6baa6d5bb
Merge: a0d2124 72c40c9
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 18 10:14:18 2012 -0700

    am 72c40c98: am 2635566b: auto-generated blob list

    * commit '72c40c989e789c8b5f9a37b21fb7c69dcd53e158':
      auto-generated blob list

commit 72c40c989e789c8b5f9a37b21fb7c69dcd53e158
Merge: 47a91a2 2635566
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 18 10:10:05 2012 -0700

    am 2635566b: auto-generated blob list

    * commit '2635566bd09a3e96d0997794f0a7183b06120540':
      auto-generated blob list

commit 7ef1281e3a4b7f4ed37414ebd84bc521514d64d4
Merge: 1dff1bd 2635566
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 18 10:03:27 2012 -0700

    am 2635566b: auto-generated blob list

    * commit '2635566bd09a3e96d0997794f0a7183b06120540':
      auto-generated blob list

commit a0d2124f53e7d880ca10fe35ca571e9cd14afc90
Merge: 1de7bf5 47a91a2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 14:59:32 2012 -0700

    am 47a91a29: am ec43065f: Merge "auto-generated blob list" into jb-mr1-dev

    * commit '47a91a2984b2aeb3003711fe06ae381088f82827':
      auto-generated blob list

commit 1dff1bd119577a9d05110498ebf4e15a4c81ea92
Merge: e45aeac ec43065
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 14:55:08 2012 -0700

    am ec43065f: Merge "auto-generated blob list" into jb-mr1-dev

    * commit 'ec43065f2b333121e6d5439cdf1bd8ee17886055':
      auto-generated blob list

commit 1de7bf5dc86d61940230f662c9970ea317a02a13
Merge: 07c8fd4 81c87e6
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 14:55:05 2012 -0700

    am 81c87e68: am 0f5dbee7: Merge "Remove unnecessary whisperd" into jb-mr1-dev

    * commit '81c87e686a02ba27831bbdbfe6cad67b43b38069':
      Remove unnecessary whisperd

commit 07c8fd407ed176a84cc6680025dcc89c3b6e7e9e
Merge: 05d3bc3 09c5278
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Sep 17 14:55:03 2012 -0700

    am 09c5278a: am fcd8b77c: grouper: kernel prebuilt

    * commit '09c5278a7946c38b4b061f5d9941405add57cca1':
      grouper: kernel prebuilt

commit 47a91a2984b2aeb3003711fe06ae381088f82827
Merge: 81c87e6 ec43065
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 14:55:00 2012 -0700

    am ec43065f: Merge "auto-generated blob list" into jb-mr1-dev

    * commit 'ec43065f2b333121e6d5439cdf1bd8ee17886055':
      auto-generated blob list

commit 05d3bc3ecb4902900600c099ca29b41cb8254a67
Merge: 69b3f7b 42bd6eb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 14:53:40 2012 -0700

    am 42bd6ebb: am e14e5664: am 0bccc22e: am 7b1de318: Handle last batch of unknown files.

    * commit '42bd6ebb3a9b8943a95e785b12fb8a1c51bc9624':
      Handle last batch of unknown files.

commit 69b3f7b0da8acf890d08b4e10347d4519d7c2959
Merge: 61758ef 40b676e
Author: paris_yeh <paris_yeh@asus.com>
Date:   Mon Sep 17 14:44:20 2012 -0700

    am 40b676ed: am 814017c6: device: grouper: Synchornize button mapping and cleanup KBC layout

    * commit '40b676ed6c7f04a2bc751d98d939803a62f8ae7c':
      device: grouper: Synchornize button mapping and cleanup KBC layout

commit e45aeac120719c72c6c50f1db9ae66d9e8becc6f
Merge: 10b66af 0f5dbee
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 14:38:56 2012 -0700

    am 0f5dbee7: Merge "Remove unnecessary whisperd" into jb-mr1-dev

    * commit '0f5dbee7c80047c12c043c3e15f98412b38fe3d3':
      Remove unnecessary whisperd

commit 81c87e686a02ba27831bbdbfe6cad67b43b38069
Merge: 09c5278 0f5dbee
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 14:38:51 2012 -0700

    am 0f5dbee7: Merge "Remove unnecessary whisperd" into jb-mr1-dev

    * commit '0f5dbee7c80047c12c043c3e15f98412b38fe3d3':
      Remove unnecessary whisperd

commit 10b66aff6d8e1486242b6030633c33c36670af70
Merge: 4125e2f fcd8b77
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Sep 17 14:30:13 2012 -0700

    am fcd8b77c: grouper: kernel prebuilt

    * commit 'fcd8b77ccf889af36270a9cdb12a0ccd2d0fc51c':
      grouper: kernel prebuilt

commit 09c5278a7946c38b4b061f5d9941405add57cca1
Merge: 42bd6eb fcd8b77
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Sep 17 14:29:59 2012 -0700

    am fcd8b77c: grouper: kernel prebuilt

    * commit 'fcd8b77ccf889af36270a9cdb12a0ccd2d0fc51c':
      grouper: kernel prebuilt

commit 61758efa958b945196ead24d7b8712cacffb2de0
Merge: e814f1b 82c5698
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 17 12:46:52 2012 -0700

    am 82c56985: am 8a643c52: grouper: update prebuilt kernel

    * commit '82c56985d92bd0ee54a9978c55b4401a7f68b1f0':
      grouper: update prebuilt kernel

commit 4125e2f7daf0bdfb85c2338f2ec3c2d8ddfffece
Merge: 6fd3e04 e14e566
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 12:10:24 2012 -0700

    am e14e5664: am 0bccc22e: am 7b1de318: Handle last batch of unknown files.

    * commit 'e14e56646a11b0f68703287daf499d2486d55ec1':
      Handle last batch of unknown files.

commit 42bd6ebb3a9b8943a95e785b12fb8a1c51bc9624
Merge: 40b676e e14e566
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 17 12:10:17 2012 -0700

    am e14e5664: am 0bccc22e: am 7b1de318: Handle last batch of unknown files.

    * commit 'e14e56646a11b0f68703287daf499d2486d55ec1':
      Handle last batch of unknown files.

commit 40b676ed6c7f04a2bc751d98d939803a62f8ae7c
Merge: 82c5698 814017c
Author: paris_yeh <paris_yeh@asus.com>
Date:   Sun Sep 16 11:28:36 2012 -0700

    am 814017c6: device: grouper: Synchornize button mapping and cleanup KBC layout

    * commit '814017c68c79a3cb6ab85d8c6c1144020a037f00':
      device: grouper: Synchornize button mapping and cleanup KBC layout

commit 6fd3e04d0e29934411dd00f68c66489d7dac238f
Merge: fb23de1 814017c
Author: paris_yeh <paris_yeh@asus.com>
Date:   Sun Sep 16 11:27:56 2012 -0700

    am 814017c6: device: grouper: Synchornize button mapping and cleanup KBC layout

    * commit '814017c68c79a3cb6ab85d8c6c1144020a037f00':
      device: grouper: Synchornize button mapping and cleanup KBC layout

commit fb23de1ba9fc04b54826bc2b663a85e64fce7418
Merge: 5bf7147 8a643c5
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Sat Sep 15 16:11:39 2012 -0700

    am 8a643c52: grouper: update prebuilt kernel

    * commit '8a643c528cf6060988fb1d2bf5b68ad2af829cee':
      grouper: update prebuilt kernel

commit 82c56985d92bd0ee54a9978c55b4401a7f68b1f0
Merge: a637be8 8a643c5
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Sat Sep 15 16:11:13 2012 -0700

    am 8a643c52: grouper: update prebuilt kernel

    * commit '8a643c528cf6060988fb1d2bf5b68ad2af829cee':
      grouper: update prebuilt kernel

commit e814f1b3b25d3640a83f597db9ecfe6193f600a7
Merge: 79e4577 a637be8
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 13 14:11:28 2012 -0700

    am a637be81: am 24069e8f: Merge "One more legacy symlink." into jb-mr1-dev

    * commit 'a637be81b4be6397c478e91c938f2c1439d23aa4':
      One more legacy symlink.

commit 5bf7147165abe90d20436c6128ff7da75ac4af72
Merge: bf75faa 24069e8
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 13 02:35:36 2012 -0700

    am 24069e8f: Merge "One more legacy symlink." into jb-mr1-dev

    * commit '24069e8f8b083e8edb815e082094788207f6cb79':
      One more legacy symlink.

commit a637be81b4be6397c478e91c938f2c1439d23aa4
Merge: a2aa7fa 24069e8
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 13 02:35:32 2012 -0700

    am 24069e8f: Merge "One more legacy symlink." into jb-mr1-dev

    * commit '24069e8f8b083e8edb815e082094788207f6cb79':
      One more legacy symlink.

commit 79e45775dfc8f91367765b1db1dd64c6437f2f0e
Merge: 84ff5ad a2aa7fa
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 16:59:20 2012 -0700

    am a2aa7fad: (-s ours) am 2911b30b: am d6a454c0: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'a2aa7fadb683658443339ea7a5090a510d3d18a2':
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel

commit 84ff5ade77944e1545949d3d1e1bd5baf0846af1
Merge: 19734c4 30a7fd0
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 16:58:50 2012 -0700

    am 30a7fd00: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '30a7fd008eb5b5f166467a1b41a9ce74bcc6e05c':

commit 19734c4ef031a210dbcae82584c59e8d8a32ab78
Merge: 71cdf7e 2ed4bbf
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Sep 12 16:58:27 2012 -0700

    am 2ed4bbf3: am 8100525e: Include user identifier in external storage paths.

    * commit '2ed4bbf366e137838fc79f529e3e2a61a66d16fa':
      Include user identifier in external storage paths.

commit 71cdf7ebc0053f6600721ef20c5c4b7870747c1d
Merge: 19e902a ddb219d
Author: Amith Yamasani <yamasani@google.com>
Date:   Wed Sep 12 15:13:48 2012 -0700

    am ddb219dd: am 11e792a5: Maximum of 8 users on this device

    * commit 'ddb219ddc5c653879a2f361357e7705e2f91aff5':
      Maximum of 8 users on this device

commit 19e902a26af5b6d15d4e036f283b98debf627f18
Merge: 5dd9e09 47a67d5
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 12 13:17:47 2012 -0700

    am 47a67d55: am cde60be1: am 682b12ff: (-s ours) am 52da3d45: grouper bach: update prebuilt kernel

    * commit '47a67d55d61933ac3034f700572633371e03e9a6':
      grouper bach: update prebuilt kernel

commit 5dd9e09e339c5e9f5d358d58345c1579557f21be
Merge: 51d0418 ba95c19
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 12 13:17:46 2012 -0700

    am ba95c199: am 73a4f162: grouper: update prebuilt kernel

    * commit 'ba95c1991af0c28cc3fc88897fecc83935a0e05c':
      grouper: update prebuilt kernel

commit bf75faa3aced2bc57c5edabb982a8d1e743f7346
Merge: 702120d 2911b30
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 07:54:25 2012 -0700

    am 2911b30b: (-s ours) am d6a454c0: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '2911b30bde9271141abe826608571100182028f7':
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel

commit a2aa7fadb683658443339ea7a5090a510d3d18a2
Merge: 30a7fd0 2911b30
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 07:53:56 2012 -0700

    am 2911b30b: am d6a454c0: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '2911b30bde9271141abe826608571100182028f7':
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel

commit 30a7fd008eb5b5f166467a1b41a9ce74bcc6e05c
Merge: 2ed4bbf df5ae34
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 07:39:58 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I53d33d05d68eb8a786816414470b1a144d41ca5c

commit 702120dd3993833ff7c0d67eec72cdc04a07f913
Merge: 8954699 8100525
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Tue Sep 11 23:40:37 2012 -0700

    am 8100525e: Include user identifier in external storage paths.

    * commit '8100525e25b18ecc883544ffd438c0b3efcc7ba3':
      Include user identifier in external storage paths.

commit 2ed4bbf366e137838fc79f529e3e2a61a66d16fa
Merge: ddb219d 8100525
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Tue Sep 11 23:40:16 2012 -0700

    am 8100525e: Include user identifier in external storage paths.

    * commit '8100525e25b18ecc883544ffd438c0b3efcc7ba3':
      Include user identifier in external storage paths.

commit 8954699f4ae5d234467544e898bf028431728faf
Merge: 9cb1089 11e792a
Author: Amith Yamasani <yamasani@google.com>
Date:   Tue Sep 11 11:09:55 2012 -0700

    am 11e792a5: Maximum of 8 users on this device

    * commit '11e792a57db98f5746bf0c6ccd740f75c88de628':
      Maximum of 8 users on this device

commit ddb219ddc5c653879a2f361357e7705e2f91aff5
Merge: 47a67d5 11e792a
Author: Amith Yamasani <yamasani@google.com>
Date:   Tue Sep 11 11:09:50 2012 -0700

    am 11e792a5: Maximum of 8 users on this device

    * commit '11e792a57db98f5746bf0c6ccd740f75c88de628':
      Maximum of 8 users on this device

commit 47a67d55d61933ac3034f700572633371e03e9a6
Merge: ba95c19 cde60be
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 11 07:44:44 2012 -0700

    am cde60be1: am 682b12ff: (-s ours) am 52da3d45: grouper bach: update prebuilt kernel

    * commit 'cde60be1fe50d398119d337fcd0f94028a8fcbf6':
      grouper bach: update prebuilt kernel

commit 9cb1089b6c17843060f87010ee67e4924aff76f2
Merge: 53de51f cde60be
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 11 07:44:32 2012 -0700

    am cde60be1: am 682b12ff: (-s ours) am 52da3d45: grouper bach: update prebuilt kernel

    * commit 'cde60be1fe50d398119d337fcd0f94028a8fcbf6':
      grouper bach: update prebuilt kernel

commit ba95c1991af0c28cc3fc88897fecc83935a0e05c
Merge: 7cd21d9 73a4f16
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 11 07:43:20 2012 -0700

    am 73a4f162: grouper: update prebuilt kernel

    * commit '73a4f1627a89732bd992fbf10d31098c50e0355c':
      grouper: update prebuilt kernel

commit 53de51fd99befce28a126e18fccca37a7b3f0395
Merge: f2cf8f4 73a4f16
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 11 07:43:08 2012 -0700

    am 73a4f162: grouper: update prebuilt kernel

    * commit '73a4f1627a89732bd992fbf10d31098c50e0355c':
      grouper: update prebuilt kernel

commit 51d0418d9a4c4d1834bc7017fa31360fca536b68
Merge: 6799d36 7cd21d9
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 10 17:16:07 2012 -0700

    am 7cd21d9b: am 0613353f: am f56386a0: (-s ours) am cacdd39e: grouper: update prebuilt kernel

    * commit '7cd21d9b9383c35e2d63f9db7f095e063367b5a4':
      grouper: update prebuilt kernel

commit 6799d36f322c20e197f140a1196bdf59050c692f
Merge: 84265fa abb9d0f
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 10 17:14:03 2012 -0700

    am abb9d0fa: am bc5583c5: Audio: fix incorrect routing path.

    * commit 'abb9d0fa34679d15cffa9661d4ce230f9624979b':
      Audio: fix incorrect routing path.

commit 84265fad6f73c0ee70c3bc4820b3d393d75b50ad
Merge: 97ef31b 51ad082
Author: Glenn Kasten <gkasten@google.com>
Date:   Mon Sep 10 17:10:58 2012 -0700

    am 51ad0825: am 320d01fb: Nakasi 512 frames per HAL output buffer

    * commit '51ad082591aa49cb510833209647db96ad702cb8':
      Nakasi 512 frames per HAL output buffer

commit 97ef31b2c605543af23d5e57a8a74229ab8e34e8
Merge: 04e2b49 47052a6
Author: Matthew Xie <mattx@google.com>
Date:   Mon Sep 10 17:09:49 2012 -0700

    am 47052a6a: am a739546a: Merge "Enable hid host and do clean TURN_ON" into jb-mr1-dev

    * commit '47052a6af3cf6113d9d50d8bc0bed1a6a6f5940e':
      Enable hid host and do clean TURN_ON

commit 04e2b4904bd45d6d92fa4246d2f902b00f547594
Merge: b0b7818 b09e357
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 10 17:08:45 2012 -0700

    am b09e3577: am cf46a6cb: am 53555d79: (-s ours) am 03d108e7: grouper: update prebuilt kernel

    * commit 'b09e357730d9ea912a5256e8db4bae756dfce403':
      grouper: update prebuilt kernel

commit b0b7818a324c3aa5731c4b6be6458b20601445ae
Merge: 1fc69ea 5810b79
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 10 17:07:44 2012 -0700

    am 5810b79d: (-s ours) am 41658a5e: am 36a4b0cc: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '5810b79d595101289934e72a10b66c051f52dfa2':
      grouper: update prebuilt kernel
      update bootloader to 3.39

commit 1fc69eab318cb4359f4b1dbcaa1d953196802013
Merge: f256aeb 1b12f9a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 10 17:07:18 2012 -0700

    am 1b12f9a0: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '1b12f9a0dba6bebf12ea9f2bcc1e70afccf39823':
      Bring back ADB_EXTERNAL_STORAGE.
      grouper: update prebuilt kernel

commit f256aeb43a67df27862efa724f0f521733008b06
Merge: ea2d753 18883e5
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 10 17:07:08 2012 -0700

    am 18883e56: am b02f3f83: Merge "auto-generated blob list" into jb-mr1-dev

    * commit '18883e56e094f925e5989a0da28fdba55ec43578':
      auto-generated blob list

commit ea2d75350a4eb8e8088c4421236518ad6016f051
Merge: ed73899 b3531a6
Author: Eric Laurent <elaurent@google.com>
Date:   Mon Sep 10 17:07:00 2012 -0700

    am b3531a64: am bd1f82a5: audio: changes for new audio device enums

    * commit 'b3531a64ac569c1036cd850f83d6c65338a2f282':
      audio: changes for new audio device enums

commit f2cf8f4281d15a8b902c8dc0424725160e6d046c
Merge: 53fea06 0613353
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 10 14:41:31 2012 -0700

    am 0613353f: am f56386a0: (-s ours) am cacdd39e: grouper: update prebuilt kernel

    * commit '0613353f3adb0dbfc30e3bb4e2789145d13846bd':
      grouper: update prebuilt kernel

commit 7cd21d9b9383c35e2d63f9db7f095e063367b5a4
Merge: abb9d0f 0613353
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 10 14:41:25 2012 -0700

    am 0613353f: am f56386a0: (-s ours) am cacdd39e: grouper: update prebuilt kernel

    * commit '0613353f3adb0dbfc30e3bb4e2789145d13846bd':
      grouper: update prebuilt kernel

commit ed738990fb07862bb4cf882fa967c338c7279f71
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Sep 10 12:02:52 2012 -0700

    auto-generated blob list

    Bug: 4295425
    Change-Id: Ifbe9fddc75d23c174ecac3a4d74094770e4c41e3

commit 53fea069316a1f92a24cadbd23082fbe2834e1f1
Merge: 358371a bc5583c
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 10 09:59:48 2012 -0700

    am bc5583c5: Audio: fix incorrect routing path.

    * commit 'bc5583c5f01457d36a06cfc72095cf85b2a6dea9':
      Audio: fix incorrect routing path.

commit abb9d0fa34679d15cffa9661d4ce230f9624979b
Merge: 51ad082 bc5583c
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Sep 10 09:59:42 2012 -0700

    am bc5583c5: Audio: fix incorrect routing path.

    * commit 'bc5583c5f01457d36a06cfc72095cf85b2a6dea9':
      Audio: fix incorrect routing path.

commit 358371a56b0ade37d8d2e3e3ebaeb940a96801af
Merge: 4d81b18 320d01f
Author: Glenn Kasten <gkasten@google.com>
Date:   Sun Sep 9 10:12:20 2012 -0700

    am 320d01fb: Nakasi 512 frames per HAL output buffer

    * commit '320d01fb21582417ad20e37455c92fbb04dd630f':
      Nakasi 512 frames per HAL output buffer

commit 51ad082591aa49cb510833209647db96ad702cb8
Merge: 47052a6 320d01f
Author: Glenn Kasten <gkasten@google.com>
Date:   Sun Sep 9 10:12:16 2012 -0700

    am 320d01fb: Nakasi 512 frames per HAL output buffer

    * commit '320d01fb21582417ad20e37455c92fbb04dd630f':
      Nakasi 512 frames per HAL output buffer

commit 4d81b18b5993b9145192e7f9833cbcac5f6ab930
Merge: 01becf0 a739546
Author: Matthew Xie <mattx@google.com>
Date:   Fri Sep 7 19:05:15 2012 -0700

    am a739546a: Merge "Enable hid host and do clean TURN_ON" into jb-mr1-dev

    * commit 'a739546ae070647f7781ac88eb51ee12f23670b5':
      Enable hid host and do clean TURN_ON

commit 47052a6af3cf6113d9d50d8bc0bed1a6a6f5940e
Merge: b09e357 a739546
Author: Matthew Xie <mattx@google.com>
Date:   Fri Sep 7 19:05:05 2012 -0700

    am a739546a: Merge "Enable hid host and do clean TURN_ON" into jb-mr1-dev

    * commit 'a739546ae070647f7781ac88eb51ee12f23670b5':
      Enable hid host and do clean TURN_ON

commit 01becf093fc2e5d0a293dee48ef9acce10a5b37e
Merge: 454139c cf46a6c
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Sep 7 16:44:51 2012 -0700

    am cf46a6cb: am 53555d79: (-s ours) am 03d108e7: grouper: update prebuilt kernel

    * commit 'cf46a6cb62d9c071c3a24e5bdab78fa09817a5aa':
      grouper: update prebuilt kernel

commit 454139cbe2ed3578f7dbfac5f8c10a8a7684022c
Merge: 1e2fd97 41658a5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 7 16:43:45 2012 -0700

    am 41658a5e: (-s ours) am 36a4b0cc: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '41658a5ed7c8a0a105669b8bbf14673ba157ab4b':
      grouper: update prebuilt kernel
      update bootloader to 3.39

commit 1e2fd9789b98cb84f76fc9fb653f69cd04aec2d7
Merge: 7f1fdc7 b02f3f8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 7 16:43:28 2012 -0700

    am b02f3f83: Merge "auto-generated blob list" into jb-mr1-dev

    * commit 'b02f3f83efa69d4d376dfd7e65e6cba3b3cfd31c':
      auto-generated blob list

commit 7f1fdc729cf56f8a65facd379e1e255136021067
Merge: b27303e bd1f82a
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Sep 7 16:43:21 2012 -0700

    am bd1f82a5: audio: changes for new audio device enums

    * commit 'bd1f82a5ce025eba19253eca1cbc8cf7d014f5e6':
      audio: changes for new audio device enums

commit b09e357730d9ea912a5256e8db4bae756dfce403
Merge: 5810b79 cf46a6c
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Sep 7 16:22:48 2012 -0700

    am cf46a6cb: am 53555d79: (-s ours) am 03d108e7: grouper: update prebuilt kernel

    * commit 'cf46a6cb62d9c071c3a24e5bdab78fa09817a5aa':
      grouper: update prebuilt kernel

commit 5810b79d595101289934e72a10b66c051f52dfa2
Merge: 1b12f9a 41658a5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 7 15:24:10 2012 -0700

    am 41658a5e: am 36a4b0cc: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '41658a5ed7c8a0a105669b8bbf14673ba157ab4b':
      grouper: update prebuilt kernel
      update bootloader to 3.39

commit 1b12f9a0dba6bebf12ea9f2bcc1e70afccf39823
Merge: 18883e5 7662cd1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 7 15:03:43 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ic71d2bb392e185253e84086caa51bd3e243c82c2

commit 18883e56e094f925e5989a0da28fdba55ec43578
Merge: b3531a6 b02f3f8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 7 15:00:11 2012 -0700

    am b02f3f83: Merge "auto-generated blob list" into jb-mr1-dev

    * commit 'b02f3f83efa69d4d376dfd7e65e6cba3b3cfd31c':
      auto-generated blob list

commit b3531a64ac569c1036cd850f83d6c65338a2f282
Merge: 4f13758 bd1f82a
Author: Eric Laurent <elaurent@google.com>
Date:   Fri Sep 7 14:56:49 2012 -0700

    am bd1f82a5: audio: changes for new audio device enums

    * commit 'bd1f82a5ce025eba19253eca1cbc8cf7d014f5e6':
      audio: changes for new audio device enums

commit b27303e9ff4e0748bdc35e9e50a4e57efc4c8974
Merge: 4121f9c 274f6d7
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Fri Sep 7 13:42:51 2012 -0700

    am 274f6d7a: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev

    * commit '274f6d7a3ee15c96be7f0cb6903d21c574379653':
      Bring back ADB_EXTERNAL_STORAGE.

commit 4121f9c8ab0e6e624849d992fb306ad01ce813fd
Merge: b4d437e 8bfe1ce
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Sep 7 13:42:36 2012 -0700

    am 8bfe1cec: grouper: update prebuilt kernel

    * commit '8bfe1cec648b6ad6f4abba262b141c4122289e28':
      grouper: update prebuilt kernel

commit b4d437e8102eeed4fcc86973392e536d8a4ed799
Merge: f559197 a2aa450
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 7 13:41:14 2012 -0700

    am a2aa4506: (-s ours) am 4f5ceb88: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'a2aa4506be16cb816b9a49419e41cfa42d71794d':
      grouper: update prebuilt kernel DO NOT MERGE
      grouper: update prebuilt kernel
      bootloader: nakasi: subject bootloader version to 3.38.

commit ea2a6c1a9c02776342fe63a8a8e2e94752bdaa2a
Merge: 37a18d8 4f13758
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 6 13:24:11 2012 -0700

    am 4f137585: am 274f6d7a: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev

    * commit '4f1375859af878320d577f4868b64b3f2850afe3':
      Bring back ADB_EXTERNAL_STORAGE.

commit 4f1375859af878320d577f4868b64b3f2850afe3
Merge: 9db3f06 274f6d7
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Sep 6 13:21:55 2012 -0700

    am 274f6d7a: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev

    * commit '274f6d7a3ee15c96be7f0cb6903d21c574379653':
      Bring back ADB_EXTERNAL_STORAGE.

commit 37a18d851d1a69092a379e2e1a32f0a878fde318
Merge: 07fff61 9db3f06
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Sep 6 12:01:11 2012 -0700

    am 9db3f068: am 8bfe1cec: grouper: update prebuilt kernel

    * commit '9db3f068b46cab80e1ce5814bee6b8cf2ac24e21':
      grouper: update prebuilt kernel

commit 9db3f068b46cab80e1ce5814bee6b8cf2ac24e21
Merge: 471ea9d 8bfe1ce
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Sep 6 11:59:57 2012 -0700

    am 8bfe1cec: grouper: update prebuilt kernel

    * commit '8bfe1cec648b6ad6f4abba262b141c4122289e28':
      grouper: update prebuilt kernel

commit 07fff61f15ce251d8c902b13946463d01a461d5e
Merge: 0bf7ef5 471ea9d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:19:39 2012 -0700

    am 471ea9d8: (-s ours) am a2aa4506: am 4f5ceb88: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '471ea9d810a4656c9007386ccce6958e636f29f6':
      grouper: update prebuilt kernel DO NOT MERGE
      grouper: update prebuilt kernel
      bootloader: nakasi: subject bootloader version to 3.38.

commit 471ea9d810a4656c9007386ccce6958e636f29f6
Merge: d63132a a2aa450
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:16:00 2012 -0700

    am a2aa4506: am 4f5ceb88: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'a2aa4506be16cb816b9a49419e41cfa42d71794d':
      grouper: update prebuilt kernel DO NOT MERGE
      grouper: update prebuilt kernel
      bootloader: nakasi: subject bootloader version to 3.38.

commit 0bf7ef522bca7ec7fd64afa03446fb3c03e8e706
Merge: c310afd d63132a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:12:36 2012 -0700

    am d63132a2: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'd63132a26f10640c0b31f3201b3b4cca4860062c':
      grouper: update prebuilt kernel
      grouper: update prebuilt kernel

commit d63132a26f10640c0b31f3201b3b4cca4860062c
Merge: f559197 5049341
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 07:53:05 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I1d9e98aa5bcf74cd5dbd51f2a06bcecc6bef03a7

commit c310afd8359384b5df80a98ab8d14b0db58acadf
Merge: 1662221 f559197
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Sep 5 18:08:07 2012 -0700

    am f5591976: Merge "Remove /sdcard hack for shell users." into jb-mr1-dev

    * commit 'f55919768d929344bb79b1d14e9e0f4e1149552e':
      Remove /sdcard hack for shell users.

commit 1662221aba5a90e91fec2a289939ceeb160d2c12
Merge: 85fe977 1c12322
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 5 16:36:44 2012 -0700

    am 1c12322b: am 6134d0fa: (-s ours) am f7b54024: grouper bach: update prebuilt kernel

    * commit '1c12322b7d1057637bd4caec417eff2183839eab':
      grouper bach: update prebuilt kernel

commit 85fe977a81989ff197f442ed28b7e756820960ce
Merge: ad31a2a 63640a2
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Sep 5 09:58:21 2012 -0700

    am 63640a27: grouper: update prebuilt kernel

    * commit '63640a27a37cd8c3697f0e7c9dbfcac7a17dc358':
      grouper: update prebuilt kernel

commit ad31a2aedf87d11913a9dd3af01425d292eba5ba
Merge: e37389f e7cbcc7
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 4 13:47:19 2012 -0700

    am e7cbcc70: (-s ours) am 854cabb9: (-s ours) am 6cce8d73: grouper bach: update prebuilt kernel DO NOT MERGE

    * commit 'e7cbcc70f2c95fe44edbc8811d58c942a1bcf1a6':
      grouper bach: update prebuilt kernel DO NOT MERGE

commit e37389feb9192fe5473ab33aeefdbb5c6e3573e0
Merge: 1615a21 61ac771
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 4 10:05:03 2012 -0700

    am 61ac7719: am 157d24b4: (-s ours) am 2e36d0f1: Merge "grouper: update prebuilt kernel" into jb-dev

    * commit '61ac77194c3bd9e0a8eef4a887335723bb3f0e06':
      grouper: update prebuilt kernel

commit 1615a21975ecdb990b778c355316a8f2630794d9
Merge: 28a8995 2131a67
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 4 10:01:37 2012 -0700

    am 2131a673: grouper: update prebuilt kernel

    * commit '2131a67357dff33a39f526e7f5a67f0fd8180a4f':
      grouper: update prebuilt kernel

commit 28a8995ebdd2dac9306eb09f212a44d4ab1450b9
Merge: 804830a e7cc596
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Sep 4 09:55:26 2012 -0700

    am e7cc596c: am 0c95e26c: resolved conflicts for merge of eda2a209 to jb-dev-plus-aosp

    * commit 'e7cc596c5ff4f171c4e8c2932b3789c2acf1c24c':
      update bootloader to 3.39

commit 804830ade9596aaf7156780273bfda887c41e5b1
Merge: ad38496 55c0116
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Aug 31 13:53:11 2012 -0700

    am 55c01160: am 2a3a7267: am 1b21e5e7: move grouper specific vars to device.mk

    * commit '55c01160984515c330eb5247baf5e17b50910810':
      move grouper specific vars to device.mk

commit ad38496ba4d55acf7eed926ce1c1b53cfc28be9c
Merge: e0e456f 045ba3d
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Aug 31 11:11:20 2012 -0700

    am 045ba3df: grouper: update prebuilt kernel

    * commit '045ba3dfc809dcee3c53045149ca15ffa32c28ba':
      grouper: update prebuilt kernel

commit e0e456f37fc2883967a84f899bdfd29d7169121b
Merge: e7a7442 1d31743
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Aug 31 09:22:47 2012 -0700

    am 1d317438: (-s ours) am 6a355e82: (-s ours) am bbbcb9b7: grouper: update prebuilt kernel DO NOT MERGE

    * commit '1d317438a7fa9aec44b6fc5778e2c28d1bca8b4c':
      grouper: update prebuilt kernel DO NOT MERGE

commit e7a74427d5b3ed434f5ccaf7536f3aa07e6d0efc
Merge: 68d7840 808be99
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Aug 30 13:33:59 2012 -0700

    am 808be99b: Merge "grouper: update prebuilt kernel" into jb-mr1-dev

    * commit '808be99b6d3b36f5ab03d277d076256ce6c72219':
      grouper: update prebuilt kernel

commit 68d7840a6be19ffd427eb15b84b0708699b830b2
Merge: 69384f8 efc670e
Author: Kenny Root <kroot@google.com>
Date:   Thu Aug 30 11:05:45 2012 -0700

    am efc670e1: Merge "make_ext4fs has moved to build/target/core.mk" into jb-mr1-dev

    * commit 'efc670e1244a52d7029e7a4596200849afe0f05f':
      make_ext4fs has moved to build/target/core.mk

commit 69384f8b64be62f7ab4d70d27258d9fbe63643d2
Merge: 94791c8 602db27
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Aug 30 10:53:53 2012 -0700

    am 602db275: audio: fix crash when starting capture

    * commit '602db275614c9ea17f4165f2814f301fcf0f85d0':
      audio: fix crash when starting capture

commit 94791c86285166c026d85c32b06e03007d357932
Merge: 685522f 3ee5b47
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Aug 30 10:22:53 2012 -0700

    am 3ee5b479: am 900929cd: am 507d12d5: Factory image for JZO54

    * commit '3ee5b47940f73d960da3afc95fde45ef5ca07f4a':
      Factory image for JZO54

commit 685522f0010e28138440b8a659ed69c9ac54a9b4
Merge: 2b342b5 d8f5405
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Aug 30 09:16:08 2012 -0700

    am d8f5405b: am 0ccf9b90: (-s ours) am 6bb9dec4: Merge "grouper: update prebuilt kernel" into jb-dev

    * commit 'd8f5405bbff4e7dd2aba90301a9e6d8d3ff64c67':
      grouper: update prebuilt kernel

commit 2b342b59cfdbd689cd0070b3b84a5a2eb3e2f38e
Merge: 21a4302 02eaf79
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Aug 30 09:09:48 2012 -0700

    am 02eaf79b: am 51ae8328: Merge commit \'392d0879\' into manualmerge

    * commit '02eaf79bfd7e38674fe96f070ac980e2652cd07c':
      bootloader: nakasi: subject bootloader version to 3.38.

commit 21a43025148a99c12bb879c439c0fc03bef4a09b
Merge: 3ff28ca 15e644d
Author: Eric Laurent <elaurent@google.com>
Date:   Tue Aug 28 13:02:34 2012 -0700

    am 15e644d9: Merge "audio: fix capture problem" into jb-mr1-dev

    * commit '15e644d97dfa2c26ce0e24f92e2c252ede344c25':
      audio: fix capture problem

commit 3ff28caaa80e9fbb242457d34b129561c01d856d
Merge: d23cf15 53f1e72
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Tue Aug 28 13:01:56 2012 -0700

    am 53f1e724: grouper: update prebuilt kernel

    * commit '53f1e72419848fc36c63e101a7b7e3b57483db0b':
      grouper: update prebuilt kernel

commit d23cf151d94cbc55a000c5ad054ba758213d23b6
Merge: 79b241b 0c5027b
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Aug 27 10:25:44 2012 -0700

    am 0c5027bb: more clean up .

    * commit '0c5027bb07843f4ab03165373a213fc9283ae38a':
      more clean up .

commit 79b241b071bc3e7854a7817a58b094e8c34be5b4
Merge: 035d480 03fbfd8
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Aug 24 14:19:22 2012 -0700

    am 03fbfd87: am b7606a7a: am bb3d107a: Refactor grouper build.

    * commit '03fbfd87a8f1f7817072c987e4e9f61ee560bf63':
      Refactor grouper build.

commit 035d480c3a2175573695c5a39c3b1e80eb99342c
Merge: b0c4c8a e478803
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Aug 23 19:31:55 2012 -0700

    am e4788033: grouper: update prebuilt kernel

    * commit 'e4788033fbff855494fcb852bafa97fef9da7280':
      grouper: update prebuilt kernel

commit b0c4c8a609f232232537b41bb651aaeca7e22de4
Merge: 0d0af3f 4db604d
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Aug 22 18:22:55 2012 -0700

    am 4db604da: Merge "Iteration on multi-user external storage." into jb-mr1-dev

    * commit '4db604da296a168ac9ea8c4dd2007c3cddda2002':
      Iteration on multi-user external storage.

commit 0d0af3fdcd15dc39a83734b0d7d60af6cca247e7
Merge: 6c11e3a cd738cd
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Aug 22 08:42:44 2012 -0700

    am cd738cd9: Clean up.

    * commit 'cd738cd9d2a63f4e5ed23e0efd90b4609b9f9db7':
      Clean up.

commit 6c11e3a53682a966c93f5808b57403ef1fc4dd0b
Merge: 84d099a 9728944
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Wed Aug 22 07:56:16 2012 -0700

    am 97289444: cleanup.

    * commit '972894442a7f16a4c2b4fd110ffe94065d619bd8':
      cleanup.

commit 84d099ad1cdfbb2cb23ddfc729dcb1bcae7effb4
Merge: 0073665 2c9956e
Author: Wink Saville <wink@google.com>
Date:   Mon Aug 20 20:26:08 2012 -0700

    am 2c9956ef: Add support for per device bluetooth configuration.

    * commit '2c9956ef4a1346c13b17fb03c40dc8faaec3ae23':
      Add support for per device bluetooth configuration.

commit 00736653ad5145961061251849561472b8bd982a
Merge: 9fb8933 db75eea
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Aug 20 20:17:06 2012 -0700

    am db75eea1: Fix.

    * commit 'db75eea121c7f4af1bf55f94a5396df349d19a43':
      Fix.

commit 9fb8933ac000c54d8d4a34b4538ad5f871c4f2ed
Merge: 31b66c9 519fa3d
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Aug 20 13:29:50 2012 -0700

    am 519fa3db: Merge "Refactor build for grouper." into jb-mr1-dev

    * commit '519fa3db18e8d324e11e9408432177e3f7d828fc':
      Refactor build for grouper.

commit 31b66c9293da1cd7afaebcb10120611a22ac94af
Merge: 124fcc1 e36ebc1
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Aug 20 13:20:01 2012 -0700

    am e36ebc1e: Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev

    * commit 'e36ebc1ed1991161bb89dea403f3d9b29111454e':
      Migrate sdcard0 to shell-accessible location.

commit 124fcc156a81273c9f598bcb6fa9f199e8de04e6
Merge: 8bfcb62 d5c95c9
Author: Ying Wang <wangying@google.com>
Date:   Mon Aug 20 12:52:56 2012 -0700

    am d5c95c9f: Remove android.software.live_wallpaper.xml from PRODUCT_COPY_FILES

    * commit 'd5c95c9f806f1d50500fb4b3db26176e7e1024e4':
      Remove android.software.live_wallpaper.xml from PRODUCT_COPY_FILES

commit 8bfcb6222e40cf0db32e94debd8a803027f043d8
Merge: 7342f21 efadcc9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:04:37 2012 -0700

    am efadcc97: (-s ours) am 59c5e0de: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'efadcc97b25302625869ae4beb954564849f862a':

commit 7342f218d69f0980cba9a694241294cf2fab5371
Merge: de13b1e c4c7f2d
Author: Mike Lockwood <lockwood@google.com>
Date:   Thu Aug 16 16:46:17 2012 -0700

    am c4c7f2d1: (-s ours) am b1af8881: (-s ours) am 83b58136: New prebuilt kernel DO NOT MERGE

    * commit 'c4c7f2d1da2f91035c2a343526223fda5b341838':
      New prebuilt kernel DO NOT MERGE

commit de13b1e316cc79b72c64884dd09e684ecd00c62c
Merge: f4fbd38 0c4817a
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Aug 16 14:37:57 2012 -0700

    am 0c4817ae: Merge "Multi-user external storage support." into jb-mr1-dev

    * commit '0c4817aea73b8c2d7a69493461e18587a9a9f43f':
      Multi-user external storage support.

commit f4fbd38e3b2101017a7c7552dc356b1e95670af0
Merge: 38c520c c681cd4
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Aug 13 17:10:45 2012 -0700

    am c681cd4d: Merge "Specify destination sdcard mount point." into jb-mr1-dev

    * commit 'c681cd4d2a87a82a90c5901e7386637967858fb0':
      Specify destination sdcard mount point.

commit 38c520cd306ccfe453299917375fb1473269321c
Merge: 7ea7cc6 13b00d3
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Aug 13 14:26:55 2012 -0700

    am 13b00d31: grouper: update prebuilt kernel

    * commit '13b00d31ddee146ec36056f5b3d0aaf5c0d86167':
      grouper: update prebuilt kernel

commit 7ea7cc61b29b7410280854c345050a0914a64373
Merge: 1eea9d1 8d55fe1
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Aug 13 09:58:57 2012 -0700

    am 8d55fe12: Merge "Modified the RF setting." into jb-mr1-dev

    * commit '8d55fe125c40128ebce66c1826d4904704358f8d':
      Modified the RF setting.

commit 1eea9d102755c13ee694c87ab67d18f5651ee122
Merge: 582cc63 66b6122
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Mon Aug 13 09:50:14 2012 -0700

    am 66b61226: Merge "Audio: Support audio dock." into jb-mr1-dev

    * commit '66b612262202535374774786682f57f3523c6c99':
      Audio: Support audio dock.

commit 582cc636f37026ae1b87682cdd1ac0e3fb33a0d0
Merge: 9ef2cdb 8f43156
Author: Nick Pelly <npelly@google.com>
Date:   Fri Aug 10 15:07:21 2012 -0700

    am 8f431561: Merge "Update config.xml overlay for new key config_overlay_locationProviderPackageNames" into jb-mr1-dev

    * commit '8f431561e7b7f80fee43a4f32e6143c7c6b7b646':
      Update config.xml overlay for new key config_overlay_locationProviderPackageNames

commit 9ef2cdb31bfb89c931726fe8961ffdb4dc0c09eb
Merge: 802d250 d7fa3a5
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Fri Aug 10 09:25:14 2012 -0700

    am d7fa3a5d: grouper: update prebuilt kernel

    * commit 'd7fa3a5d4da2807079cf3cfab1f2dd4116dd545a':
      grouper: update prebuilt kernel

commit 802d250d18efbdcc25891e443af658456d0122a3
Merge: 9a2e860 cee8301
Author: Ramanan Rajeswaran <ramanan@google.com>
Date:   Thu Aug 9 12:42:36 2012 -0700

    am cee8301f: am aa971673: am e56eff83: Move grouper specific vars into BoardConfig.

    * commit 'cee8301f6abf6fc67ddbf07f52e6e8d0476c1fe7':
      Move grouper specific vars into BoardConfig.

commit 9a2e8604a81ed55a6069b1fbaa0aee1ecbe50164
Merge: e61688a ecd3e61
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 15:22:56 2012 -0700

    am ecd3e610: (-s ours) am facb300f: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit 'ecd3e6103171080bc0d03d1b9fe7a6bba9c81b75':

Change-Id: I8ad4cc878042078f769b3f68c5ddc58f14b065e6