commit 9da0db97dd4960ca6e0fbb0e6e96179bda43f3fb
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Aug 10 20:14:06 2013 -0700

    libc: Use the fast strlen on Scorpion too
    
    Change-Id: I9ba50a469de27269adc008c2a96767830ad6b70b

commit 456c0e8cbe4ed2da25317e8e46ed327a14fbeb1c
Author: Will Newton <will.newton@linaro.org>
Date:   Mon Jul 1 11:15:27 2013 +0100

    Bionic: Add AOSP master cortex optimizations
    
    libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
    
    This memcpy code uses NEON/VFP to achieve very good performance
    on ARMv7-A processors. It is specifically tuned for A15 but should
    provide good performance on A9 also. It is equivalent to the code
    in cortex-strings rev 116.
    
    This patch is a follow up the existing gerrit change:
    
    I7f6f77995f3ca903ad9c66d14261441667a2a935
    
    But this version includes a tweak for performance on misaligned
    buffers.
    
    Change-Id: I285abac0068f8ae29a1cbf7862ea8590aadaf0a7
    Signed-off-by: Will Newton <will.newton@linaro.org>
    
    libc/arch-arm/bionic/memcpy.a9.S: memcpy from cortex-strings.
    
    This memcpy code uses NEON/VFP to achieve very good performance
    on ARMv7-A processors. It is specifically tuned for A15 but should
    provide good performance on A9 also. It is equivalent to the code
    in cortex-strings rev 116.
    
    This patch is a follow up the existing gerrit change:
    
    I7f6f77995f3ca903ad9c66d14261441667a2a935
    
    This version includes a tweak for performance on misaligned
    buffers and splits the header comment into license and
    documentation sections.
    
    Change-Id: Ibd2e23c8d8e01357ba0247be1d05192de3ceba69
    Signed-off-by: Will Newton <will.newton@linaro.org>
    
    Add new optimized strlen for arm.
    
    This optimized version is primarily targeted at cortex-a15.
    
    Tested on all nexus devices using the system/extras/libc_test strlen test.
    Tested alignments from 1 to 32 that are powers of 2.
    Tested that strlen does not cross page boundaries at all alignments.
    
    Speed improvements listed below:
    
    cortex-a15
    - Sizes >= 32 bytes, ~75% improvement.
    - Sizes >= 1024 bytes, ~250% improvement.
    
    cortex-a9
    - Sizes >= 32 bytes, ~75% improvement.
    - Sizes >= 1024 bytes, ~85% improvement.
    
    krait
    - Sizes >= 32 bytes, ~95% improvement.
    - Sizes >= 1024 bytes, ~160% improvement.
    
    Merge from internal master.
    
    (cherry-picked from 2fc071797743b88a9a47427d46baed7c7b24f4d2)
    
    Change-Id: I1ceceb4e745fd68e9d946f96d1d42e0cdaff6ccf
    
    Conflicts:
    	libc/arch-arm/generic/generic.mk
    	libc/arch-arm/krait/krait.mk
    
    libgcc_compat: Introduce __aeabi_lasr for cortex-a9 and higher
    
    This is needed when passing -mcpu=cortex-a9 or higher on a modern
    toolchain for prebuilt library compatibility
    
    Change-Id: I73eb2393377914ae26216a8c2828ad973d1c1225
commit 64405b156f7fe9501f7436cb875cbc935bdc9e10
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Aug 10 21:02:09 2013 -0700

    envsetup: Fix giant derp
    
    Change-Id: I490556f18c40c3614e4e554d7db3306a16ff99d8
commit dc50cc274d293680cc20d56b67939ea4485f465c
Merge: f19b479 526ad9d
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun Aug 11 11:49:47 2013 +0000

    Merge "Fix fetching icons from packages." into cm-10.2

commit 526ad9d13eadfc7ae9dce70b83582811892559ab
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun Aug 11 13:47:42 2013 +0200

    Fix fetching icons from packages.
    
    Change-Id: I857d35bb601425be56b5eb730d63344e1173e4a2

commit f19b4790666cb22190d8e75318e252f0e858ce70
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Sun Aug 11 12:20:19 2013 +0200

    Core: Update German translation
    
    Change-Id: Ib7f25bb48de3eb33eeefd07a0e1ff493fbe68b80

commit 9ba26950270975157cad1126e5474ee4c9ddc518
Author: Marco Brohet <therbom@gmail.com>
Date:   Sun Aug 11 09:50:25 2013 +0000

    Revert "SystemUI & core: FI translations"
    
    Derp
    
    This reverts commit 4fc0d45650edce7b673153ad1ae17dc8b90ec1b1.
    
    Change-Id: I81ebe10eba1d2f659e98678918db6e5cec42eb63

commit 14d2be6b6e19ddd12d32066d98e70e41088ce3fd
Author: dhacker29 <davidhackerdvm@gmail.com>
Date:   Sat Aug 10 17:37:06 2013 -0500

    Fix mismerge of implement 1% battery on select devices
    
    Change-Id: I2dcafba2c39f50cf435b90ca261b325c10fd5b6b
commit 91e6990e1b42d2a7716e97ef5ec9d1c1896c19d1
Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Sat Aug 10 22:08:52 2013 +0300

    CMFM: EL translations
    
    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
    
    Change-Id: I297c8f025ddf5be43855bd4c7ba2d42515e99046
commit c24571ea095b28196fd4b8db7a0eca4c60768018
Merge: 79de35e 517d637
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun Aug 11 11:36:34 2013 +0000

    Merge "LockClock: DE translations" into cm-10.2
commit d5a70ad5ad4fc310a8926c1fdb352f74b6234f69
Author: Danny Baumann <dannybaumann@web.de>
Date:   Sun Aug 11 12:41:35 2013 +0200

    Avoid NPE if icon assignment failed for whatever reason.
    
    Change-Id: Iba4188d6b42179008154b8cbcbb14c36a22669de
commit be0df81b342b36d5ae0234440c9d8d932383ef7c
Author: jackmu95 <jacob.mueller.elz@gmail.com>
Date:   Sun Aug 11 12:13:05 2013 +0200

    VoicePlus: German translation
    
    Change-Id: I55314e73b5cfce60a31be9c6f5defd004d98ac21