===================================
Since Thu Aug 29 00:24:55 UTC 2013
===================================

   * frameworks/base
f9e4ad6 PackageManager: allow build-time disabling of components
39e05c7 Merge "PowerWidget: Dismiss unsecure keyguard on long tap" into cm-10.1
3f64f62 PowerWidget: Dismiss unsecure keyguard on long tap
2e54d5d QS: Unlock screen when tap profile tile

   * libcore
ebe07a6 Apply a variation of the suggested app-level patch to SecureRandom

   * packages/apps/Apollo
edc0a1e Allow opening audio from any content provider, not only the media provider.
ef0637f Apollo: Prevent FC in cache initialization

   * packages/apps/Calculator
9ea090e Calculator: Prevent pasting in TextView in lockscreen widget
e50e4de Calculator: Fix bin and hex modes and improve logic

   * packages/apps/Camera
3041ad0 Camera: Reuse the ScreenNail's SurfaceTexture

   * packages/apps/Gallery2
189df67 Gallery: Fix logic typo
ca78969 Gallery: Prevent display "Show on map" menu if no geo view is present

   * packages/apps/LockClock
5e3a6c1 Merge "cLock: Listen for ACTION_ALARM_CHANGED" into cm-10.1
8d230af cLock: Listen for ACTION_ALARM_CHANGED

   * packages/apps/Mms
bc514c7 Don't show quick message popup over secure lockscreen.
55bf34c Mms: findPart may still be null

   * packages/apps/Phone
1f6962b Fix ringer not stopping when call is blacklisted.

   * packages/apps/Settings
e875f66 Merge "Settings: Change NB translation for Launcher" into cm-10.1

   * vendor/cm
2fba8eb 10.1.3-RC2
e116c60 Bump version for 10.1.3-RC1
b8f7758 add Kindle Fire contributor
8b9f177 Use Package Manager to disable stock OTA
eb7754a otablock: also disable BroadcastReceiver
5bdc735 Revert "otablock: Disable only the actual activity, leave the service on"
22a4354 otablock: Disable only the actual activity, leave the service on

   * vendor/sony
00dd2b0 blue: update prop for newer ion api
b3b881c blue/fusion3: remove anc firmware

===================================
Since Wed Aug 29 09:20:29 UTC 2012
===================================

   * android
1e26a86 Add 10.1.3-RC1 manifest
cfa5271 Add VoicePlus
4af61e1 Add Babel dependencies
6066e99 add gson
72881a8 Add 10.1.2 manifest
a7d5a14 Add 10.1.1 manifest
496f6b3 Add NTFS-3g, FUSE and exFAT repositories
7b2a851 10.1.0.x: Bump otter(2) to 10.1.0.2
06d00ac 10.1.0.x: Add p760 maint release
e9c7f7c Bump d2vzw again
b83f18b Bump d2vzw release to 10.1.0.2
c70a312 Make the maintenance-release manifest a bit more generic
84a669f Add manifest for 10.1.0.1 maintenance releases
ed7ccd5 Add cm-10.1.0 manifest
af14f0f Add media-caf repository
d5d870c add google external bits
f5e1e97 Merge "README: Fix broken URLs" into cm-10.1
a726876 Add RC5 manifest
4efef8e README: Fix broken URLs
cdb1bc7 Add RC4 manifest
afd1b19 Add RC3 manifest
221a1be Add manifest for 10.1.0-RC2
5f89eb9 Add manifest for 10.1.0-RC1
11823bf Add AOSP Review
59ddb29 add Heimdall
1d60f80 Add manifest for 10.1-M3
2c5de82 Remove unneeded lines from manifest
04a8da0 switch to cm-10.1 branch
5e4fe77 point to cm forks
26f0a2f superuser
7dd0579 Add manifest for 10.1-M2
38fd77b Fix tag paths
1387101 Update manifest for android-4.2.2_r1 merge
de48493 Add TI's wpa_supplicant_8
411b0bf Add manifest for 10.1-M1
7f96d34 Use android_sdk repository on Github
3d968e3 Remove legacy bootloader
fa7b6c3 Manifest: Add LockClock (part 3 of 3)
0fb8838 CM-10.1 branch readme
05ccebd Add qcom/audio CAF variant
574be37 Add CAF qcom/display variant
a24c57f Change default branch name
2185b92 Remove the notdefault repos
ebf318d Reintroduce the older toolchains
3fc5f30 Update manifest with JB-MR1 changes
d15b086 Update gerrit location in manifest and docs
3100b68 QCom headers for optimized v8
d48f43b Add CMFileManager
259d8c3 Enable "sync -c" default for repo
303ad92 Add the OTA updater
d228c80 Add htop, powertop, and lsof
6831129 Add Superuser repo
bfa7083 Of course we still need the Darwin toolchain.
f8f1cb6 Underp manifest
60f3908 Switching all prebuilts to AOSP

   * bionic
bdc251d libc: arch-arm: strlen: Illegal ARM registry entries fixed Signed-off-by: Paul Beeler <sparksco@gmail.com>
ce133c0 Added audit.h from the kernel.
80fcbd0 Revert "Upgrade to tzdata2013c."
490981e Upgrade to tzdata2013c.
c9a8d3d libm: These optimizations are only for Krait
50c1afd libm: sqrt and sqrtf via ARM vsqrt instruction.
efe2f93 libm: optimistic pow calling
ed26d70 Dynamically allocate soinfo-structs in linker
c32672e bionic/libc: fix getsid() syscall number for mips
1e29718 bionic/libm: fix x86 support regression
c8c7966 libc: Fix invalid macro
5b11f41 libc: Add optimized strcmp
46876ca Merge "msm: vidc: Add the support for MPEG-2 extension and user data" into cm-10.1
1c5179d msm: vidc: Add the support for MPEG-2 extension and user data
20cec6d Bionic/libm: Fix the mismatch ENTRY/END in e_pow.S
b4afd89 libc: Remove Scorpion memmove() routine
f3467b1 libc: Add ARMV7 optimized memchr()
e765528 libc: Add optimized memcpy for Cortex-A15
b24c0fa libc: Enable the fast memmove for NEON targets
44a555d Revert "Add optimized version of memcpy for Cortex A9"
4732399 libm: Check for NEON support when choosing fast pow()
fa64a5e libc: Add ARCH_ARM flags to enable new optimizations
1e126c2 libm: Enable fast NEON pow() for supported targets
8c35d7e Add optimized version of memcpy for Cortex A9
29af685 Add a memmove(3) benchmark.
6ca6dbe Simple google3-compatible benchmarking.
1e8faf0 FORTIFY_SOURCE: optimize
48b524b fix strerror_r test
fd78d4e Add stack canaries / strcpy tests.
188935c glibc 2.15 treats errno as signed in strerror(3).
c08dcd9 Tests for string routines.
d854b47 Add optimized version of memcmp for Cortex A9
f585de2 Revert "memcmp: prefetch optimizing for ARM Cortex-A8/A9"
656c4c9 Add optimized version of memset for Cortex A9
1cdc6cc FORTIFY_SOURCE: remove memcpy overlap checks
abd3608 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/bionic into 1.1
a6b42b0 Revert "libm: Add a proper sincos() implementation"
7b73221 bionic: Add memmove_words.c for MIPS build
d348cd5 [MIPS] fix bionic libm on MIPS support
4051162 Bionic/libm: Add precision-correct de-serialize sin/cos
554c1ce Merge "timezone: data file should be 32 bit aligned" into mr1-staging
92816a9 x86: Add missing bionic/memmove_words.c to x86 source to list.
f9c4e0a FORTIFY_SOURCE: fortify strrchr
837ff61 FORTIFY_SOURCE: fortify strchr
4f0cb41 timezone: data file should be 32 bit aligned
3fa5ca8 bionic: Optimizations for gettimeofday and clock_gettime.
5115d43 msm_mdp: Update header for 4 layer support
001af7a Revert "sha1: Use bswap* to optimize byte order"
6abffe3 linker: restore prelink support
5015fe9 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/bionic into mr1
7f687eb Revert "bionic: Update mechanism to detect number of CPU's for msm targets"
9b2c884 Revert "memmove: Fix the abuse of memcpy() for overlapping regions"
968c473 Revert "timezone: data file should be 32 bit aligned"
f29c214 merge in jb-mr1-release history after reset to jb-mr1-dev
a811d7a Upgrade to tzdata2012h.
5ba7466 merge in jb-mr1-release history after reset to jb-mr1-dev
f0e402d Upgrade to tzdata2012g.
7cc2dec merge in jb-mr1-release history after reset to jb-mr1-dev
2c287e9 Set up the private variables.
c24859f Merge "Fix <sys/klog.h> to correspond to the kernel operations." into jellybean
2569f04 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/bionic into aosp-merge
079b2a5 Fix <sys/klog.h> to correspond to the kernel operations.
956092e merge in jb-mr1-release history after reset to jb-mr1-dev
3ef4fec bionic: update processed msm_mdp.h
98957db Merge "Test flags before using "info"" into jb-mr1-dev
2e0452c bionic: update processed msm_vidc_enc.h
f84bc8d Test flags before using "info"
f27642c merge in jb-mr1-release history after reset to jb-mr1-dev
204b26b bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
9014818 merge in jb-mr1-release history after reset to jb-mr1-dev
17e6c69 Merge branch 'jb-release' of https://android.googlesource.com/platform/bionic into aosp
c49e6f2 Revert "Upgrade to dlmalloc 2.8.5."
f4b34b6 DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
6c0e373 am ec432608: am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
ec43260 am 0c24effd: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
ecf67e1 am 2d51dddf: am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
d2eea0e am baa74eff: am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
2d51ddd am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."
baa74ef am 882c6af9: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
0c24eff Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
85049ea Merge "Use hidden visibility for several internal-use-only functions."
cc95d69 merge in jb-mr1-release history after reset to jb-mr1-dev
95a7a64 Use hidden visibility for several internal-use-only functions.
882c6af Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
988ff8f [MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
e0a00a8 merge in jb-mr1-release history after reset to jb-mr1-dev
f707007 bionic: Update MDP header for sync
5037b10 Upgrade to dlmalloc 2.8.5.
a9dca77 Update ion header to add FLAG_CACHED_NEEDS_SYNC
8ab03a2 merge in jb-mr1-release history after reset to jb-mr1-dev
4430aa6 Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
02e0678 Update headers for Adreno graphics driver
0ef0009 am 30289f0d: am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
30289f0 am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
47dc4d4 Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"
88f1ea8 Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
4513ad7 merge in jb-mr1-release history after reset to jb-mr1-dev
e583032 Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
2aceb4b am e2a17ef4: am 77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
e2a17ef am 77ac158e: Merge "Don\'t copy strerror(3) or strsignal(3) strings if we can share."
77ac158 Merge "Don't copy strerror(3) or strsignal(3) strings if we can share."
4198fa4 Don't copy strerror(3) or strsignal(3) strings if we can share.
dd526b0 merge in jb-mr1-release history after reset to jb-mr1-dev
4b3ff1f am f8902bf7: am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
f8902bf am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."
047a285 Merge "Fix <sys/klog.h> to correspond to the kernel operations."
b67d4ec am 950a3c01: am 51519521: Merge "Add tty defaults to bionic"
950a3c0 am 51519521: Merge "Add tty defaults to bionic"
5151952 Merge "Add tty defaults to bionic"
e249b05 Fix <sys/klog.h> to correspond to the kernel operations.
9d1defb merge in jb-mr1-release history after reset to jb-mr1-dev
b2af8b6 am 66a97ea9: am 4e9d953a: Merge "libc: add ftw / nftw functions"
1eaa3e6 am 77fd7075: am e895e6de: Merge "Update libc/NOTICE and record the incantation."
66a97ea am 4e9d953a: Merge "libc: add ftw / nftw functions"
77fd707 am e895e6de: Merge "Update libc/NOTICE and record the incantation."
4e9d953 Merge "libc: add ftw / nftw functions"
5e58ea0 libc: add ftw / nftw functions
e895e6d Merge "Update libc/NOTICE and record the incantation."
965b867 Update libc/NOTICE and record the incantation.
2b270a0 am a4ea1a3d: am f7e403d6: Merge changes I06ee0b67,I914d2205
155a70b am de9db8f7: am fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
c7fda6a am d4623e56: am b338ea30: Merge "Upgrade to tzdata2012f."
a4ea1a3 am f7e403d6: Merge changes I06ee0b67,I914d2205
de9db8f am fa36875d: Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
d4623e5 am b338ea30: Merge "Upgrade to tzdata2012f."
f7e403d Merge changes I06ee0b67,I914d2205
8a05a01 Print out shared app gids correctly
2a54e5e Add tests for Android-specific stubs
fa36875 Merge "Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3)."
b5f053b Make strerror(3) and strsignal(3) thread-safe, and add psignal(3) and psiginfo(3).
b338ea3 Merge "Upgrade to tzdata2012f."
88b61cb Upgrade to tzdata2012f.
bec648e am 8db4b91b: am d2236e2c: Merge "Fix Mac build."
8db4b91 am d2236e2c: Merge "Fix Mac build."
d2236e2 Merge "Fix Mac build."
38bfa21 Fix Mac build.
478f8ff am b2550dd4: am 4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
29861b5 am 58d15966: am af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
b2550dd am 4a9b7c69: Merge "Add libdl into libc_malloc_debug_leak build"
58d1596 am af4d630e: Merge "Added new test for dlopen which is failing for MIPS."
4a9b7c6 Merge "Add libdl into libc_malloc_debug_leak build"
af4d630 Merge "Added new test for dlopen which is failing for MIPS."
f238e06 merge in jb-mr1-release history after reset to jb-mr1-dev
e007775 Add libdl into libc_malloc_debug_leak build
acf5aa7 Added new test for dlopen which is failing for MIPS.
f801cf5 resolved conflicts for merge of 47bda0c2 to jb-mr1-dev
47bda0c am 7593fa8e: Merge "Update the kernel headers to match external/kernel-headers."
7593fa8 Merge "Update the kernel headers to match external/kernel-headers."
86ec05a Update the kernel headers to match external/kernel-headers.
ccd7ee6 am 90ae787b: am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
90ae787 am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
666d06f Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
0d207ba Backwards and forwards compatibility for an upcoming <sys/socket.h> change.
5766b09 merge in jb-mr1-release history after reset to jb-mr1-dev
cc0f225 am 7f798147: am cc8668f2: Merge "[MIPS] Check error status from pipe system call"
7f79814 am cc8668f2: Merge "[MIPS] Check error status from pipe system call"
cc8668f Merge "[MIPS] Check error status from pipe system call"
b03bc56 [MIPS] Check error status from pipe system call
41b3813 msm8660: Add neon based pow() function for Scorpion
e77e1af Add tty defaults to bionic
3a936a4 Add the libcutils localtime_tz and mktime_t extensions to bionic.
49b5eb4 merge in jb-mr1-release history after reset to jb-mr1-dev
f50b99f am e8b4d67a: am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
e8b4d67 am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
59726be Merge "Rename crtstart variables as crtbegin, to match reality."
12949e5 Rename crtstart variables as crtbegin, to match reality.
e373841 am f9920563: am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
f992056 am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
67546bf Merge "Generate header dependency makefiles for the crt*.o"
9209fd3 merge in jb-mr1-release history after reset to jb-mr1-dev
af4371b am 56ba6336: am f1d57e16: Merge "Add more pthreads tests."
56ba633 am f1d57e16: Merge "Add more pthreads tests."
f1d57e1 Merge "Add more pthreads tests."
cf46487 Generate header dependency makefiles for the crt*.o
4d014e1 Add more pthreads tests.
b010245 am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
b18d4f6 am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
7c7a7f8 am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
72fcdbe am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
d10309c Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
691ef3c Merge "Add mlockall and munlockall for Google TV."
048569b Rename __dso_handle_so.c to __dso_handle_so.h
973bf68 am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
77039d3 am e8f81547: Merge "Fix build warning of initialization but no use."
e8f8154 Merge "Fix build warning of initialization but no use."
1ad05db Add mlockall and munlockall for Google TV.
de0dc25 am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
41ff8b9 am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
6e3b0f2 Merge "Don't corrupt the thread list in static executables."
09f76cd Fix build warning of initialization but no use.
abce26b merge in jb-mr1-release history after reset to jb-mr1-dev
183d0a5 Update msm_ion.h ioctls so they dont conflict with ion.h
85811fc Revert "msm_ion: switch to using legacy_ion.h"
dc81b44 Revert "add legacy_ion.h"
bfeab1b Don't corrupt the thread list in static executables.
2da9070 am 008f4df5: am ff4608ae: Merge "Add missing dependencies."
008f4df am ff4608ae: Merge "Add missing dependencies."
ff4608a Merge "Add missing dependencies."
2e8f434 Add missing dependencies.
faf361a am 2fc3e1ef: am b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
2fc3e1e am b2c5bd54: Merge "ARM: warn about atexit() calls from legacy shared libraries"
b2c5bd5 Merge "ARM: warn about atexit() calls from legacy shared libraries"
ac3e35c am a76f2eca: am 26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
a76f2ec am 26f2e4a1: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
26f2e4a Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
f71d757 am 7310a1c4: am 82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
7310a1c am 82978cae: Merge "Avoid malloc lock while calling pthread_atfork."
82978ca Merge "Avoid malloc lock while calling pthread_atfork."
3a8807d merge in jb-mr1-release history after reset to jb-mr1-dev
8477551 Bionic/libm: Pow optimizations and bug fixes
e5b564f msm7627a: Enable neon optimized memove and pow functions.
7183f48 Bionic/libm: Remove extra vmov from sin/cos
72705b9 Bionic/libm: add assembly versions of sin/cos
cbe8bcc Bionic/libm: Prefer branches and VFP ABI
2e77f93 linker: Increase maximum shared libraries loaded to 192
ab55816 am b9f0a6eb: am be19a367: Merge "termios: add tcdrain"
b9f0a6e am be19a367: Merge "termios: add tcdrain"
be19a36 Merge "termios: add tcdrain"
f34c6d7 am bc374078: am 5ff23471: Merge "Add getsid system call to bionic"
bc37407 am 5ff23471: Merge "Add getsid system call to bionic"
5ff2347 Merge "Add getsid system call to bionic"
877ad30 am 507bcabb: am e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
507bcab am e03ab936: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
e03ab93 Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
63deae5 Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
c0e3b9d am b438c54d: am 1db615b4: Merge "bionic: Fix TINY_ANDROID build"
b438c54 am 1db615b4: Merge "bionic: Fix TINY_ANDROID build"
1db615b Merge "bionic: Fix TINY_ANDROID build"
5ac9eee bionic: Fix TINY_ANDROID build
4dfd4f2 bionic: Stack pointer/signal race condition.
9549238 termios: add tcdrain
2b49277 merge in jb-mr1-release history after reset to jb-mr1-dev
1ad10a5 Add getsid system call to bionic
3e2d293 Avoid malloc lock while calling pthread_atfork.
b9ad1a1 am 6abab301: am 6fe901ef: Merge "Upgrade to dlmalloc 2.8.6."
6abab30 am 6fe901ef: Merge "Upgrade to dlmalloc 2.8.6."
6fe901e Merge "Upgrade to dlmalloc 2.8.6."
83d5e56 merge in jb-mr1-release history after reset to jb-mr1-dev
c6d95ad Upgrade to dlmalloc 2.8.6.
8c368b5 am dde94f4c: am 8b4e8a93: Merge "Improve the dynamic linker diagnostics."
fe7d7d4 am 92133ca4: am 17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"
dde94f4 am 8b4e8a93: Merge "Improve the dynamic linker diagnostics."
92133ca am 17d9be8a: Merge "disable _FORTIFY_SOURCE under clang"
8b4e8a9 Merge "Improve the dynamic linker diagnostics."
17d9be8 Merge "disable _FORTIFY_SOURCE under clang"
8900e2d am e5b85f45: am 0d7177c0: Merge "Clean up warnings in the malloc_debug_* files."
e5b85f4 am 0d7177c0: Merge "Clean up warnings in the malloc_debug_* files."
e9b6fc6 Improve the dynamic linker diagnostics.
0d7177c Merge "Clean up warnings in the malloc_debug_* files."
829c089 disable _FORTIFY_SOURCE under clang
c4d1fec Clean up warnings in the malloc_debug_* files.
15afed4 Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
f71fa08 Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
b2d46d3 merge in jb-mr1-release history after reset to jb-mr1-dev

   * bootable/diskinstaller
60d078a Merge "Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency"
da4fec9 Fix $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) dependency

   * bootable/recovery
0f7f15c v6036
568d9bc Shrink cid
6fd7ca9 Merge "Add sdparted option to partition in ext4 fstype" into cm-10.1
caf0c8a Merge "Update wipe data option confirmation" into cm-10.1
63ac2b8 unset immutable bit on install-recovery.sh
04f02c5 4.3 detection fix
a2aac83 add su daemon runner
ab6769d 6035
912b6d9 su installation and detection updates for 4.3
ebecbc6 Fixes for Superuser
b9ecf64 Add power off & reboot to bootloader mode in advanced menu
8736cc1 Remove "fix permissions" option
a81817c more headless fixes
38a4356 Merge "add --headless mode" into cm-10.1
ab60a07 add --headless mode
64615ee SELinux: don't suppress the "no file_contexts" message on the UI
7f7491f Update wipe data option confirmation
a4be87f Add sdparted option to partition in ext4 fstype
cfb115f Update for zlib changes
f572459 Bump to 6.0.3.3
a1d5819 Fix usage of stat vs statfs
593b54c fix stat usage
51eb3cf Merge "recovery: use just the mount point instead of the full path" into cm-10.1
7ac751f recovery: use just the mount point instead of the full path
71d76c2 Fix the potential segmentation fault
e672fdf move "install zip from sideload" to installation submenu
ed53bd0 Merge "Fix compiler warning: redefinition in extendedcommands.c" into cm-10.1
f5cb73e Merge "Remove (un)mount option for datamedia partitions" into cm-10.1
a8a1ac7 Merge "recovery: Fix adb backup" into cm-10.1
cc5591a support version 2 (2048-bit e=65537) keys in recovery
2162ee6 Fix compiler warning: redefinition in extendedcommands.c
7efb8bd Fix recovery filesystem table output to log
9de39c1 Remove (un)mount option for datamedia partitions
5f05ac7 recovery: Fix adb backup
c6834e3 add getprop
abc56ea revert mmcutils. cleanups and fixes.
5043ef2 Rename prebuilt recovery su to su.recovery, so it does not interfere with devices that have a shared recovery/boot.
fcf5a00 Delete sideloaded file once installed
884ee9b Merge "recovery: fix sideload cancel" into cm-10.1
6f8d24d 6032
9edb359 Reverse kang Wil Wheaton Recovery enhancements.
07b573f recovery: fix sideload cancel
4d9a03b Bump version to 6.0.3.1
fb5a9a9 allow sideload to be triggered via /cache/recovery command for eat
fba8e16 Allow cancelation of adb sideload.
d9ea07f Merge "minui: add extended courier font" into cm-10.1
6b471c7 nandroid: backup: save recovery log
4696ba4 minadbd: remove unnecessary header files.
1e6d006 Add external_sd and efs to /etc/fstab generated by recovery
95eedbb Store CWM Recovery Version and Device
032a351 6.0.3.0
f8bf7ec 6.0.2.10
34f330b Remove HAVE_SELINUX guards
edc8709 Store CWM Recovery Version Number
91f2dc2 Fix segfault with dead symlinks
eda49d7 6.0.2.9
6a620aa Blocked cached Google Music files from nandroid
7cc1b56 Merge "Pass the correct pointer to munmap on failure." into cm-10.1
f4579ef Merge "adb: handle adbd auth in recovery mode" into cm-10.1
c3550db Pass the correct pointer to munmap on failure.
7bbf5cb add optional overscan compensation to recovery graphics
7573224 minui: add extended courier font
1ec4e7b adb: handle adbd auth in recovery mode
74341a3 UI text corrections
d7f4567 Fix use of TARGET_USE_CUSTOM_LUN_FILE_PATH
d8f5b40 Add support for TARGET_USE_CUSTOM_LUN_FILE_PATH
91dcc2f recovery: add transparency to error images
5ca6fa9 Do not attempt to back up .android_secure if it is on /data/media
6be302e 6.0.2.6
190a48b nandroid: Fix nonexistent backup format type bug.
a3870b1 nandroid: Fix nonexistent backup format type bug.
8ac3a83 6.0.2.5
0277535 6.0.2.3
ef2734a 6.0.2.2
a4a854d Fix crash in recovery that occurs during backup.
ae4a2b2 fix default backup format selection menu
d205d4b Fix up RSA key loading bug in jellybean.
50f5fb0 actually properly change hte default backup handler
b6ca0c6 6.0.2.1
8310bc1 port more graphics.c changes for Android.mk
1712e1e merge graphics.c changes
c908d3b Fix bug in ui_copy_image reported in: https://github.com/CyanogenMod/android_bootable_recovery/commit/107629b02d49fa69b25c414f445e823e1e4bbec3#commitcomment-2219143
7322ac1 Switch the default backup format to tar.
ed136c1 remove extraneous eng tag
a8f4f4b Fix up mounts.c usage. Forward port write_raw_image changes to jellybean.
eaee719 Pull in android 4.2 updater bits willy nilly. Next commit will fix.
53e139f fixup init.rc
252fd59 dedupe: fix buffer overflow
d21a468 One more 4.2 dependency for ext4...
4566104 Add mode when open(O_CREAT) is used.
20cdd24 recovery: Update for new libext4_utils library name
d3efd1f Fix bug with sd card partitioning.
038bd90 Fix regression in sdcard partitioning menu. https://github.com/CyanogenMod/android_bootable_recovery/commit/1606b8a226ad6a2d7b2201f3e31b214322a56566
1606b8a Remove wipe battery stats garbage. Add support for doing a true ext4 format of /data on /data/media devices.
a2cac12 Fix menu bug reported by sk8erwitskil: https://github.com/CyanogenMod/android_bootable_recovery/commit/014d02059c8533f7e1b2ff3f1e8fdb5464098c59#commitcomment-2185643
4acc309 fix for backup completion log: https://github.com/CyanogenMod/android_bootable_recovery/commit/77013ccee7c0c4570fad84f854b5b6a44bee6a73#commitcomment-2172624
9769a7b Add larger Roboto font (23x41) for 1080p+ screens (ie Nexus 10)
242824a 6.0.1.9
a683262 revert mako hack fix. apparently that was not the problem.
2f66ccd 6.0.1.8
30297fc Fix bug in mako. Stack overflow/corruption caused by too small of a menu array. Need to put in a better fix that allocates the menu dynamically.
425869e Merge branch 'jellybean' of ssh://github.com/CyanogenMod/android_bootable_recovery into jellybean
dd20b0f minui: fix screen update issue
8147ae9 graphics: add support for "single buffering"
d213eb1 import init.recovery.hardware.rc
77013cc More logging around backup completeion.
1d95035 6.0.1.6
8e40f42 Android 4.2 migration fixes. If /data/media/0 exists after a data wipe, place the .layout_version file into /data to prevent Android 4.2 from running the data migration. This fixes the bug where multiple migrations end up with the following dirs: /sdcard/0/0/0/0. One /0 per each wipe.
65777cd Merge "recovery: fix build on x86" into jellybean
0d56a0e recovery: fix build on x86
bd6dece Allow custom RECOVERY_NAME
8929c1e Revert "move "install zip from sideload" to installation submenu"
2b62203 move "install zip from sideload" to installation submenu
58cd3b9 6.0.1.5
35ced47 mtdutils: fix crash on large erase block
c9d07dc touch up the pictures, remove the leftover
702a3b3 Merge "recovery : add minadbd and sideload from AOSP" into jellybean
fa118f3 Merge "recovery: make dedupe gc interruptable" into jellybean
368b375 recovery : add minadbd and sideload from AOSP
470e3cd fix lack of null termination being written to the lun file
c4f037d rev
f2872b9 6.0.1.3

   * build
2f689a4 Updated CM release key for recovery
7d15161 envsetup: add a helper to fix "out/target/common" not being really common
42342f3 Bionic optimization for Cortex A5
ff41d07 releasetools: use prebuilt boot image if using a custom boot image makefile
d496200 roomservice: Bump devices per page to 200
6cd5f43 Add auditd to SELinux-enabled builds
6490b2b Merge "lets make the lunch list look a little neater" into cm-10.1
6fe65c4 update emulator's recovery.fstab
7197530 emulator: use ext4 instead of yaffs
e5bdddf Fixes for Xcode 5 and OSX 10.9. kernel.mk: Put elf.h into the include path on Darwin builds.
3fb440a recovery: Always allow the CM release key
d90c6dc repopick: let's be nice to our servers :)
98f660a repopick: remove the superfluous information from date
b8fddac repopick: gracefully handle empty/non-JSON server responses
d0884b9 build: get rid of the sparse expand stuff
73b34f6 envsetup.sh: add missing dquotes
0ca7b34 dopush: push files to /data too
294ab11 Fix /system/app/$app.odex not updated issue
4c66ff4 Sign final packages with a different key if requested
448f5c8 lets make the lunch list look a little neater
7673507 roomservice: When validating the presence of a repo, check main manifest too
ba2d49d add adb to the disttools
7da16d0 Merge "envsetup: add quotes around PROMPT_COMMAND" into cm-10.1
623cbf8 repopick: decode the result as UTF-8
78d0ac8 envsetup: hmm repopick
0ad046b s/cyanogenmod.com/cyanogenmod.org/
fc54d9e repopick: allow running from a subdir of ANDROID_BUILD_TOP
af7aa23 repopick: handle additional error cases around subprocesses
29531b2 repopick: add -b shortcut option
0b55d23 repopick: initial commit
3f06103 Add support for cross compiling Windows tools on Darwin.
9186284 envsetup: add quotes around PROMPT_COMMAND
379c0fe envsetup: use $(CURDIR) for getting current directory
c8a2187 eat: get the proper MODVERSION
a0b5174 cout: move to $out
378c1ae roomservice: python3 support
c102a65 build: Add support for extra kernel build variables
f10f507 mkvendor: fix echoed build commands
e3855c4 Revert "bacon: name the package correctly"
004fbde Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/build into cm-10.1
4667b7b envsetup: Make installboot work in recovery mode too
cfaf7da Consolidate bash version checks
b7a765d Check bash version instead of OS for bash completion
061dd2c The bash completion stuff is crapping out on darwin. Disabling. Let me know if I am doing something wrong.
d9fd6eb eat: Eat using adb sideload
ba6ee56 Revert "Allow disabling DroidDoc build."
f751d25 envsetup: allow using mka for mm{,m}
724feed bacon: name the package correctly
159d99d Add module names to emulator PRODUCT_PACKAGES.
d1d71f6 Add emulator modules to PRODUCT_PACKAGES in full and sdk products
659282b print CM_VERSION in build config
0f5bb3a CM on Emulator [ARM]
3ae4af1 envsetup: export ANDROID_BUILD_TOP earlier
875e831 Allow disabling DroidDoc build.
b225d8b JDQ39E
c3ed1b3 envsetup: include bash completion script from vendor/cm
a910a31 JDQ39D
25fd33a JDQ39C
6071d4f mkvendor.sh: more fixes
0f2bcdc mkvendor.sh: typo
2c493f7 mkvendor.sh: force armeabi-v7a
b51dd7c Merge "bacon: get rid of squisher" into cm-10.1
1c2fa25 JDQ39B
cf1e930 roomservice: Fix wrong assumption about path of active manifest
9e21545 bacon: get rid of squisher
65181ff fix path to sounds in sdk product
f860707 Fix fallback branch search in roomservice
cc7b143 eat: Use /cache if possible
3f18ff6 build: recovery: fully strip ro.adb.secure
b849847 build: recovery: disable ro.adb.secure
90e13bc build: Relax Cortex CFLAGS
c408754 build: move bionic optimizations to NEON makefile
68df391 build: Enable Bionic optimizations on Cortex platforms
d9dc099 Add new version to qcom_utils.mk
92c70cb Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_build into mr1.1-staging
56dae3d kernel: Ignore errors with module building
b7f3c8a Merge "build: local_manifest.xml deprecated, use local_manifests" into cm-10.1
6b871c3 build: add strip on kernel modules
fd5a4bb build: local_manifest.xml deprecated, use local_manifests
012b8e8 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/build into 1.1
1d9caeb Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1
fbef8b9 JDQ39
b38f1fc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
8359d2c am b7f96375: docs: fix ::selection style to use Android blue for text highlighting
b7f9637 docs: fix ::selection style to use Android blue for text highlighting
7faa1b8 JDQ38
35e0666 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9770928 JDQ36B
eed4696 JDQ36
496fc81 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
dc95f1e Merge commit 'android-4.2.1_r1.2' into cm-10.1
5d0d638 JDQ32B
75631bf JDQ32
c730b8b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
7257c71 am 6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
a334cee am 77c51357: docs: fix lang switcher for gae by deleting obsolete method call
6668404 Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
c5480c3 docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
b88c1a8 am 98f23e7a: docs: delete obsolete asset files
8944234 am e05e6f99: docs: update template files with those from the templates-ds directory
79935f5 am 015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
18a1a50 am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
9c3033c am dc6b4a59: Add templates for devsite docs builds.
ee80c57 JDQ30
c960e67 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
77c5135 docs: fix lang switcher for gae by deleting obsolete method call
98f23e7 docs: delete obsolete asset files
e05e6f9 docs: update template files with those from the templates-ds directory
4335d57 JDQ29C
d51b83b JDQ29B
4682f50 JDQ29
677a760 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
015d616 docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
91f0e5b JDQ28
0df2fb8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9c2336e Add new droiddoc option for project-specific secondary html input/output paths.
dc6b4a5 Add templates for devsite docs builds.
bb54d9d JDQ23
ae15c40 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f7f1523 JOP40G
ef83ac8 FM Radio: Add support for FM Radio in Android
9926240 Merge "build: Use common name for QCOM 7K boards." into cm-10.1
2260eaf JDQ18
fb34d95 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
71e369e JDQ16
012b399 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
da5f4f2 roomservice: Allow following up tag references
474b3f1 am eb41035f: docs: add the ability to pause the carousel
eb41035 docs: add the ability to pause the carousel
da639ff envsetup: More PROMPT_COMMAND
da54df5 envsetup: Really fix PROMPT_COMMAND handling
c4fd5ea envsetup: Fix $PROMPT_COMMAND
0f7d319 build: Use common name for QCOM 7K boards.
eded398 Some changes added to compile and run with Java 6 and Java 7.
5584637 roomservice.py: Fixups around fallback branches not being used by dependencies when ROOMSERVICE_BRANCHES is defined.
2cb5a36 JDQ10
baf217c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4dc0571 JDQ09
2cb0583 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b10200a envsetup: Don't tread on my $PROMPT_COMMAND
a08054f Enable Uighur Language in build.
fdc7dc5 envsetup: push to connected device only if it is $CM_BUILD
8d0a978 am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
869f3d1 Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
ae3ee42 docs: update analytics script to support event tracking
a6f1040 am 7dc45a8b: Add simg2img and e2fsck to the otatools.
7dc45a8 Add simg2img and e2fsck to the otatools.
01a6184 Revert "Optimize the CM builds"
d084b6f roomservice.py: Verbose error when a branch is missing. Also add ROOMSERVICE_BRANCHES environment variable to use fallback branches.
0112612 mkvendor.sh: fixes for Android 4.2.
5a6a0fa JDP82
3b40691 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
0c3379a JDP81B
e054566 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
74bb088 JDP81
72857f3 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
c9cea37 am 707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscr
707909f Merge "docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce." into jb-mr1-dev
b8d06a5 docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
4505bf3 JDP80B
da35afa merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
e551d6b JDP80
76db451 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
341d8f8 Bump version to JDP79B
5f97f2b am 6a6c1121: Run e2fsck on built sparse images.
e40ae3a JDP79
aa7a07b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b56918a SignApk: perform the whole file signature in a single streaming pass.
714d7c7 JDP78
87fefda merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
fd09649 Darwin: Use gsed for SED_INPLACE if found.
6c2a597 Merge "Make sed in-place more portable" into cm-10.1
20bfc92 JDP75
9d1c9df merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
24fbed3 Make sed in-place more portable
127f6a2 JDP74
c79811b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f7d0cdc build: installboot: support mtd partition
23974c8 roomservice: Remove forced revision, use whatever's active
ba45cc1 JDP73
082e6dc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
16cb865 Reconcile with jb-mr1-release - do not merge
29132ce JDP72B
2710dcb JDP72
bd2e0d7 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6a6c112 Run e2fsck on built sparse images.
acb046a JOP40F
afb5ce6 build: Update domain name
aa81ebb JDP71B
77072f9 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
80998ee JDP71
8af65fe merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
be247ab JDP68
bc9ff47 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6a54871 build: Add board platforms to qcom_utils
c536a0f JDP67B
4bca2f5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1e34606 JDP67
3e50c96 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2f74b6d JDP66
f2f1d7f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
d2fb0fd Remove the line that deletes *.rc from the recovery ramdisk. This is no longer necessary since recovery init.rc only includes "import /init.recovery.${ro.hardware}.rc".
582c34b JDP65
1de9eda merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
801a079 Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
6d30212 JDP64B
e21aec9 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b715790 Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
4bfc999 am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
fd3b957 am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev
5c0f9e9 Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
f88a53d Merge "docs: support google css class for reference docs" into jb-mr1-dev
67d75f1 fix docs.js bug where changeApiLevel is getting called
838b085 am df08adae: docs: add "Google Services" search tab
06884f5 docs: support google css class for reference docs
aa48e74 Obviously JB MR1.1 should be Android 4.2.2.
df08ada docs: add "Google Services" search tab
d2827ae unbundle photo dreams into the GalleryGoogle package
dc64b2e JDP64
e4ac051 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
5808999 JDP60E
408067b am 8fa5351c: show build info only for android docs (not google)
8fa5351 show build info only for android docs (not google)
3e8afbc Merge "mka: change how make is called" into mr1-staging
b1110e6 JDP60D
2b61bc3 am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
e0dceab Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
0504ec1 am ac71b2b5: docs: revisions for google reference nav
ac71b2b docs: revisions for google reference nav
408149a JDP60C
ee9dea6 am 8acd75aa: add google class for body
8acd75a add google class for body
18dca5d Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
cddbc09 am 5747d38a: enforce margin change for nolist class in training articles
1e2934b am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
ef8764d am d2dd6e58: add support for gms javadocs
5747d38 enforce margin change for nolist class in training articles
4e477d7 Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
ab4daf4 docs/css: break words that are too long to fit sidenav; add style for google javadocs
d2dd6e5 add support for gms javadocs
9459265 JDP60B
afac6c9 Reconcile with jb-mr1-release - do not merge
fd74ba5 JOP40E
1493ad7 JDP60
1c38cdc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b3748f3 am 40e90998: add google services tab
40e9099 add google services tab
7942a93 am d4cb7831: add \'external-link\' class for links that go off-site
d4cb783 add 'external-link' class for links that go off-site
1d4caf3 Merge commit 'android-4.2.1_r1' into HEAD
50a8ce1 am 7d131e0a: fix build
7d131e0 fix build
2febef6 JDP58
7c761e2 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1aace7d am 502c939f: docs: add support for an infinite number of nested lists in side nav
502c939 docs: add support for an infinite number of nested lists in side nav
f44a518 am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH
c69b773 Put ANDROID_BUILD_PATHS before the system default PATH
d4f8d5e replace dummy versions with normal ones for mini
257fef4 Reconcile with jb-mr1-release - do not merge
cc862f2 JDP57B
c87917e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
14eee53 JDP57
92ad3fd merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
0596564 roomservice: fetch mr1-staging
26f1b2b Deprecate BOARD_FORCE_RAMDISK_ADDRESS in favor of BOARD_MKBOOTIMG_ARGS.
295225e build: don't clear recovery ramdisk
767f9df mka: change how make is called
93e2e04 fix "eat"
2b63490 JDP50B
c5a1539 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
8035374 JDP50
0944619 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
d4382dd bump version to 4.2.1
476750c JOP40D
5a14902 JDP47D
0ddeb0c am efcc8b1c: bump version to 4.2.1
efcc8b1 bump version to 4.2.1
767bece build: Fix fastpath code for CM_BUILD
f118d10 Merge branch 'jb-mr1-release' into mr1-staging
85f6bdb Get rid of the whole modelid stuff, no supported device uses this crap
6294b49 omnom (brunch + eat) command
bb20f99 Fix SmokeTest
ab15fcf build: Add "installrecovery" command
54dc5e2 fix sdk target with absolute OUT_DIR
b7d831c unpackbootimg: add a target specifically for unpackbootimg. for some reason, and I am guessing this is a bug in the Android build, I can no longer run the following: make -j32 out/host/darwin-x86/bin/unpackbootimg
b3c25d3 Split to multiple bash commands.
1f07612 Revert "build: Use newline at the end of echo to apkcerts file"
72ce6bd cleanbuild: add *.zip.md5sum to installclean_files
07f399a dopush: improvements
1959ce8 recoveryzip: Fix build of recoveryzip
3aac201 roomservice: Handle missing netrc file
36dcc81 roomservice: Add support for netrc
488f8dc roomservice: Bump github request per_page to 100
56cf7e6 Build only modules required by the current product.
8807b5b build-with-colors: moar colors
37b3074 build: Use newline at the end of echo to apkcerts file
359a0d6 core/Makefile: avoid exceeding MAX_ARG_STRLEN
3d24a8f build: work around missing readlink -f on Mac
698b48d envsetup: new function cmka
4bdb0d7 envsetup: set OUT_DIR to an absolute path always
b0c52e0 Fix building when OUT_DIR is out of ANDROID_BUILD_TOP
bc35219 build: Don't build the recovery-from-boot patch on CM
f337ace envsetup: make-and-push function enhancements
731afb8 build: Add "installboot" command to install boot images
b4157a9 build: Pass OTAPACKAGE location to squisher
f92d58d Add CM copyright to some files.
84d63a4 build: Add "aospremote" command
0dce2c6 Add standard method for enabling mfpu and mcpu code optimization
752d9ef envsetup.sh: Fix the `reposync` function
5e5fd14 build: Remove wallpapers from full_base.
2859b29 Eat: Option to specify directory of zip in recovery mode
accc707 Revert "envsetup: mka improvements"
9e32601 envsetup: mka improvements
cb7220e envsetup: Make eat restart adbd as root before pushing the recovery command
521a515 Optimize the CM builds
8ec8558 build: Add Qualcomm's helper macros
90f205b build: kernel: remove hard coded darwin toolchain.
d9f3904 build: add support for uncompressed kernels
adbc510 envsetup: Add some more commands
b20186e Fix "build: display the full path of the installed libs, to allow copy paste"
ec9feaf makerecoveries.sh: Fix up some error reporting. Have errors return a non-zero return value for scriptage.
edfcce9 kernel.mk: set KERNEL_OUT properly
3be97a8 build: fix ccache usage when building kernels
136ce64 kernel.mk: Fix darwin regression caused by 732db8b1.
a1b8a12 build: fix target header overlay
f3ab120 Make the recovery ramdisk target depend on $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) rather than $(INSTALLED_BOOTIMAGE_TARGET). This fixes the circular dependency for when the kernel depends on the recovery ramdisk, which depends on the boot image, which depends on the kernel.
e747935 arm: Allow disabling PIE for dynamically linked executables
1f524f7 kernel: allow to specify a custom toolchain for kernel build
9f0c146 update ota_from_target_files to handle mounting/unmounting for backupscript
548a1fe Use less heap space for dex on 32-bit build hosts
61942e1 kernel.mk: workaround to fix kernel builds on darwin until the prebuilts/gcc is checked in by upstream.
c8462bf eat: Adapt to new storage paths
2c395a3 roomservice: Fetch jellybean repo
556389c kernel.mk: fix compiled kernel copy
6fc6668 kernel.mk: Also search PRODUCT_COPY_FILES for the kernel copy, as that is how AOSP does it now.
7a79517 Fix up the get-file-size function that was broken due to the prior commit that made it utilize gnu stat (gstat)
c8b8beb Does not copy anything
a987181 Fixed build for full-eng
0a7a934 build: display the full path of the installed libs, to allow copy paste
582bc93 echo args
8044d09 This is causing generic_armv5-userdebug builds to fail. Commenting out for now to fix recovery build servers. Will fix properly later.
a1f67f9 add unpackbootimg to otatools
10e4024 do not do local_manifest.xml repos
d96059a make compatible with github v3 api
7d030ce Revert "Overide define INSTALLED_BOOTLOADER_MODULE If board has locked"
c6fe396 Fix the build
6bd9598 env: implement the repodiff command
072c3f9 eat: Adapt to new file naming scheme
7f0598b Overide define INSTALLED_BOOTLOADER_MODULE If board has locked
62c2496 Kernel makefiles that the stat on the system is GNU stat. GNU stat uses the "-c" option to specify format. Darwin stat uses the "-f" option to specify format. This discrepency will cause kernel build breaks. On my system, I symlink stat to GNU stat. This causes the "get-file-size" define to fail. The fix for this is to detect "gstat", aka GNU stat, and use that appropriately.
f11bbfe releasetools: Add support for BML partition type
30a37f7 build: Stop installing the sample APN list
1e111c4 Fix python fail.
6381aa5 Fix python fail.
1b2b3bc Explicitly provide the revision when modifying a local_manifest.xml via roomservice. Is there a way to figure out whether we are on ics automagically?
448fb75 makerecipe: WIP to generate manifest branches for releases
b201f2e new variable TARGET_RECOVERY_FSTAB
429583d build: show accurate information on inline kernel warnings/errors
ac185e6 kernel: Fix ccache inclusion logic
2a52a16 kernel.mk: make use of ccache when requested
5becceb fix rc file for charge mode
7fd5a89 Add initial support for charge mode. also support recovery/root in the device tree to easily copy props into recovery images.
0b324e7 roomservice: Extend dependency-checks to devices in main manifest
0e1f204 kernel: allow TARGET_KERNEL_MODULES to overwrite kernel modules
a5fe794 roomservice: Fill in dependencies for already-deployed repositories
591bf04 kernel: Fix ARM building
f43404e kernel: Improve support for non-arm architectures
a7936fa fix template for mkvendor.sh
5fa722f kernel: Change path to kernel/<vendor>/<device>
19bea79 build: Fix kernel module building on Darwin/OSX
a3287a5 roomservice: Add branch support to cm.dependencies
d8ee91f build: Inline kernel building as a buildtime task
2683a9d add cm.mk.template file for mkvendor.sh
940eab7 build in colors: host C/C++
d122a11 Colors: add more colors to final build steps
a26fac4 roomservice: Add lightweight dependencies to repositories
de5ad0e Modular backuptool.sh.  Executes backup and restore methods defined in arbitrary /system/addon.d/*.sh scripts.
2cdd0ab Fix inheritance of PRODUCT_PROPERTY_OVERRIDES for CM audio files
7d3da77 Note that update-api is a lie.
63586cf Disable Pinyin and Openwnn IME's by default. These two IME's are of poor quality and nobody actually uses them. A device that caters to those markets may choose to enable these IME's, They are more likely to instead install one of the better free IME's from Android Market.
27eb77f eat: Automated install of fresh builds
cd6de46 build libjni_pinyinime together with PinyinIME
beb4d68 build: Realign product libraries with corresponding applications
b259d76 zte prefix. really need to fix this code.
fe72cd3 build: Cleanup nam configuration and enable by default
21a0a9f Allow low memory machine to build with a smaller java emulator.
c1620a4 override ro.build.date.utc for recovery builds. fixup makerecoveries.sh script for touch recoveries.
af38eb5 Disable dataroaming by default
1d7e5fb build: Support nam configuration script in ota package
6be9154 build in colors: Install outputs in blue/yellow [basic ics version]
7e5a09f Require signapk.jar for Flakeflash images
3598c53 Add ro.cm.device to build.prop
48b5ded Include the primary bootloader and ramdisk in the BOOT/
f596fbd Fix up the recovery.fstab for adv recovery
8736053 Extract uboot image creation from core/Makefile
ae8af36 fix roomservice to handle pagination
3840fcc Better handling of ramdisk during make
40c891d Do not build MusicFX
aa83bc2 Allow Device specific ramdisk address
3d59a01 Fix tabs, sorry bad commit --amend :p
747d104 TARGET_CUSTOM_RELEASETOOL is a squisher replacement
33364f4 build: Run squisher for the bacon target
c3e04fa Allow override of device asserts, including multi-device support.
e84e1f5 build: Add support for assembling multi-image uboot files
312cc0f Fix up the autoinclusion rules for the utilities and recoveryimage target.
f56322b create a target for utilities
fea1994 support product names with _ in them
167d773 Squashed commit of breakfast/brunch commands
4d8dfb7 fix roomservice formatting
f891c70 roomservice delivers you lunch combos from the CyanogenMod github.
1fe2d50 ota: Fix inclusion of the backup script
034d635 Change how we search for CM makefiles.
8a6e9ec build: Fix cm builds
8a37057 build: Fix usage of releasetool
245ca89 Add the keys I used to sign the market version of Superuser.
5e7a1e5 Add otapackage support for backuptool
d56394f build: Preliminary support for CM product builds
3b43bfa add support for custom releasetools
95f0694 remove unused BOARD_USES_COMBINED_RECOVERY
ee04a34 Add ARMv6J and ARMv6-VFP processor combo option
e8cdf21 CWR does not support writing a partition from memory. Use /tmp to store the extracted file, then write it.
a470ba4 add support for overriding build.prop settings.
a51569b Add recoveryzip target. Import recovery building/porting tools.
0f400c6 build: allow use of openjdk and other versions of make
53056b8 Add ext2, ext3, and vfat to releasetools
b3c9a8a make bacon and custom releasetool (for squished zips)
60b2e3c envsetup: cmremote,cmgerrit,cmrebase,mka,reposync
d6d3d8a fix up ota_from_target_files symlink detection.
380ea33 ota: Build uboot bootable images when necessary
289c814 ota: Remove cruft we don't care about
02e055f Allow a device to generically define its own headers
82fc7a5 fix BOARD_CUSTOM_BOOTIMG_MK
30c357d clockwwork recovery build fixes
cd540e9 JDP47C
9f8ccf3 JDP47B
30c4cab JDP47
6a04027 am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
34a4b82 Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
8f24ca8 docs: revise message when api level for docs is too low; make the message appear on package pages as well
f0d4d8f DO NOT MERGE: change build id to JB MR1.1
1f0850e am 11ac05bb: docs: add script for 32/64-bit bundle downloads
11ac05b docs: add script for 32/64-bit bundle downloads
ce81126 Merge "Move check-api to definition.mk" into jb-mr1.1-dev
2dc85a0 am 83cd28b3: am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page
83cd28b am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page
9efb6b0 am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page
be264b6 am 5a1123ef: add script to generate list of classes for each training course landing page
5a1123e add script to generate list of classes for each training course landing page
c065da2 Move check-api to definition.mk
912ed02 am 7c05b69c: docs: add warning message for adt when on 32-bit os
7c05b69 docs: add warning message for adt when on 32-bit os
fed8cf4 JDP45
fdeeaee merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4e9b723 am 098d8dea: docs: add support for ndk tos wall
098d8de docs: add support for ndk tos wall
3894b39 am df0e1617: docs: css fix
6f4d588 am e0c11a6f: docs: fix broken template
df0e161 docs: css fix
e0c11a6 docs: fix broken template
f528f43 am bbffb4bf: docs: add support for templated tabs with the doc title
bbffb4b docs: add support for templated tabs with the doc title
896f9ec am 705e8a4f: docs: something whatever
705e8a4 docs: something whatever
deac4de am 55d99832: docs: changes to sdk page and script for toggles
55d9983 docs: changes to sdk page and script for toggles
0a6deb1 am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
8fa7222 am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
2953f0b am fef18c61: am db3678bc: add ADT Bundle to the download page
fef18c6 am db3678bc: add ADT Bundle to the download page
db3678b add ADT Bundle to the download page
f8ec78a omnom (brunch + eat) command
553affa Fix SmokeTest
2e93980 Reconcile with jb-mr1-release - do not merge
3ff13a1 build: Add "installrecovery" command
3f0e092 JOP40C
6fceb2a fix sdk target with absolute OUT_DIR
7f8d110 JOP40B
d06f594 merge in jb-mr1-release history after reset to jb-mr1-dev
5194366 Reconcile with jb-mr1-release - do not merge
8803150 JOP40
9e819c8 merge in jb-mr1-release history after reset to jb-mr1-dev
79ab255 Reconcile with jb-mr1-release - do not merge
8575026 unpackbootimg: add a target specifically for unpackbootimg. for some reason, and I am guessing this is a bug in the Android build, I can no longer run the following: make -j32 out/host/darwin-x86/bin/unpackbootimg
46527fe JOP39B
6151f7e merge in jb-mr1-release history after reset to jb-mr1-dev
17e0681 Reconcile with jb-mr1-release - do not merge
81d04b7 JOP39
5e98bbb merge in jb-mr1-release history after reset to jb-mr1-dev
d84f029 Reconcile with jb-mr1-release - do not merge
b8162b2 JOP38C
bba1309 merge in jb-mr1-release history after reset to jb-mr1-dev
d0b1977 am 0138951e: Collapse multiple --extra-packages into one.
0138951 Collapse multiple --extra-packages into one.
baa786d JOP38B
7c4e5df merge in jb-mr1-release history after reset to jb-mr1-dev
ab529f1 Reconcile with jb-mr1-release - do not merge
4afe3ef JOP38
c61eca9 merge in jb-mr1-release history after reset to jb-mr1-dev
b791a5f Reconcile with jb-mr1-release - do not merge
c3102ba JOP37B
e68753b merge in jb-mr1-release history after reset to jb-mr1-dev
83c3110 am 1818ea8a: Add dev settings to emulator.
1818ea8 Add dev settings to emulator.
34d12aa Reconcile with jb-mr1-release - do not merge
d67bdb4 JOP37
9e6a170 merge in jb-mr1-release history after reset to jb-mr1-dev
25e3f42 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
ea71e3a JDP37
5d44c6e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
8bce8c0 Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
16bde1f Split to multiple bash commands.
8aaf0aa Revert "build: Use newline at the end of echo to apkcerts file"
54f011a cleanbuild: add *.zip.md5sum to installclean_files
700a87f dopush: improvements
933d561 Run clean steps in only given paths when using mm/mmm
39737e6 JOP36
bbb5978 merge in jb-mr1-release history after reset to jb-mr1-dev
ff34440 JOP34
38a8607 merge in jb-mr1-release history after reset to jb-mr1-dev
fdb9350 JOP33
9aca04c merge in jb-mr1-release history after reset to jb-mr1-dev
a6d6187 JOP32C
3618379 JOP32B
3de803e JOP32
11f0918 merge in jb-mr1-release history after reset to jb-mr1-dev
5a6e240 am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
0900e42 am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs
12e6b98 am e896e344: Merge "add css animation videos" into jb-dev-docs
e896e34 Merge "add css animation videos" into jb-dev-docs
d78354d add css animation videos
4fce921 recoveryzip: Fix build of recoveryzip
2d0ea5b JOP31
6a9426c merge in jb-mr1-release history after reset to jb-mr1-dev
b3a7adf JOP30C
773c4ad JOP30B
0bd5295 merge in jb-mr1-release history after reset to jb-mr1-dev
24ffc43 JOP30
d11e0ff merge in jb-mr1-release history after reset to jb-mr1-dev
e5eabd4 JOP29
a69ca86 merge in jb-mr1-release history after reset to jb-mr1-dev
72ec23a JOP26B
4686998 merge in jb-mr1-release history after reset to jb-mr1-dev
5e6de32 JOP26
c1f2f71 merge in jb-mr1-release history after reset to jb-mr1-dev
eda9d28 JOP24G
d8e2545 JOP24F
c5c150b JOP24E
9e85098 JOP24D
f4f46dc JOP24C
444d588 merge in jb-mr1-release history after reset to jb-mr1-dev
4e51d8e am 4810a244: am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
4810a24 am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
71e20e2 am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
ef4d108 Merge "update class header for deprecated info" into jb-dev-docs
27ac665 update class header for deprecated info
d125b70 JOP24B
c85f8a2 merge in jb-mr1-release history after reset to jb-mr1-dev
2a3cf76 JVP15S
db9ad2d am 80ebbc3c: am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
80ebbc3 am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
1a13c31 am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
a4375a1 Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
49b8650 JOP24
6ccc5c9 merge in jb-mr1-release history after reset to jb-mr1-dev
7267bb8 JOP23E
19ef840 merge in jb-mr1-release history after reset to jb-mr1-dev
c8a063a JOP23D
d8a45b1 merge in jb-mr1-release history after reset to jb-mr1-dev
6e0d076 JVP15R
f68ebc3 JOP23C
7885548 merge in jb-mr1-release history after reset to jb-mr1-dev
0d92694 JVP15Q
a965f6c JOP23B
49401fa merge in jb-mr1-release history after reset to jb-mr1-dev
77ed2e3 JVP15P
cfe2f52 JOP23
15ef128 merge in jb-mr1-release history after reset to jb-mr1-dev
bd027cd am ab84504b: am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
ab84504 am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
6613a23 am 0e585706: fix spacing in carousel text for Develop homepage
0e58570 fix spacing in carousel text for Develop homepage
887da0a JOP22B
cb4f3de merge in jb-mr1-release history after reset to jb-mr1-dev
6bbdd45 JVP15O
fa09c35 JOP22
bb4f58b merge in jb-mr1-release history after reset to jb-mr1-dev
417f0e3 JVP15N
07b89fe roomservice: Handle missing netrc file
5882505 roomservice: Add support for netrc
301ed15 JOP21
5320d3b merge in jb-mr1-release history after reset to jb-mr1-dev
9674728 JOP20
315a5f0 merge in jb-mr1-release history after reset to jb-mr1-dev
d2c281b Merge "Build only modules required by the current product." into jellybean
2f0223a JOP19B
ad470d4 merge in jb-mr1-release history after reset to jb-mr1-dev
132239d JVP15M
a4df72f JOP19
496aa92 merge in jb-mr1-release history after reset to jb-mr1-dev
17a1934 JVP15L
e47aa08 JVP15K
c60b5d9 JVP15J
3b3e7af JVP15I
bb302d4 JVP15H
ccd2ef6 JOP18
362cc4a merge in jb-mr1-release history after reset to jb-mr1-dev
d6ae3d8 JVP15G
beb84e3 JOP17C
46704d0 merge in jb-mr1-release history after reset to jb-mr1-dev
543b362 JVP15F
1e9aa0b JOP17B
1f62f07 JOP17
b844d1c merge in jb-mr1-release history after reset to jb-mr1-dev
9596c1c roomservice: Bump github request per_page to 100
63d2b0c JVP15E
046127a JOP16B
f642f01 merge in jb-mr1-release history after reset to jb-mr1-dev
2542cc8 JVP15D
9645202 JVP15C
1c6fa68 JOP16
d2e5172 merge in jb-mr1-release history after reset to jb-mr1-dev
7f55416 Build only modules required by the current product.
c86b0c6 JVP15B
536a52d JVP15
79fce7f merge in jb-mr1-factory-release history after reset to jb-mr1-dev
8a0808b JOP15
d785ffe merge in jb-mr1-release history after reset to jb-mr1-dev
4bfb52d JOP14
8c96ced merge in jb-mr1-release history after reset to jb-mr1-dev
cd5ea04 build-with-colors: moar colors
2297ace Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
e9d3dd6 JOP13
267dc94 merge in jb-mr1-release history after reset to jb-mr1-dev
99430f7 build: Use newline at the end of echo to apkcerts file
7708059 JOP12D
9e818d8 merge in jb-mr1-release history after reset to jb-mr1-dev
18daa17 Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
3ccd6ed JVP12C
d444111 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
0f72aa6 JOP12C
86135e2 merge in jb-mr1-release history after reset to jb-mr1-dev
7c9f904 JOP12B
c1b3082 merge in jb-mr1-release history after reset to jb-mr1-dev
7027936 JVP12
5d8786b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
c54eaf4 JOP12
b2fe24f merge in jb-mr1-release history after reset to jb-mr1-dev
abc9d6f Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
c58b194 Delete the unused LOCAL_POST_PROCESS_COMMAND.
0a0cfe9 Merge "Add support for building Filterscript files." into jb-mr1-dev
afc782d am 77b10b6a: am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
b78e720 JOP11B
59a1df5 merge in jb-mr1-release history after reset to jb-mr1-dev
77b10b6 am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
e37b7a5 am 8f20607c: Doc change: add new items to qv and adjust height.
8f20607 Doc change: add new items to qv and adjust height.
0ab6e3e Add support for building Filterscript files.
11b15b1 Resovle symlink in findmakefiles in envsetup.sh
7240549 Convert to relative path for CleanSpec.mk
d489d96 JVP11
1bb184c merge in jb-mr1-factory-release history after reset to jb-mr1-dev
b21b637 JOP11
b10de3e merge in jb-mr1-release history after reset to jb-mr1-dev
bc1e541 JOP10E
fd671b2 Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev
a3f11e6 Add the new 'settings' shell tool to the build
07da118 JOP10D
31a3c86 merge in jb-mr1-release history after reset to jb-mr1-dev
57ddcb1 Support to build executables against the NDK
fc7d0c7 JOP10C
bcdd6fc merge in jb-mr1-release history after reset to jb-mr1-dev
8a0bada JOP10B
07d1f65 merge in jb-mr1-release history after reset to jb-mr1-dev
c525c5f JVP10
0fe8abe merge in jb-mr1-factory-release history after reset to jb-mr1-dev
9f4f06f JOP10
d0f1c3d merge in jb-mr1-release history after reset to jb-mr1-dev
392b864 JOP09D
2eb4ca0 core/Makefile: avoid exceeding MAX_ARG_STRLEN
9d37c68 DO NOT MERGE: better late than never: fix build id for JB MR1
a0b204b JOP09C
672dc69 JOP09B
26375f7 JOP08
fd0b653 merge in jb-mr1-release history after reset to jb-mr1-dev
3dbf42b JOP08wq!
24329b1 JVP09
747461c Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/build into aosp-merge
0a16048 JOP09
949a5c4 merge in jb-mr1-release history after reset to jb-mr1-dev
ada6ef0 JOP08B
d73053a am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
b282c35 am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
126c5e9 am e6850d2d: fix layout bug on API Guide landing pages
e6850d2 fix layout bug on API Guide landing pages
8a2f6e5 JOP08
320efc5 merge in jb-mr1-release history after reset to jb-mr1-dev
2f3197d JOP07D
543c9db merge in jb-mr1-release history after reset to jb-mr1-dev
2841fd4 JOP07C
37cb7a8 merge in jb-mr1-release history after reset to jb-mr1-dev
0dac92f JOP07B
de5ce16 JOP07
e8617df merge in jb-mr1-release history after reset to jb-mr1-dev
9caec8e JOP05E
4020b35 JOP05D
6c87251 JOP05C
f6e6bf7 add mip32 stuffs to clang's unknown flag list
56dc102 JOP05B
8f45639 JOP05
9baa911 merge in jb-mr1-release history after reset to jb-mr1-dev
4c1e352 JOP04C
533aa6f JOP04B
af4299c Merge "Store vendor module owner info on the build server." into jb-mr1-dev
9f246de build: work around missing readlink -f on Mac
4791318 JOP04
3b95d03 merge in jb-mr1-release history after reset to jb-mr1-dev
0d88e5b Merge "envsetup: set OUT_DIR to an absolute path always" into jellybean
fb03fb3 Store vendor module owner info on the build server.
be1df52 am ded6dc01: am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
ded6dc0 am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
8602875 am 46c5804c: add analytics tracking event for sdk/ndk downloads
46c5804 add analytics tracking event for sdk/ndk downloads
7283b21 JOP03B
c270104 JOP03
8f39e45 merge in jb-mr1-release history after reset to jb-mr1-dev
8cb3263 am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length
55b19bd am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length
9341d39 am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length
a4888dc adjust position of prev/next links at bottom of page to account for russian string length
e41404f am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
a168a83 am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
83fca03 am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
c914b5b am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
5150b1f am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
8683468 am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
142158b am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
4f5f71a am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
3ef7592 am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
f3d0104 DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
f5878b3 am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
6eb95f1 DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
589622a am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
eb0bce6 am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
6856ef5 am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
e0cc9e3 am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
aa2ce5d DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
61e63c8 am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
24bbcd5 DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
52948fc DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
b61c601 am 2452b062: am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation
2452b06 am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation
0c81a13 provide more width for buttons in training top nav to accomodate longer strings from translation
cbefa64 am b649b416: am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
b649b41 am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
235f4d4 refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
f2d21ab JOP02B
817c088 am 74811834: am dd3d3eea: add localize langs for global strings
5759dea am a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
7481183 am dd3d3eea: add localize langs for global strings
a6c77d9 Reconcile with jb-mr0-release jb-release - do not merge
dd3d3ee add localize langs for global strings
25454bc JZO54K
f1c1e1b JOP02
14fcffd merge in jb-mr1-release history after reset to jb-mr1-dev
76a6dc3 Fix common typo in comments, warning and error messages.
e53439b JOP01B
4445685 JOP01
affe7b4 merge in jb-mr1-release history after reset to jb-mr1-dev
aa105d8 JOO92B
785bbdf merge in jb-mr1-release history after reset to jb-mr1-dev
d58fb4f JOO92
9033a9d merge in jb-mr1-release history after reset to jb-mr1-dev
bd9d29b JRO03X
9eb2e01 Merge "Load only the current product config makefile." into jb-mr1-dev
54fa8c3 Load only the current product config makefile.
c088beb JOO90B
1d55338 am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge
91f71ca Reconcile with jb-mr0-release - do not merge
0d6a91e JZO54J
f7592d9 Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
9cb3731 Run clean steps in only given paths when using mm/mmm
9792571 JOO90
50cef4f merge in jb-mr1-release history after reset to jb-mr1-dev
eb74c2f envsetup: new function cmka
21439c9 envsetup: set OUT_DIR to an absolute path always
d30b099 JOO89C
8d1730d JOO89B
0bc0394 Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
edf8e12 JOO89
734d406 merge in jb-mr1-release history after reset to jb-mr1-dev
68948a9 JOO88C
edc24bb Merge "Make runhat command work again." into jb-mr1-dev
6b9549f Make runhat command work again.
6d8b06f Fix building when OUT_DIR is out of ANDROID_BUILD_TOP
055d880 JOO88B
96b17f8 am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
a8a731b Reconcile with jb-mr0-release - do not merge
366e376 JOO88
db4b4de merge in jb-mr1-release history after reset to jb-mr1-dev
5e703b2 build: Don't build the recovery-from-boot patch on CM
ba7bed7 JZO54I
2d42874 JOO87E
4aea0ed JOO87D
7e6e7d8 JOO87C
d6c869b JOO87B
95ea246 merge in jb-mr1-release history after reset to jb-mr1-dev
e128d8d JOO87
12c0096 merge in jb-mr1-release history after reset to jb-mr1-dev
2a7db05 Merge "Add CM copyright to some files." into jellybean
a0bb428 envsetup: make-and-push function enhancements
00a95f3 JOO86B
0b7e098 Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
b27e328 Merge branch 'jb-release' of https://android.googlesource.com/platform/build into aosp
53e7142 Revert "Include videoeditor_jni in sdk product build."
cc71f1e am d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
d50926a Reconcile with jb-mr0-release - do not merge
6554982 JOO86
89e87cc merge in jb-mr1-release history after reset to jb-mr1-dev
04873af Add the new NanumGothic makefile to the build
cedd76f build: Add "installboot" command to install boot images
1601c69 JOO85B
ebfd60e merge in jb-mr1-release history after reset to jb-mr1-dev
f8f2b02 Ignore support library Proguard warning
6be506f JOO85
0a7f5a7 merge in jb-mr1-release history after reset to jb-mr1-dev
bee64ff JOO84
98f9d31 merge in jb-mr1-release history after reset to jb-mr1-dev
b097af8 JZO54H
57b9a0d JOO83C
7ede0cf Include videoeditor_jni in sdk product build.
ee6f549 JOO83B
32130c6 Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
57a0a4c am dcce7ca6: am 582db97b: add style for code captions; ignore sidenav headers for HRs
dcce7ca am 582db97b: add style for code captions; ignore sidenav headers for HRs
582db97 add style for code captions; ignore sidenav headers for HRs
997e629 Include videoeditor_jni in sdk product build.
9fcb198 JOO83
c1e962b merge in jb-mr1-release history after reset to jb-mr1-dev
320b94d fix PDK build
cb99c22 Use prebuilt for PDK builds.
038fef8 JOO82C
20a7c2c Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
d81b9d2 Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
4b0486b Allow to tag owner to PRODUCT_COPY_FILES
5beb5bb JOO82B
fe1d3b1 Merge "fix PDK build" into jb-mr1-dev
6530b38 fix PDK build
7884dfc Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev
c4d6839 Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
6ce87a1 fix merge-event-log-tags.py deprecation warning
3849760 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
295cf57 Use prebuilt for PDK builds.
5bdf305 Move AndroidConfig.h from system/core to the build project.
e816bde build: Pass OTAPACKAGE location to squisher
cd22a00 JOO82
fdbce0e merge in jb-mr1-release history after reset to jb-mr1-dev
4da2f9c Use prebuilt signapk.jar for unbundled branch.
53e104e JOO81C
c84fa35 JOO81B
ed43a01 JOO81
8a6350d merge in jb-mr1-release history after reset to jb-mr1-dev
d3e35c7 Add CM copyright to some files.
147626e change SignApk.java to use bouncy castle for signing
6e9125b JOO80C
8cf60ec am 5acbfcf6: am 7039b4a7: create consistent spacing between lists and the paragraphs within them
5acbfcf am 7039b4a7: create consistent spacing between lists and the paragraphs within them
c255fa3 JOO80B
7039b4a create consistent spacing between lists and the paragraphs within them
ed9a210 Merge "Remove WebViewDream from the build." into jb-mr1-dev
973c18c JOO80
f36b5a9 merge in jb-mr1-release history after reset to jb-mr1-dev
9abc4e2 JOO79B
4b04330 build: Add "aospremote" command
58ed221 JOO79
8bfdcbb merge in jb-mr1-release history after reset to jb-mr1-dev
990d9c7 JOO78B
e87a34c merge in jb-mr1-release history after reset to jb-mr1-dev
18b111e JOO78
f789ac5 merge in jb-mr1-release history after reset to jb-mr1-dev
50ba361 am fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge
fd14e24 Reconcile with jb-nakasig-release - do not merge
00e8485 JGO77
c834987 merge in jb-nakasig-release history after reset to jb-dev
5db9eba JOO76E
9163bac JOO76D
62e2f88 JOO76C
39b41ec merge in jb-mr1-release history after reset to jb-mr1-dev
53aa4e5 JOO76B
a3f2838 JGO76
f56c052 merge in jb-nakasig-release history after reset to jb-dev
b0cba16 am 7916e624: (-s ours) am a0689075: Update version number for AOSP master
7916e62 am a0689075: Update version number for AOSP master
a068907 Update version number for AOSP master
259cd96 JOO76
e287e0d merge in jb-mr1-release history after reset to jb-mr1-dev
86da340 Merge "envsetup.sh: Fix the `reposync` function" into jellybean
112ae68 Merge "build: Remove wallpapers from full_base." into jellybean
374cfb9 Add standard method for enabling mfpu and mcpu code optimization
2028de7 JOO75B
84f3b02 Remove WebViewDream from the build.
e4f72f8 am fc9e3924: (-s ours) Reconcile with jb-nakasig-release - do not merge
fc9e392 Reconcile with jb-nakasig-release - do not merge
0240574 JGO75
0fdeac4 merge in jb-nakasig-release history after reset to jb-dev
6cc77ba JOO75
34292aa merge in jb-mr1-release history after reset to jb-mr1-dev
c2796eb JOO74D
e60a2e8 JOO74C
5630521 resolved conflicts for merge of 3e91f5ad to jb-mr1-dev
063d0c5 Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev
3e91f5a am 0f47a94d: am 7e300d60: Merge "Enable stack-protector for x86"
0f47a94 am 7e300d60: Merge "Enable stack-protector for x86"
7e300d6 Merge "Enable stack-protector for x86"
cbd588f JOO74B
7d89e1c am 7832dda0: am 5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
7832dda am 5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
5b5ff1a more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
7da95f7 JGO74
6ae8299 merge in jb-nakasig-release history after reset to jb-dev
f5cc87b am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge
60573fd Reconcile with jb-nakasig-release jb-mr0-release - do not merge
605c864 JOO74
1bb1f65 merge in jb-mr1-release history after reset to jb-mr1-dev
a5b7347 JZO54G
bc2406e Add openssl to TINY_ANDROID build
3319f00 JOO73D
b050ed2 am 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
5f4e1ac am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
ee7cb46 Merge "add 'small' style for long headings in Training courses" into jb-dev
6b2dc27 add 'small' style for long headings in Training courses
aadbb3d am 930d2b5c: am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
930d2b5 am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
6a6723a am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
4458452 Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
6adcf01 android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
7810dee JOO73C
a33e3b8 JGO73
96051af merge in jb-nakasig-release history after reset to jb-dev
9223519 JOO73B
11d17ed JOO73
50bafb9 merge in jb-mr1-release history after reset to jb-mr1-dev
818fe62 JOO72C
e859020 JZO54F
accba1e JOO72B
5586106 am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
4595d7d am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"
410420e am 9efa5bae: Merge "Add transform-d-to-p-args"
9efa5ba Merge "Add transform-d-to-p-args"
987332e JGO72
627a736 merge in jb-nakasig-release history after reset to jb-dev
04ba21a JOO72
69331bf merge in jb-mr1-release history after reset to jb-mr1-dev
d56a49b JOO71B
d86c56d JGO71
0c7a9ba merge in jb-nakasig-release history after reset to jb-dev
9a53a7d JOO71
ff258ac merge in jb-mr1-release history after reset to jb-mr1-dev
43093b8 JOO68E
95b1b45 JGO70
13ccbda merge in jb-nakasig-release history after reset to jb-dev
c23f4ef Add transform-d-to-p-args
243b0dc am 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts that are only used in the reference
65cdbdc am 65511c0a: fix script bug. we were running some scripts that are only used in the reference
229166e JOO68D
65511c0 fix script bug. we were running some scripts that are only used in the reference
b2c31c3 am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
a7b0ec3 Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
7839241 JRO03W
0527b10 JRO69
26acee7 merge in jb-release history after reset to jb-dev
16dfdcc JGO69
6b40d9d merge in jb-nakasig-release history after reset to jb-dev
bad31ff envsetup.sh: Fix the `reposync` function
2b49995 JOO68C
248961c JGO68
cba5291 merge in jb-nakasig-release history after reset to jb-dev
2686236 JGO67
8fb9487 JOO68B
dbf1b57 JZO54E
86eab59 am b4199b86: am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
b4199b8 am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
1c27ac0 am 1b70bb21: Merge "Clean step for libc."
1b70bb2 Merge "Clean step for libc."
7d86247 Clean step for libc.
63c3871 Clean up the crt*.o files.
4c3e281 am 11f26123: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
11f2612 Reconcile with jb-mr0-release jb-release - do not merge
6806adb JOO68
67dbf32 merge in jb-mr1-release history after reset to jb-mr1-dev
7676611 am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
19c0615 am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
0ee362e am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
478d0fc Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
619fccf Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
75d6fa1 JOO67C
ab1e93d Clean step for libc.
65eb24d JOO67B
b48ada9 build: Remove wallpapers from full_base.
ef48bc1 JOO67
05f9e56 merge in jb-mr1-release history after reset to jb-mr1-dev
ab157ed Eat: Option to specify directory of zip in recovery mode
821a54a Merge "fix possible build break" into jb-mr1-dev
1a09726 fix possible build break
1155427 JOO66B
52bd431 am d65bb799: am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"
d65bb79 am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"
86ffa1c am 5da7ec4f: Merge "Follow symlinks in findleaves"
5da7ec4 Merge "Follow symlinks in findleaves"
8f8b0df JOO66
3ff9b84 merge in jb-mr1-release history after reset to jb-mr1-dev
5794e58 JOO65
2e07ead merge in jb-mr1-release history after reset to jb-mr1-dev
ead692e Merge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into jb-mr1-dev
652069a JOO61F
f33d47b JZO54D
ce9ecf3 Merge "Add basic Dreams set to builds." into jb-mr1-dev
eeed3cf Add basic Dreams set to builds.
57858e4 JOO61E
59254f1 add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build
b23b98c JOO61D
3c47c4e JZO54C
47cc1d2 JOO61C
3a6f758 Add LOCAL_DONT_DELETE_JAR_META_INF
565de5c am a4f2f34a: am d6a46969: Add make_ext4fs to all builds
ef6f4f6 Add make_ext4fs to all builds
a4f2f34 am d6a46969: Add make_ext4fs to all builds
bdfc1bb JZO54B
780364f am 9993b126: am bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
9993b12 am bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
bb369a5 Merge "Add make_ext4fs to support installing apps to SD card"
e087c1d JOO61B
536c8be Add make_ext4fs to support installing apps to SD card
d6a4696 Add make_ext4fs to all builds
d105f9b JOO61
eb18def merge in jb-mr1-release history after reset to jb-mr1-dev
cdfdac2 JOO60C
6ca9e60 JOO60B
9905256 JRO03V
720c001 merge in jb-release history after reset to jb-dev
edfd538 JRO03V
dcc3cef merge in jb-release history after reset to jb-dev
8b6f24b JOO60
15556eb merge in jb-mr1-release history after reset to jb-mr1-dev

   * cts
f511e6d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
bd2c034 am c984699a: DO NOT MERGE Add missing features of JB and JB MR1
c984699 DO NOT MERGE Add missing features of JB and JB MR1
025de55 am ddf25bba: Merge "Updated Holo test assets for JB MR1" into jb-mr1-dev
d08fbca am f6163908: Merge "Some Holo Test Improvements" into jb-mr1-dev
1f33537 am 2b300c87: Merge "DO NOT MERGE Update CTS Verifier to R4" into jb-mr1-dev
ddf25bb Merge "Updated Holo test assets for JB MR1" into jb-mr1-dev
f616390 Merge "Some Holo Test Improvements" into jb-mr1-dev
2b300c8 Merge "DO NOT MERGE Update CTS Verifier to R4" into jb-mr1-dev
766e8ae merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
28e88a7 am 1792efc9: am 0f39674f: am 86632c90: am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev
1792efc am 0f39674f: am 86632c90: am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev
0f39674 am 86632c90: am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev
86632c9 am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev
29d74ad Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev
0801e93 Add missing features of JELLY_BEAN to feature list
2d55335 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
59faa6e Updated Holo test assets for JB MR1
c1ac828 am 56f85dcd: am fd8bfe07: am d56ad65d: Merge "FileSystemPermissionTest: add directories" into jb-dev
880824b am 0b16da0f: am 0fe85d3d: (-s ours) am 302fd333: DO NOT MERGE Update CTS Verifier to R5
eceda32 am 4902fcae: am f4de9d84: am 87ed6199: am a0993ab4: Merge "Restore CtsVerifier rate for passive updates" into jb-dev
77eb729 am 72604e38: am bd914e49: am e78365c9: Try reading every file on /sys
56f85dc am fd8bfe07: am d56ad65d: Merge "FileSystemPermissionTest: add directories" into jb-dev
fd8bfe0 am d56ad65d: Merge "FileSystemPermissionTest: add directories" into jb-dev
d56ad65 Merge "FileSystemPermissionTest: add directories" into jb-dev
2e09bb9 FileSystemPermissionTest: add directories
577e774 DO NOT MERGE Update CTS Verifier to R4
0b16da0 am 0fe85d3d: (-s ours) am 302fd333: DO NOT MERGE Update CTS Verifier to R5
0fe85d3 am 302fd333: DO NOT MERGE Update CTS Verifier to R5
302fd33 DO NOT MERGE Update CTS Verifier to R5
4902fca am f4de9d84: am 87ed6199: am a0993ab4: Merge "Restore CtsVerifier rate for passive updates" into jb-dev
f4de9d8 am 87ed6199: am a0993ab4: Merge "Restore CtsVerifier rate for passive updates" into jb-dev
87ed619 am a0993ab4: Merge "Restore CtsVerifier rate for passive updates" into jb-dev
a0993ab Merge "Restore CtsVerifier rate for passive updates" into jb-dev
dfc5539 Restore CtsVerifier rate for passive updates
ea818f8 Some Holo Test Improvements
72604e3 am bd914e49: am e78365c9: Try reading every file on /sys
bd914e4 am e78365c9: Try reading every file on /sys
e78365c Try reading every file on /sys
8313b73 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
03a40e3 am 70c114f3: am c13d0c87: am 320b8e53: Merge "Improve testSetNextMediaPlayer test" into jb-dev
70c114f am c13d0c87: am 320b8e53: Merge "Improve testSetNextMediaPlayer test" into jb-dev
c13d0c8 am 320b8e53: Merge "Improve testSetNextMediaPlayer test" into jb-dev
320b8e5 Merge "Improve testSetNextMediaPlayer test" into jb-dev
b741c6d am 6e4dca71: am c316843d: (-s ours) am 48a8ae0b: DO NOT MERGE Update CTS Verifier version again
6e4dca7 am c316843d: (-s ours) am 48a8ae0b: DO NOT MERGE Update CTS Verifier version again
c316843 am 48a8ae0b: DO NOT MERGE Update CTS Verifier version again
48a8ae0 DO NOT MERGE Update CTS Verifier version again
338db6d Improve testSetNextMediaPlayer test
8fad244 am 742615af: DO NOT MERGE Update CTS Verifier version to 4.2 R3
742615a DO NOT MERGE Update CTS Verifier version to 4.2 R3
ecdafb3 am 474e07d5: am a508a341: (-s ours) am 7983cd74: am 6643c75b: (-s ours) Merge "DO NOT MERGE Update CTS Verifier version to 4.1_R4" into jb-dev
b02ad5e am d116ad43: resolved conflicts for merge of dae1c7c7 to jb-mr1-dev
474e07d am a508a341: (-s ours) am 7983cd74: am 6643c75b: (-s ours) Merge "DO NOT MERGE Update CTS Verifier version to 4.1_R4" into jb-dev
d116ad4 resolved conflicts for merge of dae1c7c7 to jb-mr1-dev
a508a34 am 7983cd74: am 6643c75b: (-s ours) Merge "DO NOT MERGE Update CTS Verifier version to 4.1_R4" into jb-dev
7983cd7 am 6643c75b: (-s ours) Merge "DO NOT MERGE Update CTS Verifier version to 4.1_R4" into jb-dev
dae1c7c am 845dc036: am b37eaf51: Merge "Assert mean and stdev of update deltas" into jb-dev
6643c75 Merge "DO NOT MERGE Update CTS Verifier version to 4.1_R4" into jb-dev
845dc03 am b37eaf51: Merge "Assert mean and stdev of update deltas" into jb-dev
a5e2d96 DO NOT MERGE Update CTS Verifier version to 4.1_R4
b37eaf5 Merge "Assert mean and stdev of update deltas" into jb-dev
4680985 Assert mean and stdev of update deltas
24dc7b9 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
e9bc5ff am 805ed151: am ddd1fee3: am ed960a8f: Add CVE to Exynos vulnerability test.
805ed15 am ddd1fee3: am ed960a8f: Add CVE to Exynos vulnerability test.
ddd1fee am ed960a8f: Add CVE to Exynos vulnerability test.
ed960a8 Add CVE to Exynos vulnerability test.
ed0c32d am 5cb152dd: am 3477c93b: (-s ours) am d2cdc11d: am 58deb9cb: (-s ours) Merge "DO NOT MERGE Update CTS Verifier Version to 4.1_R3" into jb-dev
2af6d03 am cc0eae7f: am 931dcd41: (-s ours) am 11852804: am 96b24f58: (-s ours) Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev
b70c118 am ab9442de: am bf5b176b: (-s ours) am c985363a: am b45af1bf: (-s ours) Merge "DO NOT MERGE Filter out the overdue location cases in GPS test" into jb-dev
5cb152d am 3477c93b: (-s ours) am d2cdc11d: am 58deb9cb: (-s ours) Merge "DO NOT MERGE Update CTS Verifier Version to 4.1_R3" into jb-dev
cc0eae7 am 931dcd41: (-s ours) am 11852804: am 96b24f58: (-s ours) Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev
ab9442d am bf5b176b: (-s ours) am c985363a: am b45af1bf: (-s ours) Merge "DO NOT MERGE Filter out the overdue location cases in GPS test" into jb-dev
3477c93 am d2cdc11d: am 58deb9cb: (-s ours) Merge "DO NOT MERGE Update CTS Verifier Version to 4.1_R3" into jb-dev
931dcd4 am 11852804: am 96b24f58: (-s ours) Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev
bf5b176 am c985363a: am b45af1bf: (-s ours) Merge "DO NOT MERGE Filter out the overdue location cases in GPS test" into jb-dev
d2cdc11 am 58deb9cb: (-s ours) Merge "DO NOT MERGE Update CTS Verifier Version to 4.1_R3" into jb-dev
1185280 am 96b24f58: (-s ours) Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev
c985363 am b45af1bf: (-s ours) Merge "DO NOT MERGE Filter out the overdue location cases in GPS test" into jb-dev
f0d1763 am b2fd3396: am a1752310: (-s ours) am b1c24eb3: DO NOT MERGE Update CTS Verifier Version to 4.1_R3
a4b8c94 am 089e32c0: am b4a9859d: (-s ours) am db83ff3d: DO NOT MERGE Relax LocationVerifier assertions.
9ac9460 am 94aa7e6c: am e322c882: (-s ours) am 02659771: DO NOT MERGE Filter out the overdue location cases in GPS test
b2fd339 am a1752310: (-s ours) am b1c24eb3: DO NOT MERGE Update CTS Verifier Version to 4.1_R3
089e32c am b4a9859d: (-s ours) am db83ff3d: DO NOT MERGE Relax LocationVerifier assertions.
94aa7e6 am e322c882: (-s ours) am 02659771: DO NOT MERGE Filter out the overdue location cases in GPS test
a175231 am b1c24eb3: DO NOT MERGE Update CTS Verifier Version to 4.1_R3
b4a9859 am db83ff3d: DO NOT MERGE Relax LocationVerifier assertions.
e322c88 am 02659771: DO NOT MERGE Filter out the overdue location cases in GPS test
b1c24eb DO NOT MERGE Update CTS Verifier Version to 4.1_R3
db83ff3 DO NOT MERGE Relax LocationVerifier assertions.
0265977 DO NOT MERGE Filter out the overdue location cases in GPS test
6239a80 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
a7ba00f am 9f289a4e: DO NOT MERGE Update CTS Verifier Version to 4.2_r2
5ae31fe am d3ad2815: DO NOT MERGE Relax LocationVerifier assertions.
9f289a4 DO NOT MERGE Update CTS Verifier Version to 4.2_r2
d3ad281 DO NOT MERGE Relax LocationVerifier assertions.
460cdea DO NOT MERGE Update CTS Verifier Version to 4.2_r2
73ea372 DO NOT MERGE Relax LocationVerifier assertions.
58deb9c Merge "DO NOT MERGE Update CTS Verifier Version to 4.1_R3" into jb-dev
96b24f5 Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev
b45af1b Merge "DO NOT MERGE Filter out the overdue location cases in GPS test" into jb-dev
4eac3aa DO NOT MERGE Update CTS Verifier Version to 4.1_R3
dedda1b DO NOT MERGE Relax LocationVerifier assertions.
49fba15 DO NOT MERGE Filter out the overdue location cases in GPS test
7424e2b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
55bfd81 am f181a506: am 78e17b3e: am 65374948: Add Exynos vulnerability tests.
f181a50 am 78e17b3e: am 65374948: Add Exynos vulnerability tests.
78e17b3 am 65374948: Add Exynos vulnerability tests.
6537494 Add Exynos vulnerability tests.
8885a36 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
73a9690 am 44b6afc6: am 3afa402b: am 846e9bb2: Merge "Add test for MediaScanner misbehavior" into jb-dev
44b6afc am 3afa402b: am 846e9bb2: Merge "Add test for MediaScanner misbehavior" into jb-dev
3afa402 am 846e9bb2: Merge "Add test for MediaScanner misbehavior" into jb-dev
846e9bb Merge "Add test for MediaScanner misbehavior" into jb-dev
cbc5e9c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
5f09dd2 am 2cf0a398: Merge "CTS tests for UiAutomator at API 17" into jb-mr1-dev
2cf0a39 Merge "CTS tests for UiAutomator at API 17" into jb-mr1-dev
454631c CTS tests for UiAutomator at API 17
698bc40 am 48138683: am e22e8b80: am 2bf7a779: Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev
031e99b am d20ea30f: am d0c50f2b: am de326fe1: Add a CTS test that iterates through all codecs using MediaCodecList and
4813868 am e22e8b80: am 2bf7a779: Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev
d20ea30 am d0c50f2b: am de326fe1: Add a CTS test that iterates through all codecs using MediaCodecList and
e22e8b8 am 2bf7a779: Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev
d0c50f2 am de326fe1: Add a CTS test that iterates through all codecs using MediaCodecList and
2bf7a77 Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev
e504c24 Add test for MediaScanner misbehavior
de326fe Add a CTS test that iterates through all codecs using MediaCodecList and
3a59dce Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)
6b9424f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b36b1ad am df312ed8: am 25e067b7: am 20d6f50b: Fixed a mistakenly deleted line from the last submit
df312ed am 25e067b7: am 20d6f50b: Fixed a mistakenly deleted line from the last submit
25e067b am 20d6f50b: Fixed a mistakenly deleted line from the last submit
e997275 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
20d6f50 Fixed a mistakenly deleted line from the last submit
a0cb57e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4cde3ee Merge "Update BuildVersionTest to support 4.2.2" into jb-mr1.1-dev
9c61160 Merge "Fix ringtone test" into jb-mr1.1-dev
9a90263 Fix ringtone test
029ed3f Update BuildVersionTest to support 4.2.2
c5b61b9 am 87dcc055: am f24936aa: am 01893119: Merge "UiAutomator test APK and Tests for CTS" into jb-dev
87dcc05 am f24936aa: am 01893119: Merge "UiAutomator test APK and Tests for CTS" into jb-dev
f24936a am 01893119: Merge "UiAutomator test APK and Tests for CTS" into jb-dev
0189311 Merge "UiAutomator test APK and Tests for CTS" into jb-dev
d2f1fd5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
65c4d7f am 241c83a6: am ca2bacb2: am f26c044c: CTS Verifier: Fix Camera Formats preview orientation.
241c83a am ca2bacb2: am f26c044c: CTS Verifier: Fix Camera Formats preview orientation.
ca2bacb am f26c044c: CTS Verifier: Fix Camera Formats preview orientation.
4f6c5d7 Fix bug #7664208 android.widget.cts.TextViewTest#testResetTextAlignment failures on JD
f26c044 CTS Verifier: Fix Camera Formats preview orientation.
f0d2af3 Fix bug #7664305  android.widget.cts.TextViewTest#testResetTextDirection failures on JD
7432633 UiAutomator test APK and Tests for CTS
b259b72 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
01aa299 Merge "Add more CTS tests for the reset of RTL properties" into jb-mr1.1-dev
8588774 am ed5d436f: am 1877550c: am 227fb7be: DO NOR MERGE make reboot default in CTS (merge from mr1)
ed5d436 am 1877550c: am 227fb7be: DO NOR MERGE make reboot default in CTS (merge from mr1)
1877550 am 227fb7be: DO NOR MERGE make reboot default in CTS (merge from mr1)
e328d6f Add more CTS tests for the reset of RTL properties
227fb7b DO NOR MERGE make reboot default in CTS (merge from mr1)
df681df5 am ca9ed143: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
ca9ed14 Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
74bf01f Merge "add log to print time-out when time-out happens" into jb-mr1.1-dev
7871c2b add log to print time-out when time-out happens
d27c75a am 4acf1dec: am 0b1ffe19: am 40a2d7e1: Add more tests for restricted broadcasts.
4acf1de am 0b1ffe19: am 40a2d7e1: Add more tests for restricted broadcasts.
0b1ffe1 am 40a2d7e1: Add more tests for restricted broadcasts.
40a2d7e Add more tests for restricted broadcasts.
22f52c5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
c04c151 am ee5352a6: Merge "add 4.2.1 to version list" into jb-mr1-dev
ee5352a Merge "add 4.2.1 to version list" into jb-mr1-dev
21d244b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
28e3b1c am f2f107cd: Merge "Add NumberPicker CTS tests." into jb-mr1-dev
f2f107c Merge "Add NumberPicker CTS tests." into jb-mr1-dev
0e60c1b am 65ef06bc: Merge "change all file writes to random access with O_SYNC" into jb-mr1-dev
65ef06b Merge "change all file writes to random access with O_SYNC" into jb-mr1-dev
91724c7 add 4.2.1 to version list
ef35bfd Cannot move edit text cursor to first position using character granularity.
f33f669 am 8ac0ab57: Merge "Fix the shell commands used to clean up after the accessibility tests." into jb-mr1-dev
8ac0ab5 Merge "Fix the shell commands used to clean up after the accessibility tests." into jb-mr1-dev
af2e3ec am 526ec7d6: resolved conflicts for merge of b1092aea to jb-mr1-dev
f1a4720 change all file writes to random access with O_SYNC
526ec7d resolved conflicts for merge of b1092aea to jb-mr1-dev
b1092ae am 1922bf5e: Merge "Add UiAutomator test skeleton to CTS." into jb-dev
1922bf5 Merge "Add UiAutomator test skeleton to CTS." into jb-dev
546334a am ab997d9e: am f578d375: am dc1cad9b: FileSystemPermissionTest: Expand block device tests.
ab997d9 am f578d375: am dc1cad9b: FileSystemPermissionTest: Expand block device tests.
f578d37 am dc1cad9b: FileSystemPermissionTest: Expand block device tests.
27f0ee2 Add UiAutomator test skeleton to CTS.
7c8f0c3 Fix the shell commands used to clean up after the accessibility tests.
9342d63 Add NumberPicker CTS tests.
dc1cad9 FileSystemPermissionTest: Expand block device tests.
6a000b6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f4786a5 am 5ed832af: Merge "Camera: New test to check app firing intent after capturing picture/video" into jb-mr1-dev
5ed832a Merge "Camera: New test to check app firing intent after capturing picture/video" into jb-mr1-dev
f7206d9 am 6ab432b1: Merge "Report suite name to result server" into jb-mr1-dev
6ab432b Merge "Report suite name to result server" into jb-mr1-dev
987e33c am b974519f: Merge "force reboot after accessibility test" into jb-mr1-dev
b974519 Merge "force reboot after accessibility test" into jb-mr1-dev
8a3df62 force reboot after accessibility test
bce0a82 am c5215ac7: Version number for CTS 4.2 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
c5215ac Version number for CTS 4.2 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
5573a4d Report suite name to result server
26f41e5 Reconcile with jb-mr1-release - do not merge
5f330b9 merge in jb-mr1-release history after reset to jb-mr1-dev
3d8a951 am 38c4a564: Merge "Increase timeout for testSetMaxFileSize test" into jb-mr1-dev
38c4a56 Merge "Increase timeout for testSetMaxFileSize test" into jb-mr1-dev
1375b66 Increase timeout for testSetMaxFileSize test
b1f4122 Reconcile with jb-mr1-release - do not merge
c8c7425 merge in jb-mr1-release history after reset to jb-mr1-dev
a6866e8 am 39c16ef7: Merge "Add a CTS test for when location is already within geofence." into jb-mr1-dev
d24ee44 am 86bfc4c8: Merge "add more buffer sizes for dram test" into jb-mr1-dev
39c16ef Merge "Add a CTS test for when location is already within geofence." into jb-mr1-dev
86bfc4c Merge "add more buffer sizes for dram test" into jb-mr1-dev
697f564 add more buffer sizes for dram test
bcc96db Reconcile with jb-mr1-release - do not merge
05f8b21 merge in jb-mr1-release history after reset to jb-mr1-dev
70c514c am 376449ba: Merge "add browser benchmarking" into jb-mr1-dev
376449b Merge "add browser benchmarking" into jb-mr1-dev
5a993ee am 210e6c10: Camera: Relax video snapshot size requirements.
210e6c1 Camera: Relax video snapshot size requirements.
8f07838 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
f1d8ca6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
8451c93 merge in jb-mr1-release history after reset to jb-mr1-dev
c9d611f Camera: Increase timeout for long-running test.
48f86e7 Camera: New test to check app firing intent after capturing picture/video
fcda459 Add a CTS test for when location is already within geofence.
4997974 merge in jb-mr1-release history after reset to jb-mr1-dev
680f51a Merge "Prevent monkey tests from toggling airplane mode" into jb-mr1-dev
2bc46e6 Prevent monkey tests from toggling airplane mode
c02dd25 am 959103e6: am a0925c0b: Merge "PackageSignatureTest: detect devkeys." into jb-dev
959103e am a0925c0b: Merge "PackageSignatureTest: detect devkeys." into jb-dev
a0925c0 Merge "PackageSignatureTest: detect devkeys." into jb-dev
9b82431 merge in jb-mr1-release history after reset to jb-mr1-dev
9a3e471 am c8e0c063: am b9d8a878: Merge "Revert "Add test for exposed javascript interfaces."" into jb-dev
c8e0c06 am b9d8a878: Merge "Revert "Add test for exposed javascript interfaces."" into jb-dev
b9d8a87 Merge "Revert "Add test for exposed javascript interfaces."" into jb-dev
abd7f62 Revert "Add test for exposed javascript interfaces."
af850dc am 0aa26429: am 9d782c70: Merge "Add test for exposed javascript interfaces." into jb-dev
0aa2642 am 9d782c70: Merge "Add test for exposed javascript interfaces." into jb-dev
9d782c7 Merge "Add test for exposed javascript interfaces." into jb-dev
37eaaa0 Remove tests for Fused Location
1c0bcea PackageSignatureTest: detect devkeys.
33b3414 add browser benchmarking
cd8c94b merge in jb-mr1-release history after reset to jb-mr1-dev
ce69296 Merge "add taskswitching / install time measurement" into jb-mr1-dev
caee852 merge in jb-mr1-release history after reset to jb-mr1-dev
f7b911b add taskswitching / install time measurement
3d6800b merge in jb-mr1-release history after reset to jb-mr1-dev
e95b2da merge in jb-mr1-release history after reset to jb-mr1-dev
33ffa2e Fix race condition causing occasional CTS failures.
8bd80bf Merge "Add more CTS test for TextView and Drawables" into jb-mr1-dev
b44fc86 Add more CTS test for TextView and Drawables
e65f3e7 Merge "Make the cts test record a bit longer" into jb-mr1-dev
b3aa8bd Tests to ensure FTS3/4 SQLite support.
d63f7cf Make the cts test record a bit longer
85ff441 merge in jb-mr1-release history after reset to jb-mr1-dev
c299f15 Merge "Location CTS tests without fine permission" into jb-mr1-dev
ff4722b Retry geocode tests 5 times
dd1753f merge in jb-mr1-release history after reset to jb-mr1-dev
53f1b15 Merge "adjust  haptic feedback test for device without vibrator" into jb-mr1-dev
363d83e adjust  haptic feedback test for device without vibrator
d46683f Merge "Added CTS test for calendarcommon package." into jb-mr1-dev
c8eab63 fix timing issue
8aad20c merge in jb-mr1-release history after reset to jb-mr1-dev
207bd1e Added CTS test for calendarcommon package.
302d06b Merge "increase timeout of H263QcifLong to 11mins" into jb-mr1-dev
63c0933 Merge "Remove multi-user OBB tests; verify path security." into jb-mr1-dev
d7dcc04 increase timeout of H263QcifLong to 11mins
ecd1330 Merge "Record latency test not applicable per revised CDD" into jb-mr1-dev
051b2b6 merge in jb-mr1-release history after reset to jb-mr1-dev
fe08d27 Merge "change summary to average/stddev rather than average/worst" into jb-mr1-dev
89e4665 merge in jb-mr1-release history after reset to jb-mr1-dev
50ecfe6 Merge "Fix CTS issue #7379336" into jb-mr1-dev
f1d71ef Remove multi-user OBB tests; verify path security.
184b929 Fix CTS issue #7379336
7790b1a Merge "Added unit test for whenByDay query" into jb-mr1-dev
1297359 Record latency test not applicable per revised CDD
ab673ed Merge "Add CTS test for EVENT_REMINDER broadcast during reminder times." into jb-mr1-dev
db6d35d merge in jb-mr1-release history after reset to jb-mr1-dev
6503acb Added unit test for whenByDay query
bbcc977 Merge "Improve external storage CTS tests." into jb-mr1-dev
8cb5b6b Improve external storage CTS tests.
69cd844 Add CTS test for EVENT_REMINDER broadcast during reminder times.
ee3e82e merge in jb-mr1-release history after reset to jb-mr1-dev
61ca41b Fix HoloTest instability
3db9ea6 Location CTS tests without fine permission
2a89c1e Merge "Revert "Test that rs_script_call_t works properly."" into jb-mr1-dev
2e8627a Revert "Test that rs_script_call_t works properly."
4d81677 Merge "Test that rs_script_call_t works properly." into jb-mr1-dev
8e07d15 merge in jb-mr1-release history after reset to jb-mr1-dev
54b4f23 Merge "Make packet count test more robust" into jb-mr1-dev
5a840e5 Make packet count test more robust
fb951e0 merge in jb-mr1-release history after reset to jb-mr1-dev
72ebb23 Test that rs_script_call_t works properly.
97b8448 Merge "bluetooth CTS test failure." into jb-mr1-dev
31d4d82 change summary to average/stddev rather than average/worst
759531a bluetooth CTS test failure.
b749e15 make reboot default in CTS
3dabcbe merge in jb-mr1-release history after reset to jb-mr1-dev
53ccea6 Merge "Increase timeout for test" into jb-mr1-dev
b9a59c4 merge in jb-mr1-release history after reset to jb-mr1-dev
b3fe87a Increase timeout for test
263441c Merge "Add configChange screenSize" into jb-mr1-dev
1e5fb76 Merge "Filter out the overdue location cases in GPS test" into jb-mr1-dev
83af7fe Merge "CTS tests to verify multi-user emulated storage." into jb-mr1-dev
6bcdc7d Add configChange screenSize
b783be4 Filter out the overdue location cases in GPS test
d47ac65 Merge "Add ScriptGroupTest to CTS." into jb-mr1-dev
aa9aaf0 merge in jb-mr1-release history after reset to jb-mr1-dev
93cc2d9 Add ScriptGroupTest to CTS.
54ea807 Add test for exposed javascript interfaces.
56fc685 Tests to verify dump() on services is protected.
429cd4e CTS tests to verify multi-user emulated storage.
d9e26c9 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
29495c6 merge in jb-mr1-release history after reset to jb-mr1-dev
a0030ef More Holo fixes
27e9e17 merge in jb-mr1-release history after reset to jb-mr1-dev
b070b70 VBO test is a known failure
3691b0c merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1f7f062 merge in jb-mr1-release history after reset to jb-mr1-dev
13bdd31 Merge "Holo assets for TVDPI" into jb-mr1-dev
5703707 Holo assets for TVDPI
0ed72c7 nuke some android.opengl.cts.AttachShaderTest and NativeAttachShaderTest
eec7466 Merge "Remove AbsoluteLayout check for AttributeSet NPE" into jb-mr1-dev
70d0023 nuke RTSP tests from StreamingMediaPlayerTest
b6b69cb Remove AbsoluteLayout check for AttributeSet NPE
41c2905 merge in jb-mr1-release history after reset to jb-mr1-dev
bdbb811 Merge "change string setting to read to ANDROID_ID" into jb-mr1-dev
f699450 Merge "nuke MediaPlayerFlakyNetworkTest" into jb-mr1-dev
5b64b75 Merge "remove exception check from RelativeLayout.LayoutParams" into jb-mr1-dev
a987f68 Merge "nuke android.opengl.cts.AttachShaderTest#test_glAttachedShaders_attach_same_shader" into jb-mr1-dev
623a64c remove exception check from RelativeLayout.LayoutParams
623719e am 2b4e90cf: am 4c4d1a6d: FileSystemPermissionTest: Add /data/fics/...
2b4e90c am 4c4d1a6d: FileSystemPermissionTest: Add /data/fics/...
66cf41f change string setting to read to ANDROID_ID
4c4d1a6 FileSystemPermissionTest: Add /data/fics/...
24428b8 nuke android.opengl.cts.AttachShaderTest#test_glAttachedShaders_attach_same_shader
b1677ec nuke MediaPlayerFlakyNetworkTest
6304f6b merge in jb-mr1-release history after reset to jb-mr1-dev
b71ee34 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
6409161 Merge "Fix BitmapTest.testCopyPixelsToBuffer()" into jb-mr1-dev
9036731 merge in jb-mr1-release history after reset to jb-mr1-dev
a6369cf Merge "Fix MediaRandomTest watchdog affecting other tests" into jb-mr1-dev
6edb217 Fix MediaRandomTest watchdog affecting other tests
8d172b0 merge in jb-mr1-release history after reset to jb-mr1-dev
d747bec Merge "Fix android.hardware.cts.CameraTest#testPreviewFormats" into jb-mr1-dev
b7b3684 Fix android.hardware.cts.CameraTest#testPreviewFormats
edd46ae Merge "CTS change for bug 7301594 Html.toHtml ... invalid html" into jb-mr1-dev
5208c6b Fix BitmapTest.testCopyPixelsToBuffer()
c8ec132 CTS change for bug 7301594 Html.toHtml ... invalid html
994485d merge in jb-mr1-release history after reset to jb-mr1-dev
729a2ca Merge "Fixing the build." into jb-mr1-dev
59c73cb Fixing the build.
9efc519 Merge "Wait between setting locations in Geofencing tests" into jb-mr1-dev
bc09b8e Merge "Fixing a broken CTS test." into jb-mr1-dev
4318021 Fixing a broken CTS test.
8084b81 Merge "Fix for bug: 6949347. RelativeLayoutTest#testGenerateLayoutParams1 failure." into jb-mr1-dev
235914c Fix for bug: 6949347. RelativeLayoutTest#testGenerateLayoutParams1 failure.
33df5c6 Merge "Fix ViewGroup_MarginLayoutParamsTest failures" into jb-mr1-dev
5703399 Fix ViewGroup_MarginLayoutParamsTest failures
73b280c Merge "Fix android.cts.text.TextUtilsTest#testEllipsize test" into jb-mr1-dev
e6ba777 Merge "CTS... Bug #6950508" into jb-mr1-dev
2717ed1 CTS... Bug #6950508
c20ce81 Merge "fix android.nativemedia.sl.SLObjectCreationTest#testAudioRecorderCreation test" into jb-mr1-dev
5ea5cd5 fix android.nativemedia.sl.SLObjectCreationTest#testAudioRecorderCreation test
cc883b9 Fix android.cts.text.TextUtilsTest#testEllipsize test
48b37fc merge in jb-mr1-release history after reset to jb-mr1-dev
fc8ee3a Merge "Fix density tests." into jb-mr1-dev
1b7bc04 Merge "bump up expected version to 4.2 and SDK to 17" into jb-mr1-dev
176c763 Wait between setting locations in Geofencing tests
f8d2ee2 bump up expected version to 4.2 and SDK to 17
22c10fd Fix density tests.
8943910 Merge "fix broken ColorBufferTest" into jb-mr1-dev
78a5480 am 767ee659: (-s ours) am 7093537c: DO NOT MERGE
767ee65 am 7093537c: DO NOT MERGE
4615f13 fix broken ColorBufferTest
8188f75 Merge "add bootup time measurement with infra for host test" into jb-mr1-dev
7093537 DO NOT MERGE
4e6d45f nuke AttachShaderTest#test_glAttachShaders_successfulcompile_attach_invalid_handle_frag - having no crashing stack for wrong parameter is nice to have feature
ad3b971 merge in jb-mr1-release history after reset to jb-mr1-dev
a0296d6 Merge "Fix orientation test and improve its instructions" into jb-mr1-dev
14a5bfa add bootup time measurement with infra for host test
35462d6 Merge "comment out testResourceLeakageTest" into jb-mr1-dev
2566538 nuke webkit security tests
c0ef6f8 comment out testResourceLeakageTest
976971e Merge "Fix incorrect tests Bug #7262921 Bug #7198966 Bug #7203333" into jb-mr1-dev
6cdb868 Fix orientation test and improve its instructions
48dcf20 Merge "Call makeComplete() on Location object." into jb-mr1-dev
897562a merge in jb-mr1-release history after reset to jb-mr1-dev
95fe677 Fix incorrect tests Bug #7262921 Bug #7198966 Bug #7203333
8b6a514 Merge "remove navigation bar related changes which break in some devices" into jb-mr1-dev
b83981c Call makeComplete() on Location object.
45bf152 Merge "add more cases to AlmostFull case" into jb-mr1-dev
813d61b remove navigation bar related changes which break in some devices
01dc670 Merge "Tests that are supposed to fail shouldn't be written to succeed Bug #6950508" into jb-mr1-dev
1f07cb6 Tests that are supposed to fail shouldn't be written to succeed Bug #6950508
45c7a1d am ceae8ba1: am b855e7f0: FileSystemPermissionTest: Add /data/vpnch
ceae8ba am b855e7f0: FileSystemPermissionTest: Add /data/vpnch
e0ca0b0 merge in jb-mr1-release history after reset to jb-mr1-dev
b043ccc Delete a bad CTS test.
2ffddec Fix CTS test failures.
e900c2d add more cases to AlmostFull case
b855e7f FileSystemPermissionTest: Add /data/vpnch
89e635a Merge "Add CTS test for new column 'uid2445' in Calendar provider." into jb-mr1-dev
9124548 am a10f83bf: (-s ours) am f5fb9cab: DO NOT MERGE Fix for Holo failures
a10f83b am f5fb9cab: DO NOT MERGE Fix for Holo failures
f5fb9ca DO NOT MERGE Fix for Holo failures
9c49116 Add CTS test for new column 'uid2445' in Calendar provider.
dbaf2e4 merge in jb-mr1-release history after reset to jb-mr1-dev
de1e9f0 Merge "VoldExploitTest: update testTryCommandInjection" into jb-mr1-dev
1e125cd VoldExploitTest: update testTryCommandInjection
4adc710 am 5758b554: am 69adcd76: change AudioTrack mode to MUSIC & add details to report
5758b55 am 69adcd76: change AudioTrack mode to MUSIC & add details to report
69adcd7 change AudioTrack mode to MUSIC & add details to report
b59f84c merge in jb-mr1-release history after reset to jb-mr1-dev
f4c4f6c Merge "Camera orientation test updates" into jb-mr1-dev
231e4ef Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
83a08a8 Merge "Fix various problems with NativeMediaTest CTS" into jb-mr1-dev
73f0646 Merge "Improve CTS tests for testing text alignment" into jb-mr1-dev
082b396 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
e148375 Fix various problems with NativeMediaTest CTS
738030a Camera orientation test updates
cfe0ba9 merge in jb-mr1-release history after reset to jb-mr1-dev
06a64fd Merge "Update references to migrated global settings." into jb-mr1-dev
01440c4 Merge "Adding a test for the new global accessibility action." into jb-mr1-dev
c54cd5a Update references to migrated global settings.
01488cf Merge "add dram bandwidth measurement & random read/write" into jb-mr1-dev
4403e50 add dram bandwidth measurement & random read/write
cccec94 merge in jb-mr1-release history after reset to jb-mr1-dev
757ec4f Improve CTS tests for testing text alignment
d8b0520 Merge changes I07c122d5,I977fdb7b into jb-mr1-dev
078f5bd Merge "Fix broken test Bug #7162515" into jb-mr1-dev
a7bdc00 Fix broken test Bug #7162515
40c5bd2 am 140309cc: am 615e86d5: FileSystemPermissionTest: Add /data/panic
140309c am 615e86d5: FileSystemPermissionTest: Add /data/panic
615e86d FileSystemPermissionTest: Add /data/panic
c2f2fef Adding a test for the new global accessibility action.
414e010 Merge "Take volume cap into account in CTS" into jb-mr1-dev
1a9c499 Merge "Add Calendar Provider Tests for new columns" into jb-mr1-dev
018fdee Take volume cap into account in CTS
87f8950 am 2915d96b: am 325668ae: am aeef3cb2: Merge "Allow some time for recording in testVideoSnapshot" into jb-dev
2db8ee1 am a522237a: am 17fd1a8d: Merge "Reset jpeg rotation in CameraTest.testJpegExif." into jb-dev
2915d96 am 325668ae: am aeef3cb2: Merge "Allow some time for recording in testVideoSnapshot" into jb-dev
a522237 am 17fd1a8d: Merge "Reset jpeg rotation in CameraTest.testJpegExif." into jb-dev
325668a am aeef3cb2: Merge "Allow some time for recording in testVideoSnapshot" into jb-dev
aeef3cb Merge "Allow some time for recording in testVideoSnapshot" into jb-dev
c80a33c merge in jb-mr1-release history after reset to jb-mr1-dev
b655cd1 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
7fc9490 Fix bug #6427629 Clean up layout direction APIs
05be065 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
4fe7952 Merge "Verify pass-by-value kernels for Renderscript." into jb-mr1-dev
2a9c5b3 Fix bug #6427629 Clean up layout direction APIs
889acfd Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
952eb56 Fix bug #6427629 Clean up layout direction APIs
f2b54a4 Camera: Add test for enableShutterSound
4c86a54 Cts Verifier: Use new android.hardware.camera.any feature.
3b582db Merge "Add checks for FEATURE_CAMERA_ANY being reported properly." into jb-mr1-dev
7109287 Merge "Adds a test case for MediaPlayer's deselectTrack()." into jb-mr1-dev
2e39f03 Add checks for FEATURE_CAMERA_ANY being reported properly.
17fd1a8 Merge "Reset jpeg rotation in CameraTest.testJpegExif." into jb-dev
410b1ce Verify pass-by-value kernels for Renderscript.
b9f6a07 Adds a test case for MediaPlayer's deselectTrack().
60d2c97 Add Calendar Provider Tests for new columns
95348d0 Allow some time for recording in testVideoSnapshot
d946dcd merge in jb-mr1-release history after reset to jb-mr1-dev
8603316 Merge "Make the SettingsProvider CTS test less flaky" into jb-mr1-dev
e84594a Make the SettingsProvider CTS test less flaky
0f29e44 Merge "Added test for camera orientation" into jb-mr1-dev
f4ef106 Merge "Fix race condition causing CTS failures: bug 6951063" into jb-mr1-dev
fa2e166 Added test for camera orientation
6a21ad7 Fix race condition causing CTS failures: bug 6951063
c3b346f Merge "separate summary from details in report" into jb-mr1-dev
3e0a637 separate summary from details in report
a652141 Reset jpeg rotation in CameraTest.testJpegExif.
76d0e43 merge in jb-mr1-release history after reset to jb-mr1-dev
61d53bf Merge "decrease empty disk space to 400MB for update test" into jb-mr1-dev
8115f56 decrease empty disk space to 400MB for update test
0a57a64 am e5002115: resolved conflicts for merge of 4839842b to jb-dev-plus-aosp
e500211 resolved conflicts for merge of 4839842b to jb-dev-plus-aosp
4839842 Merge "Replace Maps with UserDictionarySettings to trigger database writes" into jb-dev
f96cd2a change to CtsTestRunner to handle keyguard issue
8ef7478 Merge "add timeout per package for PTS" into jb-mr1-dev
0617746 Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev
3424656 add timeout per package for PTS
5dd5aee Merge "CtsVerifier: Hide CameraAnalyzer test until it's ready." into jb-mr1-dev
754df96 CtsVerifier: Hide CameraAnalyzer test until it's ready.
4219626 Fix bug #7173351 API REVIEW: android.util.LocaleUtil
c1fbb2e Merge "Update cts StaticLayoutLineBreakingTest for IS class" into jb-mr1-dev
dcabd9a am 259aedec: am a567a8cb: change log MSG level to error
259aede am a567a8cb: change log MSG level to error
32918bf merge in jb-mr1-release history after reset to jb-mr1-dev
9450484 Merge "Fix expected value for autogenerated view IDs in RadioGroups" into jb-mr1-dev
2f5fb6d Merge "Fix NetworkInfo CTS test." into jb-mr1-dev
e720a53 Merge "performance test initial work" into jb-mr1-dev
24b6b12 Merge "Comply with new addjavascriptinterface enforcement" into jb-mr1-dev
03e4b02 Fix NetworkInfo CTS test.
4198a89 Fix expected value for autogenerated view IDs in RadioGroups
a567a8c change log MSG level to error
6bf19d3 Comply with new addjavascriptinterface enforcement
0b3c6f6 Replace Maps with UserDictionarySettings to trigger database writes
64eddae Track CLDR update.
2f961a1 Track CLDR changes.
3769d33 performance test initial work
50455b3 Revert "performace test initial work"
b6ea46e performace test initial work
15ee2dd am 1b3ac2b0: am 76ccae16: FileSystemPermissionTest: Add directories.
1b3ac2b am 76ccae16: FileSystemPermissionTest: Add directories.
1f0c9b1 merge in jb-mr1-release history after reset to jb-mr1-dev
24c09ae Fixing some accessiblity CTS test failures.
4c034da Merge "adjust sdcard dir" into jb-mr1-dev
b7d457c adjust sdcard dir
76ccae1 FileSystemPermissionTest: Add directories.
73eb23d am 129a2b5c: am 0f377c07: am 833122f3: Merge "FileSystemPermissionTest: Add directories."
129a2b5 am 0f377c07: am 833122f3: Merge "FileSystemPermissionTest: Add directories."
0f377c0 am 833122f3: Merge "FileSystemPermissionTest: Add directories."
a8ac918 am e858cc6c: am 9deaad2f: Verify dmesg_restrict is set.
e858cc6 am 9deaad2f: Verify dmesg_restrict is set.
f41d43a Update cts StaticLayoutLineBreakingTest for IS class
833122f Merge "FileSystemPermissionTest: Add directories."
f2a19b0 FileSystemPermissionTest: Add directories.
9deaad2 Verify dmesg_restrict is set.
4768d69 Fix build by fixing CTS tests following API change
30d8104 merge in jb-mr1-release history after reset to jb-mr1-dev
a0654af am 3fc7db75: am 0a216235: Merge "Add UID isolation CTS test." into jb-dev
3fc7db7 am 0a216235: Merge "Add UID isolation CTS test." into jb-dev
0a21623 Merge "Add UID isolation CTS test." into jb-dev
de46166 Add UID isolation CTS test.
998ca90 merge in jb-mr1-release history after reset to jb-mr1-dev
cb2da98 Update ConfigurationTest in CTS
d098e1d Merge "Update LocaleUtilTest in CTS" into jb-mr1-dev
31356f9 Update LocaleUtilTest in CTS
8ebf344 Merge "Add support for "-rtl" in resources" into jb-mr1-dev
a2c3201 am 32bb758a: am 179c7328: am 3f76f124: Merge "Fix CTS case testGetDeviceId of TelephonyManagerTest"
bf1dc9c am d2edad8b: am ee77c74f: am c82d63c2: Merge "Replace Maps with UserDictionarySettings to trigger database writes"
32bb758 am 179c7328: am 3f76f124: Merge "Fix CTS case testGetDeviceId of TelephonyManagerTest"
d2edad8 am ee77c74f: am c82d63c2: Merge "Replace Maps with UserDictionarySettings to trigger database writes"
179c732 am 3f76f124: Merge "Fix CTS case testGetDeviceId of TelephonyManagerTest"
ee77c74 am c82d63c2: Merge "Replace Maps with UserDictionarySettings to trigger database writes"
7121e8f am 800a7275: am 41406a64: am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev
3f76f12 Merge "Fix CTS case testGetDeviceId of TelephonyManagerTest"
800a727 am 41406a64: am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev
41406a6 am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev
c82d63c Merge "Replace Maps with UserDictionarySettings to trigger database writes"
d866ed0 Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev
7271a90 merge in jb-mr1-release history after reset to jb-mr1-dev
51610de Merge "Add permission tests for PackageManager pending installs." into jb-mr1-dev
e3c3dc9 am 9b620cba: am 4e452240: am b8664b37: Merge "According to external test, delete playlists after inserting internal data. It will keep clean environment."
9b620cb am 4e452240: am b8664b37: Merge "According to external test, delete playlists after inserting internal data. It will keep clean environment."
4e45224 am b8664b37: Merge "According to external test, delete playlists after inserting internal data. It will keep clean environment."
b8664b3 Merge "According to external test, delete playlists after inserting internal data. It will keep clean environment."
3a18718 According to external test, delete playlists after inserting internal data. It will keep clean environment.
0bdeeeb Add permission tests for PackageManager pending installs.
21ebe6d Don't delete META-INF carried by the core-tests jar.
47d6cbe merge in jb-mr1-release history after reset to jb-mr1-dev
9252d22 am 1b9bcc8f: (-s ours) am 983740d3: merge reboot after / before from mr1 DO NOT MERGE
1b9bcc8 am 983740d3: merge reboot after / before from mr1 DO NOT MERGE
983740d merge reboot after / before from mr1 DO NOT MERGE
bb529db fix android.core.vm-tests-tf
e990a94 merge in jb-mr1-release history after reset to jb-mr1-dev

   * dalvik
37e8ce4 JIT: Combine add with shift and offset for array load & store.
36141f9 JIT: Combine add with shift.
f3485c4 JIT: Hoist loop load operations above loop.
a5830d7 JIT: Use rsb and shift in easy multiply.
1ec6cb9 JIT: Combine shift & sub for monitor unlock.
8b7100f JIT: Allow use of cbz/cbnz for conditional branch gen.
e2561a0 debug: allow ability to hide GC freed lines in logcat
b61082b dvm: Bring back the ANDROID_DATA override
ef13d33 Revert all STE Dalvik performance patches
35267d8 JIT: Use vmla.f64 instead of vmuld + vaddd.
5c9e672 JIT: Combine add with shift and offset for array load & store.
38c38d9 JIT: Combine shift & sub for monitor unlock.
76ed9c9 JIT: Use rsb and shift in easy multiply.
102ab06 JIT: Combine add with shift.
d46b37e JIT: Allow use of cbz/cbnz for conditional branch gen.
0723288 JIT: Suppress loop suspend checks.
8ef34ac JIT: Hoist loop load operations above loop.
24f433e Fix JIT initialization race
9849140 Fix JIT bug related to immediate doubles
7dbe179 Revert "Revert "JIT: Performance fix for const doubles""
c19b09e Remove dead instruction in common_exceptionThrown.
381357b Fix a tracked reference leak in dvmGenerateProxyClass.
3a48f77 Remove stray references to non-existent opcodes.
50e3054 Fix a Field.isAnnotationPresent crash.
19e01fa Dump native stacks for all threads in native code.
d0ffd03 Fix a minor leak in handleVM_CreateString
89a9b4a Fix a minor leaks caused by failed initializations.(typo)
66f4cc4 Fix a leak in Dalvik_dalvik_system_DexFile_openDexFile
1558a56 Tiny optimization for complier templates for arm.
c4f0687 GC triggering performance optimizations
7901f53 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/dalvik into 1.1
f6f66df Zygote: Restrict slave mountspace so Dalvik apps can mount system-wide volumes
155282a dalvik: remove duplicated call to dvmJitCalleeSave()
774157e dalvik/libdex: Don't reduce optimization level to -O2
6799723 Revert "JIT: Performance fix for const doubles"
cbac7ae am 51997559: Fail if the new index is out of range. do not merge.
5199755 Fail if the new index is out of range. do not merge.
ecc8221 Change NewDirectByteBuffer to allow NULL if capacity == 0.
4bf5ebb Optimize dvmHash Loops.
7d15ac2 Remove possilbe leaks in dalvik.
c033c8f Reclaiming attribute obj after pthread_create
1763e1c Fail if the new index is out of range.
74a4447 Remove dead code.
1ce2dfc Fix handling of annotations whose classes are missing at runtime.
6070d2d Possible leak in dvmAllocRegion
b6d5867 Optimize opcodes to avoid bubble in pipeline.
7546ed6 ExceptionInInitializerError should wrap only non Error exceptions.
b57d13c Remove dvmFindInterfaceMethodInCache2.
e991f3a Use ALOGE rather than SLOGE for mountEmulatedStorage failures.
628eee6 JIT: Performance fix for const doubles
945eb25 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/dalvik into mr1
ff348c2 Revert "dalvik: Increase HEAP_IDEAL_FREE to 7.2 MB"
a3df5b5 am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
ce0723c am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
b6f4e03 am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
437f58a am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
bb07779 Reconcile with jb-mr1-release - do not merge
890e41c Merge f870f2d - do not merge
583e1f6 merge in jb-mr1-release history after reset to jb-mr1-dev
f870f2d Add dx option to always generate const-string/jumbo.do not merge.
afe3a01 am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."
288f228 Revert "Fix alignment when recompacting a DexMerger result. do not merge."
2d2f13c am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.
707ebe9 Fix alignment when recompacting a DexMerger result. do not merge.
e7e77c4 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
c087108 merge in jb-mr1-release history after reset to jb-mr1-dev
d454d96 am a0475a59: (-s ours) am d5cc3680: (-s ours) am 9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
07df951 am 69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.
a0475a5 am d5cc3680: (-s ours) am 9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
d5cc368 am 9db54b1e: Add dx option to always generate const-string/jumbo. do not merge.
8fce916 merge in jb-mr1-release history after reset to jb-mr1-dev
9db54b1 Add dx option to always generate const-string/jumbo. do not merge.
69dd411 Add dx option to always generate const-string/jumbo. do not merge.
6a15a0a merge in jb-mr1-release history after reset to jb-mr1-dev
7284c78 Revert the fix for incorrect package-private overriding.
9735865 Revert the fix for incorrect package-private overriding.
3b6dbf2 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1ddb70a merge in jb-mr1-release history after reset to jb-mr1-dev
ed94ff7 Revert "Don't enforce access checks for overloading for targetSdkVersion < 17."
c6d0c2e merge in jb-mr1-factory-release history after reset to jb-mr1-dev
8a0e26e merge in jb-mr1-release history after reset to jb-mr1-dev
0fe8852 Don't enforce access checks for overloading for targetSdkVersion < 17.
7538ddb merge in jb-mr1-factory-release history after reset to jb-mr1-dev
d2789ad merge in jb-mr1-release history after reset to jb-mr1-dev
9c78954 Don't disable inlining for ARM.
746918a Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/dalvik into aosp-merge
f42607c merge in jb-mr1-release history after reset to jb-mr1-dev
43e44fd Merge "Log if dlopen(3) fails." into jb-mr1-dev
9e11d05 merge in jb-mr1-release history after reset to jb-mr1-dev
2e3748e Final shuffle to make /sdcard work in shell.
6567510 Log if dlopen(3) fails.
d353b58 merge in jb-mr1-release history after reset to jb-mr1-dev
9d9919e Merge "Allow max free size of heap to be configured." into jb-mr1-dev
5b0ee0d merge in jb-mr1-release history after reset to jb-mr1-dev
c263618 Fix an ugly bug where try/catch offsets weren't being mapped properly.
485dfb5 Allow max free size of heap to be configured.
5005743 Move multi-user OBB under user-specific path.
d379e9c Merge branch 'jb-release' of https://android.googlesource.com/platform/dalvik into aosp
8e1633b Revert "Upgrade to dlmalloc 2.8.5."
7457370 am 9bd5a9db: Reconcile jb-dev and AOSP
9bd5a9d Reconcile jb-dev and AOSP
74ccce2 Optimize those StrictMath routines that are identical to Math routines.
d87884d Trim pre-Zygote fork, fix under-estimate of heap limit.
9cee921 Upgrade to dlmalloc 2.8.5.
067c620 am 74d4652e: am e64cfc1c: am b79d90eb: Merge "Log when the native trace is unavailable"
74d4652 am e64cfc1c: am b79d90eb: Merge "Log when the native trace is unavailable"
e64cfc1 am b79d90eb: Merge "Log when the native trace is unavailable"
b79d90e Merge "Log when the native trace is unavailable"
c32a377 Log when the native trace is unavailable
3822140 merge in jb-mr1-release history after reset to jb-mr1-dev
b3667a1 Log when the native trace is unavailable
8931453 merge in jb-mr1-release history after reset to jb-mr1-dev
86913b6 am 90f12e0b: am 4535e29e: am a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
90f12e0 am 4535e29e: am a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
4535e29 am a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
a177aa5 Merge "Use 0xde as the poison value after JIT code cache reset."
474c8ab Use 0xde as the poison value after JIT code cache reset.
ae341c3 Merge "Use 0xde as the poison value after JIT code cache reset." into jb-mr1-dev
60497bb Use 0xde as the poison value after JIT code cache reset.
8b28471 merge in jb-mr1-release history after reset to jb-mr1-dev
19fc686 dalvik: update ARMv6 code to bring in line with ARMv5
dde72bb am 8e80f76a: am d207be35: am f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
8e80f76 am d207be35: am f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
d207be3 am f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
f31a060 Merge "Optimize those StrictMath routines that are identical to Math routines."
6986bcf Optimize those StrictMath routines that are identical to Math routines.
84f9ec6 merge in jb-mr1-release history after reset to jb-mr1-dev
c524d17 Merge "Missing EMULATED_STORAGE_TARGET isn't an error." into jb-mr1-dev
acc6d35 am 91a17e5e: (-s ours) Reconcile with jb-release - do not merge
91a17e5 Reconcile with jb-release - do not merge
b921944 merge in jb-mr1-release history after reset to jb-mr1-dev
851248a Missing EMULATED_STORAGE_TARGET isn't an error.
1f36c81 Test if new build is kicked off.
d8de46c Include user identifier in external storage paths.
15e631e Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
52dc08d Fix a bug where the max blowup of annotations was incorrect. do not merge.
963b13a Fix a bug where debugInfos' size wasn't being computed. do not merge.
8f1a2d3 merge in jb-mr1-release history after reset to jb-mr1-dev
7a9db25 Support debug info in dexmerge and fix max blowup of annotations
21c93dc Remove /sdcard hack for shell users.
aa5ba91 am e599c468: am cfeacbdd: Merge "Remove unnecessary compiler pragma."
e599c46 am cfeacbdd: Merge "Remove unnecessary compiler pragma."
cfeacbd Merge "Remove unnecessary compiler pragma."
f669470 merge in jb-mr1-release history after reset to jb-mr1-dev
2004e4e am 86e036a8: am e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
86e036a am e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
e6516a5 Merge "Fix an ugly bug where try/catch offsets weren't being mapped properly."
b760cb5 am 93ee4913: am f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
93ee491 am f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
f3b60d2 Merge "Fix a bug where the max blowup of annotations was incorrect."
d60fc02 merge in jb-mr1-release history after reset to jb-mr1-dev
bf7dfee Fix a bug where the max blowup of annotations was incorrect.
d43341a Fix an ugly bug where try/catch offsets weren't being mapped properly.
45ffaef Make dex merging stateless. do not merge.
822a722 Support debug info in dexmerge. do not merge.
a018360 Merge "Access to all users' external storage." into jb-mr1-dev
e66f926 Merge "Shared OBB storage across users." into jb-mr1-dev
ba471b5 merge in jb-mr1-release history after reset to jb-mr1-dev
f646cb9 am 8e98f776: am 3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
8e98f77 am 3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
3e46814 Merge "Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
4bccb68 Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
aee8742 Remove unnecessary compiler pragma.
cdfcc0f merge in jb-mr1-release history after reset to jb-mr1-dev

   * development
a4a7f84 Update classpath for dashclock API in CMUpdater.
529ca6f Fix up Windows cross compile detection and error handling on Darwin.
1f3d54b Add support for cross compiling Windows tools on Darwin.
713d0aa Development: Update eclipse .classpath
75bb2da "debug" in those modules is discouraged
b2aa187 CM on Emulator [ARM]
03df3ca Fix Calculator and Superuser classpath
c26b778 Correcting 2 FC's in Dev Tools
9df8222 Development: Add fmradio sources to .classpath
7badd22 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/development into 1.1
04e0a9c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2a84299 am f4535aee: Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev
f4535ae Merge "Update bitmapfun sample to call recycle()" into jb-mr1-dev
4d6574e Update bitmapfun sample to call recycle()
64f03f3 am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev
451d3b8 Merge "Add redirect for removed file." into jb-mr1-dev
184a1dc Add redirect for removed file.
49e44d8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
a9fe80d am 388ea1e3: Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
388ea1e Minor updates to keep androiddevdocs redirect in sync with devsite version (in frameworks/base)
61e0b17 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
aa3687d am 2e5555e0: Bitmapfun Sample: Fix bug where background image loading could hang
7973971 FM Radio: Add support for FM Radio in Android
2e5555e Bitmapfun Sample: Fix bug where background image loading could hang
f08d11a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
8c013ae am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
690af12 Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e
ec5a847 am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()
b8a61ac Bitmapfun Sample: Change cache memory calculation to use maxMemory()
c66b768 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
a1d1194 am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies
006b895 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6acfacc Bitmapfun Sample: Fix inSampleSize selection and update dependencies
32d202f Some changes added to compile and run with Java 6 and Java 7.
1f15243 am 65cc8b78: Network sample: fix typo in manifest
65cc8b7 Network sample: fix typo in manifest
07d7362 am bf323d72: Update platform tools rev to 16.0.2
bf323d7 Update platform tools rev to 16.0.2
68d8727 Development: Add LockClock to Eclipse classpath
4e0f6bd Fixed aapt warnings
3b633a4 Update Eclipse .classpath for cm10.1
35f8b6a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
fa8f593 am 50600ba5: am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
50600ba am a525bf71: am 1e083591: am 2c063c88: Android Training: Threads sample app
a525bf7 am 1e083591: am 2c063c88: Android Training: Threads sample app
1e08359 am 2c063c88: Android Training: Threads sample app
4b5dc0c am 01b1a873: Merge "Add ko and ru to validLangs." into jb-mr1-dev
01b1a87 Merge "Add ko and ru to validLangs." into jb-mr1-dev
22c9415 Add ko and ru to validLangs.
2c063c8 Android Training: Threads sample app
a6485a7 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
7377374 am 7ca28063: Add redirect for IAB v3 restructure.
7ca2806 Add redirect for IAB v3 restructure.
613e19b SDK Only: Fix search interaction with various samples.
5ef16da merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
51b6b20 am 6d198012: Redirects /guide/google to /google/.
6d19801 Redirects /guide/google to /google/.
8325f80 am 0e61ea6f: Move plat-tools SDK component rev to 16.0.1
0e61ea6 Move plat-tools SDK component rev to 16.0.1
4a16486 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6eed638 am ab85a2a5: am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
ab85a2a am d77ac2b9: am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
d77ac2b am 80e0ac6a: am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
80e0ac6 am 70db2b6b: Merge "Doc change: sample app for Notifications class" into jb-dev-docs
70db2b6 Merge "Doc change: sample app for Notifications class" into jb-dev-docs
fc0d593 Doc change: sample app for Notifications class
f3eedad Revert "Dev Tools: Mock SMS"
4f4abab merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b4ccad3 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/development into mr1
57281e9 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
892fae1 am f394e166: docs: update redirects for articles
f394e16 docs: update redirects for articles
763f9b7 am e1e1a999: docs: add redirects for best practices pages that moved to training
e1e1a99 docs: add redirects for best practices pages that moved to training
95715d2 am 42801496: docs: a few bonus redirects for dac
2d7f1fa merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4280149 docs: a few bonus redirects for dac
cd18b80 am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
2df7c91 am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
87525f6 am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
09d8f21 am e242276c: docs: redirect next steps to building first app class
e9a0634 am 18bc76ab: Cleanup eclipse .classpath for Gallery2
18bc76a Cleanup eclipse .classpath for Gallery2
e242276 docs: redirect next steps to building first app class
7cb8e4a Reconcile with jb-mr1-release - do not merge
f893fe7 merge in jb-mr1-release history after reset to jb-mr1-dev
9350dd4 am 85c1f088: revert API 17 system image to rev 1.
85c1f08 revert API 17 system image to rev 1.
f2701a8 Reconcile with jb-mr1-release - do not merge
5b96c40 merge in jb-mr1-release history after reset to jb-mr1-dev
4844b20 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
130b7e4 Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev
76fa8e0 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1c9c1ed merge in jb-mr1-release history after reset to jb-mr1-dev
529393a Update API text file.
75dbc39 Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev
65098d0 Move support lib to r11
178634c Set correct targetSdkVersion for DevelopmentSettings
99ca344 cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
b89ca65 merge in jb-mr1-release history after reset to jb-mr1-dev
888ac28 Fixes to GridLayout demos.
d569bc4 Eclipse-Classpath
a161dd2 Add sample code for the new widget android.widget.TextClock
a2790ad merge in jb-mr1-release history after reset to jb-mr1-dev
b7e8a4e Merge "Add a demo for using Presentations with the MediaRouter." into jb-mr1-dev
31f3da3 am 9cfe3d44: am dc567ef5: am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs
9cfe3d4 am dc567ef5: am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs
dc567ef am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs
c00fe97 Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs
66dc70f Add a demo for using Presentations with the MediaRouter.
01be9fd AnimationsDemo sample code for Animations training class.
08f4431 merge in jb-mr1-release history after reset to jb-mr1-dev
ea7dfba Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev
c875f93 Add ApiDemos for secure surfaces.
bc4f4fc Add platform FLP for emulator config
d8cfc7d merge in jb-mr1-release history after reset to jb-mr1-dev
dc14aa6 Merge "Update the API file for the SDK." into jb-mr1-dev
6cee101 Update the API file for the SDK.
0303484 Fixed runtest to work with python != 2.4
cc8defb merge in jb-mr1-release history after reset to jb-mr1-dev
43b41f5 am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
bb65013 am fc848872: Update platform source.prop for new layoutlib. do not merge.
fc84887 Update platform source.prop for new layoutlib. do not merge.
3087001 Merge "Change the name of the location config value." into jb-mr1-dev
56311b5 merge in jb-mr1-release history after reset to jb-mr1-dev
06c5d2f Merge "update source.prop for the sdk platform package." into jb-mr1-dev
ab136ad update source.prop for the sdk platform package.
4cce2a3 merge in jb-mr1-release history after reset to jb-mr1-dev
1cb485c am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
b63a897 am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
37e24ae am 352b33ba: add redirect for layout-objects.html bug: 7366567
352b33b add redirect for layout-objects.html bug: 7366567
480774f merge in jb-mr1-release history after reset to jb-mr1-dev
13dc6a2 Change the name of the location config value.
b0cab80 am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
487869a am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
05bca82 am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
617f824 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ec54ca1 add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
018dba6 merge in jb-mr1-release history after reset to jb-mr1-dev
41359ff merge in jb-mr1-factory-release history after reset to jb-mr1-dev
cfda628 Fixed: Eclipse-Classpath
91d9d51 Return accuracy in GPS emulation
9cf43ae merge in jb-mr1-release history after reset to jb-mr1-dev
9da0812 More on issue #7318666: hide developer options from user build
2facb7b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
c4351cf merge in jb-mr1-release history after reset to jb-mr1-dev
c9ff3bc Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
c6fbad0 Merge "Make all monkeys do the same thing" into jb-mr1-dev
3cbf850 Make all monkeys do the same thing
c1a8e1e resolved conflicts for merge of d6308897 to jb-mr1-dev
1d7f24d Follow RegisteredServicesCache API changes.
d630889 am 37191b53: SDK JB MR0: doc is 16 rev 3
a3d4aff Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/development into aosp-merge
37191b5 SDK JB MR0: doc is 16 rev 3
b414234 merge in jb-mr1-release history after reset to jb-mr1-dev
41ee0fd testrunner: Match test runner name for hardware tests.
329b760 Revert "Change the name of the location config value."
c3e2dac Change the name of the location config value.
1c723d9 merge in jb-mr1-release history after reset to jb-mr1-dev
701ac38 Merge "Added Russian Translation-DevTools-CM10" into jellybean
177c547 am 835ae05a: am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
835ae05 am 8ffbb8fd: am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
8ffbb8f am 6a705429: docs: Add redirect for Android Open Accessory protocol content to source.android.com
6a70542 docs: Add redirect for Android Open Accessory protocol content to source.android.com
6aa2a9c merge in jb-mr1-release history after reset to jb-mr1-dev
de47987 Classpath cleanups - DO NOT MERGE
c3abec5 CMUpdater : Add to classpath
071fde6 merge in jb-mr1-release history after reset to jb-mr1-dev
c83d035 Added Russian Translation-DevTools-CM10
6b03c84 Use more secure exponent for generating keys
708cf98 merge in jb-mr1-release history after reset to jb-mr1-dev
7b48746 Clean up Global settings stragglers.
7862fb2 merge in jb-mr1-release history after reset to jb-mr1-dev
2854254 Merge "Added UiAutomator samples to SDK" into jb-mr1-dev
8213206 Added UiAutomator samples to SDK
7263dad Update API demos to match new tab interaction.
9babfd8 merge in jb-mr1-release history after reset to jb-mr1-dev
32b56a6 Dev Tools: Mock SMS
e61482e Fix .classpath to track bouncycastle/bcprov
34580b7 am fa82c449: am 45825eae: Update platform-tools sdk comp to 15.
fa82c44 am 45825eae: Update platform-tools sdk comp to 15.
45825ea Update platform-tools sdk comp to 15.
35d22bf Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev
0b0f7f8 Merge branch 'jb-release' of https://android.googlesource.com/platform/development into aosp
cbe1615 am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT"
0f0de77 am b034233a: am 3c901267: Merge "Update README.CRT.TXT"
b034233 am 3c901267: Merge "Update README.CRT.TXT"
3c90126 Merge "Update README.CRT.TXT"
91fd25b Add screensavers to default Eclipse classpath.
ee35616 merge in jb-mr1-release history after reset to jb-mr1-dev
a0de803 Update README.CRT.TXT
1e1926d Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev
b894c71 For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard.
81a6b98 Merge "Add test case for new keyguard widget API" into jb-mr1-dev
99f717d Fix runtest syntax.
e1bb1d3 Merge "Make coverage work without test defs." into jb-mr1-dev
84fb279 Add test case for new keyguard widget API
8ac5118 Make coverage work without test defs.
7281ec9 merge in jb-mr1-release history after reset to jb-mr1-dev
42c1444 Merge "Fix install of full build packages." into jb-mr1-dev
b0b8c78 Fix install of full build packages.
00a159d merge in jb-mr1-release history after reset to jb-mr1-dev
c31f70a center text, fix extents for multiline texts
608a5af update the localizer tool to use all available translations
4269b21 merge in jb-mr1-release history after reset to jb-mr1-dev
5f25ef0 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
aba4384 Fixes Eclipse ClassPath for new AIDL-Interface in DeskClock
0dfbeaa merge in jb-mr1-release history after reset to jb-mr1-dev
c2760a0 Import translations. DO NOT MERGE
23ab3c9 merge in jb-mr1-release history after reset to jb-mr1-dev
d6046a4 EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
91615e7 Merge "Fix log syntax." into jb-mr1-dev
81c475e Fix log syntax.
8f39487 merge in jb-mr1-release history after reset to jb-mr1-dev
f914915 am cebc0dc6: am 09bb223b: Doc change: Add temporary redirect for dac/live to dgc/live.
cebc0dc am 09bb223b: Doc change: Add temporary redirect for dac/live to dgc/live.
09bb223 Doc change: Add temporary redirect for dac/live to dgc/live.
83dff9c merge in jb-mr1-release history after reset to jb-mr1-dev
51f8833 Make Presentation demo retain image and color.
9dac35a New and improved Presentation demo.
337cd08 merge in jb-mr1-release history after reset to jb-mr1-dev
39e3b7f Merge "Remove use of private API." into jb-mr1-dev
d0689c0 Remove use of private API.
a97806b am 0d2631d3: am bc93334b: Doc change: redirect accessibility best practices to new location.
0d2631d am bc93334b: Doc change: redirect accessibility best practices to new location.
bc93334 Doc change: redirect accessibility best practices to new location.
08e5a8a Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev
15d4e75 merge in jb-mr1-release history after reset to jb-mr1-dev
bd783a0 New API demo for nested fragments in support lib.
4d01f84 merge in jb-mr1-release history after reset to jb-mr1-dev
077c59a Track multi-user change.
17a180c am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
a295480 am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
4102c6f am b833605a: Merge "Rewrite ARM crtbegin* as C files"
b833605 Merge "Rewrite ARM crtbegin* as C files"
51f241c Merge "API demo for nesting fragments." into jb-mr1-dev
cfd8132 Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev
f3f7c5f API demo for nesting fragments.
310bc87 am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
51535bf Reconcile with jb-release - do not merge
d0b834c Rewrite ARM crtbegin* as C files
52f99e5 merge in jb-mr1-release history after reset to jb-mr1-dev
7002083 Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev
f8ddf2e Merge "Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""" into jb-mr1-dev
f11b793 Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""
18f28c0 Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""
f0063b2 Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
7b8420e Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
9642da5 Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
7583239 Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
c07123b Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
4604e30 Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
dbb1e6a Fix some more.
46a65b4 EmulatedFakeCamera2: Split AE/AWB mode and lock
4573a71 EmulatedFakeCamera2: Add precapture trigger and reprocess support
a84522d Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
12ea294 merge in jb-mr1-release history after reset to jb-mr1-dev
7454171 Coverage and unbundling changes for runtest.
2e1fe78 Add new sample for Presentation API.
341b089 am df56d27b: (-s ours) am b1b6735c: Prepare for JB SDK rev 3
df56d27 am b1b6735c: Prepare for JB SDK rev 3
cbb1d72 Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
bcb736a am bef6ec84: am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
bef6ec8 am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
3bc200d am 9864b880: Merge "Replace deprecated APIs in NDK samples"
9864b88 Merge "Replace deprecated APIs in NDK samples"
405b303 merge in jb-mr1-release history after reset to jb-mr1-dev
eb703bf Replace deprecated APIs in NDK samples
b1b6735 Prepare for JB SDK rev 3
adf05af Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
a95366a add an app to generate localized text bitmaps needed for recovery
99c8258 Merge "Use new display manager API." into jb-mr1-dev
0aa706d merge in jb-release history after reset to jb-dev
37820ad merge in jb-release history after reset to jb-dev
76bb146 am 980822ca: am 0c11d925: am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
980822c am 0c11d925: am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
0c11d92 am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
3fda35f Merge "Windows USB Driver for generic + Q, rev 7."
be9369b merge in jb-mr1-release history after reset to jb-mr1-dev
60df6ce Use new display manager API.

   * device/common
a37aa43 libbt: Add support for using two stop bits
94e39fa libbt: BT USB support
3fd0378 libbt: Fix stray comma :)
5e53640 libbt: Add prepatch support
6747b26 libbt: Add btlock support
201208b libbt: Add support for board-specific configuration
105961e Add new user-to-kernel interface for Bluetooth low power mode control (1/2)
5bbc947 Add support of getting factory BDADDR from Controller's non-volatile memory(2/2)
0a793bd Properly filter paths to locate device directories
4d75d98 Merge "Tune blob-generation scripts" into jb-mr1-dev
7f595f9 Merge "Use I2S interface for SCO on Manta" into jb-mr1-dev
e11a970 Use I2S interface for SCO on Manta
80d5b3f Tune blob-generation scripts
39b0c7d Add vnd_tilapia
0c04d59 Move libbt-vendor from vendor/broadcom/libbt-vendor
60f0d40 Revert "Move libbt-vendor from vendor/broadcom/libbt-vendor"
d18044d Move libbt-vendor from vendor/broadcom/libbt-vendor
3d7af22 Simplify the preparation of an AOSP-like tree.
fdb73a2 am 0003d599: (-s ours) am 37fd149e: Add toroplus to list of target devices
0003d59 am 37fd149e: Add toroplus to list of target devices
5f6a33d Fix wrong project name
37fd149 Add toroplus to list of target devices
62128cd Tune BT handling. Add toroplus.
b9e07ed Remove bluedroid
ae5c4fe am b6eb9247: am 93dfd775: Merge "Generate flash-all scripts for Windows as well."
b6eb924 am 93dfd775: Merge "Generate flash-all scripts for Windows as well."
93dfd77 Merge "Generate flash-all scripts for Windows as well."
b5e3c7d Generate flash-all scripts for Windows as well.
839a25f Remove panda support
68870a8 Better way to clean up the non-AOSP projects
258bf1d More cleanup - remove unsupported devices
2ab957b More cleanup
264ddbc Remove crespo and stingray earlier
308e244 Better tree cleanup for blob generation.
b528dd6 Stop dealing with crespo and stongray blobs

   * device/generic/goldfish
e34c10f fix copying of init.recovery.goldfish.rc
b413584 goldfish: add vendorsetup.sh
c3dacf6 CM on Emulator [ARM]

   * device/generic/mips
764fe78 change mini_mips ARCH_VARIANT to mips32-fp instead of default mips32r2-fp

   * device/sample
7e69d92 [sample] change apns-full-conf.xml
b584ca2 Merge "Add more APNs for operators in France & Spain," into jb-mr1-dev
a500ad4 Merge "Add in the fallback fused location provider." into jb-mr1-dev
63645fb Add more APNs for operators in France & Spain,
d3232b1 am a285c21c: am 56824fe2: Updated AT&T APN info.
a285c21 am 56824fe2: Updated AT&T APN info.
56824fe Updated AT&T APN info.
d2f189f Add in the fallback fused location provider.
bbc41a6 Add samples for Google network and fused location
7011afc Updated AT&T APN info.
c183bb9 am eaa4a626: (-s ours) Reconcile with jb-release - do not merge
eaa4a62 Reconcile with jb-release - do not merge
714ddba merge in jb-release history after reset to jb-dev
cbd3ea5 merge in jb-release history after reset to jb-dev

   * device/samsung/i9300
007c118 i9300: audio: play silence on boot
23d5fde i9300: gps: use psc
fe48549 i9300: recovery: auto detect fstype for sdcard
fdf2241 Improve mic sound when using an headset.
fe42487 i9300: gps: add magic field to AGpsRefLocationCellID struct
398efa4 i9300: move libril, use SamsungExynos4RIL class
96000db i9300: move advanced settings to common
98d17e5 i9300: advanced settings: pimp my vibrator
2abc20c i9300: advanced setting: add content adaptive backlight control
ff28149 Revert "i9300: audio: increase mic gain"
df44559 i9300: loop ringtones, cleanup unused props
5c15a3f Merge "Samsung i9300 : FR translation" into cm-10.1
0f3727e i9300: audio: fix capture period size and count
850b646 i9300: audio: always request stereo input
f503df0 i9300: audio: increase mic gain
2268bbb Samsung i9300 : FR translation
35886fb i9300: audio: force use both mics when back mic is selected
126c6c7 Galaxy S III: RU translation
f62f514 I9300: Simplified Chinese Translations
936651d i9300: PT-BR translations
c73d76a Merge "i9300 : Fr translation" into cm-10.1
dc1dbaa i9300: fix 2g/3g toggle
cc2ea7f Added hungarian translation for dock_audio
e0f2461 i9300 : Fr translation
27c76ea Merge "DeviceParts: Add uniform title between devices" into cm-10.1
80f9d2e i9300: DeviceSettings: ES translations
119c409 DeviceParts: Add uniform title between devices
8395da1 i9300: add opensource libril, remove ril class
f3b8479 i9300: polish translations for device settings
c137db1 i9300: audio config cleanup
09d3f13 i9300: fix dock audio
c775350 i9300: add SamsungServiceMode
4e1cb10 i9300: fix battery capacity
201164f i9300: move camera firmwares to common
9a19947 i9300: add ext4 as second filesystem for sdcard for recovery
aac8b17 i9300: fix speaker not working after bt, headset mic
7283519 i9300: add support for SlimISP_ZH camera fw
662254c i9300: update extract script
3f5ca3c Merge "Move proprietary-files.sh to extract-files.sh" into cm-10.1
35b625a i9300: blow headphones away
c487d38 Move proprietary-files.sh to extract-files.sh
3955322 i9300: move uevent conf to common
6b052a3 i9300: enable SPKL Boost SPKR Switch on boot
0f76bcf I9300: Enable Home Button Unlock
e61e626 i9300: reenable hardwarekeys overlay
1435a47 i9300: enable powerwidgets
4dadcde i9300: remove include of init.bt.rc
4bd4cd8 i9300: force disable hardware keyboard
bf9c7be i9300: enable samsung stk
215d1cb i9300: audio: remove mutex lock at adev_set_voice_volume
f3813ef i9300: add mountpoints for external sdcard and usb storage
1bf74a2 i9300: reenable noise suppression
d4da79e i9300: fix group on video nodes
6206b6c i9300: update audio hal for mr1
da0380a 4.2-ization
150edf0 i9300: use SamsungExynos4RIL class
2a5058e i9300: add bluetooth build config
d437bdc i9300: implement noise suppression for calls
126dab8 Update proprietary-files.sh: libakm.so
c6f50d7 n7100 dont share common gps blobs with i9300/n8xx
12e69d6 Update proprietary-files.sh to match TheMuppets vendor (3/3)
b180303 reorganize device tree, use smdk4412-common tree
4132ca0 i9300: allow mass storage mode for external sdcard
0d132fd enable home-key unlock setting
a7067db Merge "i9300: gps.conf: don't assume NA server" into jellybean
a098935 audio: lower speaker volume slightly
1768ed9 change network location provider package
a091da5 i9300: gps.conf: don't assume NA server
45ecc8e update extract script
9874fc6 Merge "move macloader to hardware/samsung" into jellybean
147a200 Merge "I9300: Simplified Chinese Translations" into jellybean
6e8b829 move macloader to hardware/samsung
1da0730 Fixed missing back button on ActionBar (default Settings behavior on submenus). (indentation-fix again)
6be36a6 I9300: Simplified Chinese Translations
431d2ef build libsync
14eebb8 Merge "init: start p2p supplicant with proper arguments" into jellybean
0f0a85c Added Russian Translation-Galaxy S III Settings-CM10
88baa2d init: start p2p supplicant with proper arguments
d04f675 update fingerprint
b6b7f0d set permissions on flash device for torch
e13071b updated extract script
3ea6d06 jellybean cleanup
b25dd45 removed gralloc overlay, moved bits to hardware/libhardware
3b309ae updated extract script
b8734ac PT-BR: Added missing translations
b620bf5 Added hungarian translations for DeviceSettings
b8455f5 Merge "i9300: Enable back forgotten ISO modes (2/2)" into jellybean
7a36c40 i9300: Enable back forgotten ISO modes (2/2)
6ee21a7 Device i9300: Spanish translations
34e1568 macloader: Add new murata MAC prefix
e72cacf Fix in proprietary-files.sh for camera.smdk4x12.so
e9b7d22 Update i9300 bootanimation

   * device/samsung/smdk4412-common
4ec84dc Merge "smdk4412: add support for Note 8.0" into cm-10.1
bb7a283 smdk4412: add support for Note 8.0
e232cd9 DeviceSettings: fix compile error
02624f2 DeviceSettings: Disable touchkey timeout if it is not supported, move mdnie sysfs files to config.xml to allow them to be overriden
ba84fbf smdk4412-common: camera: fixes for camerawrapper
44169ee smdk4412-common: fix user configurable In-Call settings when cancelling dialog
5a76e06 smdk4412-common: fix user configurable settings when cancelling dialog
d3aed0a smdk4412: set board vendor
9955cce smdk4412: Fix perms of /tmp in recovery
d5c9d9e Samsung smdk4412-common : FR translation
131af62 smdk4412-common: NL Translation
6e9cac3 Merge "DeviceSettings: add more overlays" into cm-10.1
5d158f4 DeviceSettings: add more overlays
e68369a DeviceSettings: HU translation update
8edc118 DeviceSettings: fix enable/disable options that can be overlaid
4ad86e3 smdk4412-common: NL Translation
e9e11fc smdk4412-common: ES translations
249900c smdk4412-common: Add translatables
2b70196 smdk4412-common: PT-BR update translations
c621527 Merge "smdk4412-common: add i925" into cm-10.1
b4faa45 Merge "t0lte: user configureable voice/streaming volumes [2/2]" into cm-10.1
ad457e3 smdk4412-common: add i925
9498ee7 smdk4412: use fimg
d419fec smdk-4412-common: ES translations
5308097 t0lte: user configureable voice/streaming volumes [2/2]
c6cc81e smdk4412-common: add/update resources
f0ff12d smdk4412: advanced settings: fix jumping vibrator strength
c1818cd smdk4412: advanced settings: add spen support back
7926cd6 smdk4412-common: move advanced settings from i9300
c77f464 smdk4412: use 2 channels on 480, 720 and 1080p
4124035 smdk4412: media: revert channels to 1 for 1080p recording
0e760a3 Add input device AUDIO_DEVICE_IN_BACK_MIC Increase audio quality of 1080p to 196kbps stereo
7479f04 Mms: Revert: higher max message and image sizes
c8bc6eb smdk4412: Force use of profile video size
ba48324 overlay: camera: temporarily disable zsl mode to fix front camera
ca3e849 smdk4412-common:camera: workaround for snapshot crash with touch2focus and flash
57b5e28 add AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET to audio policy
76195f7 smdk4412-common: Add new devices
8f99ee3 smdk4412-common: add SlimISP_BH camera firmware
6ae502b add external_sd directory to ramdisk for mounting external sdcard in cwmr This addition allows external sdcard mounting in recovery by providing the necessary mountpoint.
02824c6 smdk4412: volume rocker wake
6ea2fe2 smdk4412: remove prebuilt hostapd
993cbfb smdk4412-common: add camera firmwares for all 4412 devices
eb02676 smdk4412: add flags for cortex-a9 and neon optimizations
8ddc672 smdk4412: overlay: add UAProf URL
b77774d smdk4412: mms: higher max message and image sizes
25309cf smdk4412: camera: fix copy & paste fail
4bfa6df smdk4412: use opensource libsecion
c7ab861 smdk4412: update proprietary files
d912dd9 smdk4412: remove legacy egl hack
734f00f smdk4412: update extract script
f20493a extract: fix typo, add missing devices
722da0c smdk4412: add i9305
de26689 Add support for R950 USCC Note 2
7c763e7 Add I605 and L900
f6e4322 smdk4412: set cityid parameter for t0lte camera hal
d3a7699 Fix derp
6fc4b0f fix newline derp
9e50c08 Merge "smdk4412: add support for note 2 lte" into cm-10.1
75fc766 smdk4412: add support for note 2 lte
c1024e8 Cleanup in proprietary-files.sh
174d788 Merge "smdk4412: use sysfs for vsync notification" into cm-10.1
cf06407 Camera needs access to exynos-mem as well
0f0d2ef smdk4412: use sysfs for vsync notification
dec7619 smdk4412: define WIFI_DRIVER_MODULE_AP_ARG
927997e smdk4412: don't hide focus modes
f23a457 media_profiles.xml cleanup
ddb15e6 smdk4412: common uevent conf, fix perms on exynos-mem
ec26d71 smdk4412: cleanup proprietary files
e4162e3 smdk4412: bluetooth: fix i2s interface config
1fa2ca3 Merge "smdk4412-common: camera: Enable preview handling, and don't report take_picture errors" into mr1-staging
aa566de bluetooth: Bring config inline with CM10
1ac1875 Revert "smdk4412-common: bluetooth: Disable LPM_SLEEP_MODE to prevent stack dying"
95577f8 smdk4412-common: camera: Enable preview handling, and don't report take_picture errors
be934ca smdk4412-common: bluetooth: Disable LPM_SLEEP_MODE to prevent stack dying
4f02954 EGL: Use BOARD_EGL_NEEDS_LEGACY_FB
8b53906 smdk4412: remove bt init, add bt vendor conf, enable bt-pan interface
ed2a098 smdk4412-common: build opensource gralloc and hwcomposer
15b0d23 smdk4412-common: add global cflag for camera iso
3294d7c smdk4412-common: camera iso support
bfc72f4 smdk4412-common: build libnetcmdiface
d3c8154 BoardConfig: use samsung colorformat
84cebac BoardConfig cleanup
e7d5836 common: remove geocode and networklocation overlay
7d504ec common: add audio effects config
14c94f7 common: set TARGET_ARCH
e7bf4b3 Update proprietary-files.sh: libakm.so + fix derp
bb99da3 n7100 dont share common gps blobs with i9300/n8xx
264332c Update proprietary-files.sh to match TheMuppets vendor (1/3)
4d8e2d9 Add execution permission
47075a9 add blob script
344ed8b add n8000 and n8013
b72eaab handheld permission is device specifc
cf70d62 led settings and nfc are device specific
171d0d9 move telephony specific parts back to device
ee1a839 Initial commit

   * device/ti/panda
232b56a remove bluetooth quick switch resource from overlay config file
32c8522 Allow traversal into /storage/emulated.
b29e27a Final shuffle to make /sdcard work in shell.
7841c35 Bring back ADB_EXTERNAL_STORAGE.
37a333c Remove /sdcard hack for shell users.
7658a40 audio: fix resampler creation
3fdf23a make_ext4fs has moved to build/target/core.mk

   * docs/source.android.com
e30dbd1 Add documentation for new security features in the Android 4.2 release.
cb63f6e External storage technical information.

   * external/aac
b2511c6 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/aac into mr1-staging
6ab3699 Bug 7170947 Update AAC codec
49fa877 libFDK in libaac: Add conditional definition to switch arm asm for devices that don't support thumb2. Tested on heroc with armv6j.
ed8b5a7 Merge "Don't zero out spec coeffs before doing the final IMDCT." into jb-mr1-dev
34ce250 Don't zero out spec coeffs before doing the final IMDCT.
1043598 fix mips build by reverting files back
381d698 Bug fixes in AAC decoder, AAC encoder, FDK library
fef2208 Merge "Remove workaround in aac for broken toolchain"
ad74957 Remove workaround in aac for broken toolchain

   * external/android-mock
4cc911a Some changes added to compile and run with Java 6 and Java 7.

   * external/apache-http
3be157f am e6fe5ecb: Merge "Remove obsolete ThirdPartyProject.prop files."
e6fe5ec Merge "Remove obsolete ThirdPartyProject.prop files."
6090b46 Remove obsolete ThirdPartyProject.prop files.

   * external/bluetooth/bluedroid
10b999d Add I2S-PCM slave mode for SCO
382f7fb Support USB HCI
a59fa7f bt_hci_bdroid: check for failure to open hci
ea48d2e Fix MAP SDP record generation [1/3]
4b56e40 a2dp hw: adding a2dp tuning through bdroid_buildcfg.h
b7f44f8 libbt-hci: include bdroid_buildcfg.h from device repo
ce6c240 a2dp: Set the default A2DP bitrate to high quality
5ae3694 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/bluetooth/bluedroid into 1.1
9c25a75 Snapshot 09118679ff7861de0fe2b742591e5d6aadba3fcc
69f86c8 Bluetooth: Change Sampling Frequency to 48 kHz
b1f0fed Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/bluetooth/bluedroid into aosp
689d66b Snapshot 9fd57cbacd95e89602f430244c35bbc67f08b6d2
3ad3c81 Snapshot 09118679ff7861de0fe2b742591e5d6aadba3fcc
62b1414 Snapshot 0d153181bbe9ce75555b437567796a9aef4ef0ae
5738f83 Snapshot cdeccf6fdd8c2d494ea2867cb37a025bf8879baf
0d15318 Add HID gamepad/joystick as supported HID devices
cdeccf6 merge in jb-mr1-release history after reset to jb-mr1-dev
274a3a4 Allow HID connection even if DI does not match
ca85276 merge in jb-mr1-release history after reset to jb-mr1-dev
25b2a8a Merge "Turn off socket debug messages" into jb-mr1-dev
073362e Turn off hid debug messages
a0d1575 Turn off socket debug messages
1a87d89 merge in jb-mr1-release history after reset to jb-mr1-dev
8cbab16 merge in jb-mr1-release history after reset to jb-mr1-dev
02f8bc6 Address type should be UINT8 instead of char for btif_media_check_iop_exceptions
2155210 Merge "Increase media task encoded buffer queue throw-away threshold from 12 to 24" into jb-mr1-dev
036d5a1 Merge "Manage a2dp frame distribution when rate doesn't scale with media tick" into jb-mr1-dev
23ad592 Merge "Bump up priority of a few tasks that could affect a2dp" into jb-mr1-dev
7a291d4 Increase media task encoded buffer queue throw-away threshold from 12 to 24
b930299 Manage a2dp frame distribution when rate doesn't scale with media tick
028de30 merge in jb-mr1-release history after reset to jb-mr1-dev
9ab1946 Add new user-to-kernel interface for Bluetooth low power mode control (2/2)
520b756 Bump up priority of a few tasks that could affect a2dp
03ccd6f merge in jb-mr1-release history after reset to jb-mr1-dev
c99ef49 During call state change DIALING/ALERTING -> CONNECTED, donot redo SCO
92634f5 merge in jb-mr1-release history after reset to jb-mr1-dev
f9c4813 merge in jb-mr1-release history after reset to jb-mr1-dev
ad66e17 Add support of getting factory BDADDR from Controller's non-volatile memory(1/2)
8aae755 Add serial port profile support and allow to connect to rfcomm channel without sdp discovery
6f77fb4 merge in jb-mr1-release history after reset to jb-mr1-dev
d4cfae4 Remove frame count offset compensation code
d01f778 merge in jb-mr1-release history after reset to jb-mr1-dev
c25367b Disable btsnoop external parser for production
053caa2 merge in jb-mr1-release history after reset to jb-mr1-dev
7057609 Change the file gid to net_bt_stack
6d20306 Fix for timer thread stuck on BT OFF
81211b3 Fix for timer thread stuck on BT OFF
628469c merge in jb-mr1-release history after reset to jb-mr1-dev
e17b177 Ensure timer thread stops when inactivity timer expires
52c8d7d merge in jb-mr1-release history after reset to jb-mr1-dev
ac895da Merge "Fix HCI Timeout issue on Mako" into jb-mr1-dev
da7c9be Send the enabled hfp/hsp service UUIDs based on config
187cb92 Fix HCI Timeout issue on Mako
8df5a50 Fixed the crash when rfcomm run out of 30 channels
360d273 merge in jb-mr1-release history after reset to jb-mr1-dev
f821798 Trigger restart on BT Controller H/W error
51fca0e merge in jb-mr1-release history after reset to jb-mr1-dev
bc08278 Change the order of Local BDA read  locations.
f8768fe Add timer compensation to manage timer thread preemtion
e48becf Set btif media timer tick to 20 ms
bf7972c Reduced logging before/after music play/pause
a399ec9 merge in jb-mr1-release history after reset to jb-mr1-dev
cdd49a6 Added a configurable BT disable timer
ea634ce bluedroid: add mutex lock when enumerating the hci tx queue
0fdeb59 Move default COD macro BTA_DM_COD to bt_target.h
751c3cc bluedroid: add mutex lock when enumerating the hci tx queue
5d79d92 merge in jb-mr1-release history after reset to jb-mr1-dev
c5af211 Broadcom license for proprietary files
d8896e1 Fixed OPP SDP records to indicate support for only vCard 2.1 and other type of object
f64e0ed Defer sending RC pass-through commands until A2DP connection is up
8d2a009 merge in jb-mr1-release history after reset to jb-mr1-dev
6ef1011 Initual Bluetooth open source release
f80d3d0 Merge "Revert "Header file and whitespace cleanups"" into jb-mr1-dev
ad2d45b Revert "Header file and whitespace cleanups"
d659d3c Revert "Reference headers in their new location"
cc914cf Header file and whitespace cleanups
965b00c merge in jb-mr1-release history after reset to jb-mr1-dev
6ed67e2 Reference headers in their new location
5a77117 Save the service uuid when changed
02e454f merge in jb-mr1-release history after reset to jb-mr1-dev
5df6420 bluetooth: BT SIG - AVRCP - Response for invalid PDU fixed
557040b BTIF Media task not terminated during BT off
f3abcaa Disable Power Manager callback on BT OFF
f6f25d6 merge in jb-mr1-release history after reset to jb-mr1-dev
d752bb2 Use new storage APIs for NV items
01ff0cb merge in jb-mr1-release history after reset to jb-mr1-dev
ec4625e Fix for HDP thread leak during BT on/off
6479731 bluedroid: clean up a2dp log spew
f4e6320 Turn off messages that has lower priority than warning.
006e31e bluedroid: clean up a2dp log spew
85c739d Merge "Turn off messages that has lower priority than warning." into jb-mr1-dev
a841182 Turn off messages that has lower priority than warning.
1d97b11 Update HFP version in SDP to 1.6
f622e30 merge in jb-mr1-release history after reset to jb-mr1-dev
41fba72 audio: audio device API 2.0
8f9b922 Fixed acl credit issue when host data flow control is n/a
74c56bf merge in jb-mr1-release history after reset to jb-mr1-dev
786d5ab Fix for Fixed pin keyboard blacklist search issue.
9d8a5ac Send proper length while retrieving local name during  BT Enable
4882543 Fix for overlapping bt_target & gki_target defines
1eeb879 Handle all auth failure codes to retry pairing
84f04af merge in jb-mr1-release history after reset to jb-mr1-dev
5a23a0d Add log tag for stack logs
7b7d17e audio: fix get_parameters()
7411d66 Enhanced log traces to print h/w error code
9e51350 merge in jb-mr1-release history after reset to jb-mr1-dev
1c613c3 Fixed the issue that local adapter name cannot be changed and lost last bonded device 2
f8de983 Merge "fixed the issue that remote unpaired device not removed from config file" into jb-mr1-dev
304fd14 fixed the issue that remote unpaired device not removed from config file
9c4e242 Turn on NUMLOCK states for HID KBs without NUMLOCK
370da6c merge in jb-mr1-release history after reset to jb-mr1-dev

   * external/bouncycastle
fb958ee Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/bouncycastle into 1.1
e0c8f22 am c4c8087c: Add certs to blacklist.
c4c8087 Add certs to blacklist.
1508faa Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
aa24df5 merge in jb-mr1-release history after reset to jb-mr1-dev
036093e Fix registration of MD5withRSA Signatures
9898a93 merge in jb-mr1-release history after reset to jb-mr1-dev
e6bf3e8 Make existing bouncycastle bcprov build on host and add host-only bcpkix build
aecae57 merge in jb-mr1-release history after reset to jb-mr1-dev
517da5b BaseKeyFactorySpi should throw InvalidKeySpecException, not RuntimeExceptions
e8b303d merge in jb-mr1-release history after reset to jb-mr1-dev
4c11130 bouncycastle 1.47 upgrade

   * external/busybox
eb80a7e Merge remote branch 'busybox_net/1_21_stable' into cm-10.1
93cce13 Apply post-1.21.0 patches, bump version to 1.21.1
75671e1 volume_id: fix ntfs attribute search
e73f3c1 Apply post-1.21.0 patches, bump version to 1.21.1
c2b8b7a xz: support concatenated .xz streams
d363446 xz: fix put_unaligned_{l,b}e32
823694d Busybox 1.21.0 squashed commit for jellybean
6e205db Build with -fno-strict-aliasing
68d8b6d update config (fstrim addition)
886ed40 Add fstrim support to restore NAND/eMMC write performance. fstrim applet is a port from util-linux.
64406a9 Bump version to 1.21.0
0cfba07 fix testsuite false positive
4609f47 mdev: fix mode of dir1 in =dir1/dir2/file rule
31dc860 ifconfig: do not accept "ifconfig eth0 up 1.2.3.4/17" (ip with mask). Closes 5786
2f5b5be grep: fix grep -Fw not respecting the -w option. Closes 5792
81fa999 syslogd: do not segfault on parse error when using default config. Closes 5762
2cfcc9e sha3: code shrink
9980707 syslogd: convert dummy functions to statics and get rid of IF_FEATURE_* checks
9daf33f dc: code shrink
7c4b13e ash: revert wrong "fix" for an apparent memory leak. Closes 5822
5d78355 code shrink
5ca853e fix a typo in config help text. Closes 5714
20c5e5a mount: fix -o user=foo mishandling, fix unc= generation, add prefixpath=
e4f0f26 sha3: s/sha3_process_block76/sha3_process_block72/
5368fe5 sha3: rename KeccakF->sha3_process_block76.
406ea15 mount: add unc option to CIFS mount (needed for Linux 3.4+)
970aa6b sha3: cache ctx->bytes_queued
8fb3ab5 sha3: remove two "small code" codepaths: I can't reproduce code size win on them anymore
8e7312e sha3: tweak choice of a fast code path for 64-bit
5b7f50f sha3: cosmetic tweaks to various names, comments. No logic changes.
ac4100e sha3: code shrink
a55df27 sha3: code shrink
07a54e2 sha3: another speedup for SHA3_SMALL=0 case
6830ade whitespace fixes. no code changes
30a8652 sha3: make size/speed optimization decision configurable
60cb48c whitespace cleanup. no code changes
b8173b6 sha3sum: new applet
b7841cf ntpd: fix incorrect m_status field in outgoing packets. Closes 5120
90801da Remove redundant 'config FEATURE_VOLUMEID_SQUASHFS'
6928d9f volume_id: add squashfs detection
6967578 whitespace fixes. no code changes
5218515 volume_id: uuid_format small code shrink
07b419d volume_id: display hfs[+] 128-bit UUID properly
a58f7b7 blkid: add type display for hfsplus
cd776cf syslogd: add option to log to Linux kernel printk buffer
d189b59 klogd: handle multi-char log levels
3917fa3 dmesg: handle multi-char log levels
fb499c5 powertop: fix error message
a38f9fa ifenslave: fix missing close paren
12677ac CONFIG_PID_FILE_PATH: new configuration option for pidfile paths
393c395 du: document incompatibility with standard tool
4d5955e decompress_uncompress: comment out a bigger chunk of debug code
a846117 decompress_uncompress: comment out debug printout on corrupted data
c71547c decompress_uncompress: move 'code' variable into loop - sole user
04f05b8 Fix building under 4.2
4ba6c5d ash: fix a memory leak
e4b9451 volume_id: add exFAT detection
3f21044 ifupdown: code shrink
a803bfa ifupdown: remove unused errno assignments
1118133 ifupdown: simple code shrink
d2d5049 blkid: show filesystem when both label and UUID are missing, but type is known
48daa65 android ndk defconfig: fix default location of modules
8ea3bb9 Revert "dd: support skip and seek values greater than 2G on android"
5694afd build system: use pkg-config to look up selinux libs
67dc7b2 fbsplash: fix regression from e4fa7b7
3aeb870 nanddump: invert the meaning of the -o parameter to match upstream
98f6b2d nanddump: skip bad blocks when instructed to do so
da0200a nanddump: use the right operator of logic AND
eab343e mktemp: fix mktemp -u temp.XXXXXX returning garbage when TMPDIR is set
8dc6d1a adduser: make it accept "adduser USER GROUP" form
fd77ea5 mark get_shell_name FAST_FUNC
32711c4 top/ps: argv0:"gdm-session-worker [pam/gdm-password]" == comm:"gdm-session-wor"
d527588 ash: implement export -n
f47ce07 brctl: fix description and usage
1c7a58d udhcpc[6]: allow discover_retries == 0 (infinite)
d109798 flashcp: remove unused variable opts
b232037 lineedit: in !EDITING config, return -1 on fgets error
9371043 fix unsafe bb_perror_msg(filename) calls
225cc13 scripts/kconfig/mconf: work on systems w/o SIGWINCH
c4f2d99 libbb: correctness/size tweaks in signal-related helpers
73a1990 top: do not touch stdin if -b
06a98e3 modprobe_small: make rmmod to NOT remove dependencies. Closes 5162
0b4980c ash: trivial fixes for compile failures
ffe03f0 top: fix build failure in !USE_TERMIOS case
42be921 ps: fix build failure in !DESKTOP case
2fb8d0d top: implement scrolling up/down (_very_ useful)
3c62bba ushcpc: gracefully handle packets with CHECKSUM_PARTIAL
0ffd63c telnet: convert Enter -> CR LF in line mode too
57f07bf telnet: shrink literal string size
aca464d telnet: convert CR -> CR LF, not CR -> CR NUL when sending data to server
6d463de fbsplash: support non-RGB565 pixels in 16-bit mode
2dc1a97 find: make -mindepth N -xdev correctly stop on mountpoints
9e71e3c ash: fix "read -s" + ^C. Closes 5504
50157f3 top: fix "last CPU" parsing
c439851 sysctl: implement -q
d1d794f refactor correct_password.c to avoid one if
9b80b90 build system: stop .eh_frame generation
b7812ce wget: reorder fread and poll: poll only if fread returns EAGAIN. Closes 5426
168f87c httpd_indexcgi.c: fix compile failure
5f10fdf Fix compile failure in ll_proto.c
c5a9fa2 blkid: add support for nilfs2
8019b3a volume_id: code shrink
11f2c0d blkid: add type display for btrfs
405daff ll_proto.c: code shrink
a0fd4a7 style fixes, no code changes
41f7885 getty: tweak style, no code changes

   * external/checkpolicy
0d73ef7 Free allocated memory when clean up / exit.
ba8e992 Update to checkpolicy 2.1.11.  Requires libsepol 2.1.8.

   * external/chromium
657fb1c Revert "net: networking optimizations"
4ec08dd Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/chromium into mr1-staging
5fbe95a net: networking optimizations
db1b899 am 5dfd2805: Merge "Null pointer check missing in chromium"
5dfd280 Merge "Null pointer check missing in chromium"
a7f1721 Null pointer check missing in chromium
de6c9f9 Disable compression.

   * external/chromium-trace
a0cfa1d systrace: add support for using a trace file
37100a8 systrace: add --bus-utilization option
57a636a systrace: update to trace-viewer rev 175
6e58f01 systrace: update to trace-viewer rev 173
c5eda7d systrace: pull the latest trace-viewer
6907377 systrace: add args to update.py
2da489c systrace: rebase against upstream trace-viewer
de427be add -e option for adb serial

   * external/clang
a3a0b1e Correct build when using grep with coloured output
8675f67 clang: add support for neon-vfp instructions
210d8aa Forgot about CommentHTMLTags.td, which I had a stale copy of.
e5cc4c9 Merge up through LLVM r163557.
9f0b132 Merge branch 'upstream' into merge-2012_09_10
654f1d5 Fix PR13784: instantiation of an abstract class in a conditional operator.
b22b0a5 Move the null check outside of the loop, no functionality change.
22cd9ac [PCH] When loading fields from external storage make sure to also load in the IndirectField declarations as well.
978869a [analyzer] Make the defaults explicit for each of the new config options.
81fb50e [analyzer] For now, don't inline C++ standard library functions.
1ad23d6 Remove redundant semicolons which are null statements.
e4330a3 Comment AST: TableGen'ize all command lists in CommentCommandTraits.cpp.
db13315 Remove clang man page reference to -Oz.  It's not an option we want people to use, and is around for historical reasons.
3f0ec52 Thread-safety analysis: differentiate between two forms of analysis; a precise analysis that may give false positives because it is confused by aliasing, and a less precise analysis that has fewer false positives, but may have false negatives.  The more precise warnings are enabled by -Wthread-safety-precise. An additional note clarify the warnings in the precise case.
bd7e306 Now that I have a test file to work with, disable the Filecheck part of this test.
ac0bc91 Correctly 'cat' out test files.
15f9f74 Fix another case where we should be using isBeforeInTranslationUnit().
d727d39 Add a few more cases where we should be using isBeforeInTranslationUnit().
776da9e As a debugging aid to unbreak the buildbots, cat the plist files so I can view them on different builders.
6f93860 More tweaking and  test cases for call to super annotations. // rdar://6386358
121ec0a Re-enable FileCheck testing of retain-release.m test, and force a C++ dialect.  Let's see if this is the portability issue with this test.
9f55983 objective-C: Improving diagnostocs for missing call to super's annotated methods. // rdar://6386358
84012e6 Temporarily disable FileCheck part of this test.
0cb8939 Allow vector types in pseudo-destructor expressions. Fixes PR13798.
18857f7 Workaround for MacOSX build failure with gcc <= 4.4
acc714b Revert "Revert Ted's r163489 and r163490, due to breakage."
da88536 Make helper functions static.
a92983d Wrong crtbegin/crtend pair used for PIE on Android.
2343b3d Revert Ted's r163489 and r163490, due to breakage.
89d83ff MIPS: Use -march=arch option to select either generic MIPS ISA, or the name of a particular processor.
c265cdd Use isBeforeInTranslationUnitThan() instead of operator<.
4dfd141 Take another crack at stabilizing the emission order of analyzer diagnostics without using FoldingSetNodeIDs.  This is done by doing a complete recursive comparison of the PathDiagnostics.
fcde83c Have PathDiagnosticPiece::getString() return a StringRef instead of a std::string.
7c06f03 Indent the "message" key in analyzer plist output.
9937216 Add handy script for updating plist FileCheck expected output for analyzer tests.
4a66557 RawCommentList: don't copy the whole new RawComment to LastComment each time. We just need a single SourceLocation for previous comment end.
ce15cce Remove dead method ProgramState::MarshalState().
762f159 Added missing const.
e75bb61 Fixed support for disabled wchar_t and added an appropriate test.
eb3546e clang/test/Sema/format-strings-scanf.c: Relax a couple of expressions with expected-warning-re to let matched for Win32 targets.
3c7f538 Add some ARM EABI preprocessor builtins tests
8b0703d Do not construct StringRef from NULL argument.
70a5cca Provide some ACLE C defines. This should fix PR13796
9655ecb Try disabling the FileCheck part of the retain-release.m test to see if it fixes the buildbots.
22505ef Fix bug in BugReporter::RemoveUneededCalls() where "prunable" PathDiagnosticEventPieces were *always* pruned.  Instead, they are suppose to only be pruned if the entire call gets pruned.
e5f0588 When a bad UTF-8 encoding or bogus escape sequence is encountered in a string literal, produce a diagnostic pointing at the erroneous character range, not at the start of the literal.
49f9434 This test does not require --exact-match from FileCheck.
0187a1b Attempt (again) to stabilize the order of the emission of diagnostics of the analyzer by using the FullProfile() of a PathDiagnostic for ordering them.
8be066e Format strings: suggest %lld instead of %qd and %Ld with -Wformat-non-iso.
bbb6bb4 Format strings: %Ld isn't available on Darwin or Windows.
7ac9ef1 -fcatch-undefined-behavior: Factor emission of the creation of, and branch to, the trap BB out of the individual checks and into a common function, to prepare for making this code call into a runtime library. Rename the existing EmitCheck to EmitTypeCheck to clarify it and to move it out of the way of the new EmitCheck.
82f2ad4 [analyzer] ObjCSelfInitChecker should always clean up in postCall checks.
a435e69 [analyzer] Add debug output for ObjCSelfInitChecker's state.
30ca732 Revert "Add plist output for retain-release.m in addition to -verify checking."
e157ae5 Revert "Attempt to make the PathDiagnostic emission order more deterministic by"
62a4563 Revert "Further tweaks to hopefully make the PathDiagnostic emission more deterministic."
24c7f98 [analyzer] Remove constraints on dead symbols as part of removeDeadBindings.
f6d05bb [analyzer] Symbolic regions are live if any subregions are live.
9874f59 [analyzer] Cast the result of a placement new-expression to the correct type.
9f6ec82 [analyzer] Address John's code review for r163407.
8410113 objective-C: introduce __attribute((objc_requires_super)) on method in classes. Use it to flag those method implementations which don't contain call to 'super' if they have 'super' class and it has the method with this attribute set. This is wip. // rdar://6386358
f9fdcc0 In ARC, if we're emitting assembly markers for calls to objc_retainAutoreleasedReturnValue, we need to also be killing them during return peepholing.  Make sure we recognize an intervening bitcast, but more importantly, assert if we can't find the asm marker at all.  rdar://problem/12133032
ec5fda4 Further tweaks to hopefully make the PathDiagnostic emission more deterministic.
c80ca02 Fixed http://llvm.org/bugs/show_bug.cgi?id=13777
47cbd0f Remove ProgramState::getSymVal().  It was being misused by Checkers, with at least one subtle bug in MacOSXKeyChainAPIChecker where the calling the method was a substitute for assuming a symbolic value was null (which is not the case).
b4b4523 Attempt to make the PathDiagnostic emission order more deterministic by looking at PathPieces.
526b4a6 Add default implementation of ConstraintManager::getSymVal() and a doxygen comment.
ace64b5 Remove ConstraintManager:isEqual().  It is no longer used.
2308436 Add plist output for retain-release.m in addition to -verify checking.
589190b Ampersand goes with identifier.
9198c71 [analyzer] Use cast<> instead of getAs<> for a CFGElement known to be a CFGStmt.
9366a5a Moved back getCharAndSizeNoWarn to public area.
258bd59 [analyzer] Fix a false positive in sizeof malloc checker.
c957319 Add test case for <rdar://problem/12075238>, which recently got fixed by changes to RegionStore.
3d074c3 Whitespace.
2de4770 Bring buildbots back.  Fix scoping issue and coding style from r163397.
b5204ee [analyzer] Don't use the address of a temporary CFGElement.
0b4db3e Thread-safety analysis:  Add support for selectively turning off warnings within part of a particular method.
99d68e9 [analyzer] Explain why we need condition 8.
8c6a057 Attempt to pacify Windows buildbots.
f651381 Link to crtend.S when PIE in the FreeBSD driver. Patch by Brooks Davis!
a4728e5 Adds a first iteration of the basic AST matcher documentation landing page.
67619ff Introduces anchors into LibASTMatchersReference.html.
76dafa7 Change the behavior of the isDerivedFrom-matcher to not match on the class itself. This caused some confusion (intuitively, a class is not derived from itself) and makes it hard to write certain matchers, e.g. "match and bind any pair of base and subclass".
579b120 Implements hasAncestor.
971073b Revert "Rework the retain-release.m test to use FileCheck and the "text" output"
2ab012a Fix off-by-one bug in diagnostic prose of ObjCContainersASTChecker. While the check itself should count 0-based for the parameter index, the diagnostic should be 1-based (first, second, third, not start at 0).
62bde3e ExplodedGraph::shouldCollectNode() should not collect nodes for non-Expr Stmts (as this previously was the case before this was refactored).  We also shouldn't need to specially handle BinaryOperators since the eagerly-assume heuristic tags such nodes.
689268a Rework the retain-release.m test to use FileCheck and the "text" output of the analyzer, as the RetainReleaseChecker has many fine-grain path diagnostic events that were not being checked.  This uncovered an inconsistency between the path diagnostics between Objective-C and Objective-C++ code in ConditionBRVisitor that was fixed in a recent patch.
c47dc1b Fix bug in ConditionBRVisitor where for C++ (and not C) we were not ignoring implicit pointer-to-boolean conversions in condition expressions.  This would result in inconsistent diagnostic emission between C and C++.
6964b3f PR9023: A template template parameter whose template parameter list contains an unexpanded parameter pack is a pack expansion. Thus, as with a non-type template parameter which is a pack expansion, it needs to be expanded early into a fixed list of template parameters.
8f0d0fe [analyzer] Fail gracefully when the dynamic type is outside the hierarchy.
061707a Teach RetainCountChecker that CFPlugInInstanceCreate  does not return a CF object at all.
5601c9a [analyzer] Don't crash if we cache out while evaluating an ObjC message.
1edeed3 [analyzer] Assert that StmtPoint should be created with a non-null Stmt.
817ce3d [analyzer] testing: add a build mode to allow C++11 testing.
ec9f36e Refine diagnostics for leaks reported when returning an object via function/method with [CF,NS]_RETURNS_NOT_RETAINED.
2827f5a Tweak DeadStoresChecker to not warn about dead stores to variables that are used in EH code.  Right now the CFG doesn't support exceptions well, so we need this hack to avoid bogus dead store warnings.
8123b6e Clarified diagnostics for range-based for loops with invalid ranges
200fa2e [analyzer] Don't attempt to devirtualize calls to base class destructors.
c691649 [ms-inline asm] Output empty asm statements for the directives we don't handle.  Otherwise, the AsmParser will explode if we try to generate an object files.
acc22b6 [ms-inline asm] The IR representation of inline assembly enumerates the input and output expressions much like that in GNU-style inline assembly. Output expressions are first.  Do this for MS-style inline asms.
3359fa3 refactoring + objective-C specific test for my last patch. // rdar://12233989
cddbc1d Don't try to check override control for invalid member functions. Fixes a crash in a corner case. Patch by Olivier Goffart!
9ed63f8 Use custom ABIInfo for le32/PNaCl argument codegen
2675b8e Enabling the UTF conversion routines that were previously conditionally ifdef'ed out. This change is required to support enhancements in the LLDB data formatters
2d234d73 Fixing the return type information for objc_sync_enter and objc_sync_exit.  Patch thanks to Joe Ranieri!
2d40d9e c: make __attribute__((unused)) transitive.    Don't warn if annotated decl is used inside another    unused. // rdar://12233989
8e5264f Tighten up regexps some more.
1014ecf Remove unused typedefs. Found by gcc48.
31ba613 Dont cast away const needlessly. Found by gcc48 -Wcast-qual.
a8ee441 Update AddressSanitizer docs
a285e7d Fix a mistake in an HTML example code snippet.
69e4826 PR13775: When checking for a tag type being shadowed by some other declaration, don't trample over the caller's LookupResult in the case where the check fails.
9b925ac [analyzer] Enhance the member expr tracking to account for references.
faadf48 Continue including temporary destructors in the CFG used for warnings.
ec08735 Format strings: suggest casts for NS(U)Integer and [SU]Int32 on Darwin.
614a865 Format string checking: change long if-statement to early returns.
5a1ffe9 [analyzer] Always include destructors in the analysis CFG.
352c657 [analyzer] Fix a crash PR13762.
d91696e [analyzer] NullOrUndef diagnostics: track symbols binded to regions.
9bc1e6d [analyzer] Remove unneeded code.
758c30c Add test missed in previous commit.
b60afba Try to fix the windows bots.
c55da4b Apply some driver improvements for freebsd-*-mips*.
857134e [cindex.py] Make the use of a compatibilty check explicit
fd0f11c Thread-safety analysis: bugfix for case where a trylock occurs in an expression involving temporaries.
255793d objective-c++11: c++11 does not change pod-ness when type is an unqualified objc pointer in arc. Treat it just as being treated in c++98. This fixes a bogus vararg warning with -std=c++11. //rdar://12229679
fcf75a3 Update for r163231.
b197b78 Added missing test.
37c765a c error recovery. treat an invalid redeclaration of a c-function for what it is. Otherwise, this func is treated as an overloadable c-function resulting in a crash much later. // rdar://11743706
e885dd6 [analyzer] Fix bad test from r163220.
5b86ffd Allow disabling of wchar_t type.
6ebea89 [analyzer] Be more forgiving about calling methods on struct rvalues.
4e45dba [analyzer] Clean up a couple uses of getPointeeType().
fd11957 Revert "[analyzer] Treat all struct values as regions (even rvalues)."
a78d0d6 Introduces DynTypedMatcher as a new concept that replaces the UntypedBaseMatcher and TypedMatcher.
3d35a54 New clang-check vim integration script
536afbe Do not add using directives to a function decl context when instantiating.
4f216d38 Fixed lexical decl context of out of line class template instantiations.
45e4e08 Changing of type checking order on InitListExpr - UnionType is checked eariler than RecordType.
8cdd8a9 Update for r163187.
1524de1 [ms-inline asm] Update test case for r163181.
790cbd8 [ms-inline asm] Set the inline assembly dialect in CodeGen.
d21c964 Fix indentation.
ef5c554 [ms-inline asm] Remove the Inline Asm Non-Standard Dialect attribute.  This implementation does not co-exist well with how the sideeffect and alignstack attributes are handled.
2ab7d43 Minor cleanup to improve code readability.  No functional change intended.
791dd0a [analyzer] Don't use makeIntVal to create a floating-point value.
568ba87 Revert r163083 per chandlerc's request.
4c5fa42 Revert r163099 per chandlerc's request.
5d9cb1b Revert r163076 per chandlerc's request.
679fc93 Revert r163078 per chandlerc's request.
21a3704 [ms-inline asm] The MCInstrDesc only tracks register definitions.  For now, assume that if the 1st operands is an expression and the instruction mayStore, then it is a memory definition.
12603e2 [ms-inline asm] Fix an illegal index and an 80-column violation.
d5eb585 Fix 80-column violation.
1b497f2 [ms-inline asm] Use the new GetMCInstOperandNum() interface in the front-end.
fcbc0fb [cindex.py] Allow to configure the path of libclang
ccbbac8 test/Driver/android-standalone.cpp: Fix test failure on Windowns, again.
9a134af Improved the warning for the #@ Microsoft charizing operator. The existing one misspelled the token as "@#" and didn't capitalize Microsoft.
6de9ede Fix test failure on Windowns.
e972cb4 Follow-up on r163110 - forgot to commit some new tests...
a04ca5c Fix PR13444 - wrong mangling of "const char * const *" and friends with "-cxx-abi microsoft"
1d01afe Android standalone toolchain support.
7065c52 Removed unused argument.
be5c3fb [ms-inline asm] Update for the MatchInstruction API change in r163101.
ac06745 Added a new cursor for SEHLeaveStmt to libclang.
94a7142 Rename ANDROIDEABI to Android.
ca0d10e Documentation cleanup: Add \file comment for ASTContest.h, add \brief to many items, remove redundant names from doc comments, fix various typos, and tidy up some wording.
5be92de Implemented parsing and AST support for the MS __leave exception statement. Also a minor fix to __except printing in StmtPrinter.cpp. Thanks to Aaron Ballman for review.
8503885 Include the diagnostic introduced in r163078 in a group.
f712c48 Added a diagnostic for mismatched MS inheritance attributes. Also fixed the incomplete type member pointer size calculation under the MS ABI.
c4f0f46 Fixed typo causing tests to fail on non-MSVC machines.
601944a Refactored the Windows headers location lookup code. Expose it so standalone tools can have access to it.
9eb214a [analyzer] Silence unused variable warnings in NDEBUG builds.
754a5d1 [libclang] Fix indexing type alias declarations. rdar://11878406
d579dd5 [libclang] The annotation of tokens operation visits statement nodes code-recursively. This can blow the stack with extremely deep hierarchies. Switch it to data-recursive.
91ab900 [analyzer] Disallow creation of int vals with explicit bit width / signedness.
d047135 [analyzer] Don't attempt to create a floating-point value of "1" for ++/--.
4a25f30 [analyzer] Future-proofing r163012 (nameless functions and RetainCountChecker)
02df4f0 [analyzer] Treat all struct values as regions (even rvalues).
5699f62 [analyzer] Always derive a CallEvent's return type from its origin expr.
010556e [cindex.py] Add helper to initialize libclang functions
296028e Comment that clang.dll is unavailable on cygming yet.
b6678d7 c-arcmt-test/Makefile: Restore some stuff. clang.dll is unavailable on cygming yet.
2193012 Tweak link order to hopefully resolve a buildbot failure.
305c613 Split library clangRewrite into clangRewriteCore and clangRewriteFrontend. This is similar to how we divide up the StaticAnalyzer libraries to separate core functionality to what is clearly associated with Frontend actions.
f143ae9 Changed the remaining dead asserts to llvm_unreachable.
06b3a06 don't warn about unused values when the unused value is a statement expression expanded from a macro.  This is of dubious utility in general, but is specifically a major issue for the linux kernel.  This resolves PR13747.
17d35c3 Normalize line endings of r163013 (part 2).
7aaa167 Remove windows line endings.
5408153 Thread-safety analysis: fix handling of LOCK_RETURNED attribute so that the latest definition of a function is always used when computing lock expressions.
1999bd6 Update a warning to point to the DiagGroup created in DiagnosticGroups.td instead of referring to the flag name.
4e4c157 Thread-safety analysis: fix handling of string constants in mutex expressions, which should be ignored right now.
35adca0 Fix the build (-Wswitch violation introduced by r163013).
ec2f579 Normalize line endings of r163013.
3e1ec72 Normalize line endings of r163022.
181cd5b Emulate MSVC's preprocessor macro argument separator behavior by not considering commas from nested macro expansions as argument separators. Fixes parsing of VS 2012 headers.
7e2e4c3 objective-C ARC; detect and warn on retain cycle when property-dot syntax is used on an object whose capture causes retain cycle. // rdar://11702054
6666ed4 Improved MSVC __interface support by adding first class support for it, instead of aliasing to "struct" which had some incorrect behaviour. Patch by David Robins.
a89f719 [analyzer] RetainCountChecker: don't assume all functions have names.
e4d90e1 Fixed invalid iterators. Since the iterator is invalidated after the erase() call, we need to replace it with the new one returned. This was triggering an assert under MSVC 2012 and making all the ARCMT/ tests fail.
de5277f [analyzer] Though C++ inlining is enabled, don't inline ctors and dtors.
376c432 objective-C: underline name of the missing method in the diagnbostic. // rdar://11303469
af503a6 Remove the useless CommentOptions class.
da5922f Use LLVM_DELETED_FUNCTION instead of a comment.
45796b1 Make AnalyzerOptions a shared object between CompilerInvocation and AnalysisManager, allowing the StringMap of configuration values to be propagated.
987695a Move AnalyzerOptions.h into 'Core' StaticAnalyzer sub-library.
976f118 DeclPrinter tests: simplify the code by using the new runToolOnCodeWithArgs function from Tooling.
dfccbd9 Documentation: correct a typo introduced in r162971.
44470ef DeclPrinter tests: since now some platforms use C++11 by default, make it explicitly visible in test cases which language variant is used.
a8ba40e Documentation: add missing word "accepts".
e506f8a Make a bunch of methods on Lexer private.
c24a76e Comment HTML tag name machers: move from StringSwitch to an efficient TableGen-generated string matcher.
191e2b1 Revert "[analyzer] Disable diagnostic checking on the buildbot."
3a46f5f [analyzer] Ensure that PathDiagnostics profile the same regardless of path.
8c916ee [analyzer] Fix a crash in plist-html generation introduced in r162939.
a6c66ce Change the representation of builtin functions in the AST (__builtin_* etc.) so that it isn't possible to take their address. Specifically, introduce a new type to represent a reference to a builtin function, and a new cast kind to convert it to a function pointer in the operand of a call.  Fixes PR13195.
918546c objective-C ARC: under -Wexplicit-ownership-type diagnose those method parameter types which are reference to an objective-C pointer to object with no explicit ownership. // rdar://10907090
fbcb3f1 [analyzer] Refactor the logic that determines if a functions should be reanalyzed.
43d3974 [analyzer] Remove cast inside dyn_cast.
3f2a55d [analyzer] Make analyzer-ipa=dynamic-bifurcate the default.
dc601f4 [analyzer] Fixup for r162935 as per Jordan's review.
482466b Switch a couple getAs uses to castAs.
ccc4f28 The presence of a user-*declared* constructor makes the default constructor not user provided (and, therefore, non-trivial). Fixes <rdar://problem/11736429>.
befc0f6 [analyzer] Disable diagnostic checking on the buildbot.
f9f5fdb [analyzer] Plist diagnostics: Fix a case where we fail to close an XML tag.
9f6419f Add -Wduplicate-enum warning.  Clang will emit this warning when an implicitly initiated enum constant has the same value as another enum constant.
d295970 Extend the "__is_pod" hack, which demotes various type trait keywords (__is_pod, __is_signed, etc.) to normal identifiers if they are encountered in certain places in the grammar where we know that prior versions of libstdc++ or libc++ use them, to still allow the use of these keywords as type traits. Fixes <rdar://problem/9836262> and PR10184.
66341c5 Fixes a bug for binding memoized match results.
05fcbd3 [analyzer] Do not propagate the [super init] could be nil assumption from callee to caller.
e788365 Teach RetainCountChecker about 'pragma clang arc_cf_code_audited'.
9413dc0 Fix missing 'clang' in pragma example in ARC doc.
2fa9d72 Rename 'MaxLoop' to 'maxBlockVisitOnPath' to reflect reality.  We should consider renaming the command line option as well.
3b8a040 Rename 'VisualizeEGUbi' and 'VisualizeEGDot' to 'visualizeExplodedGraphWithUbigGraph' and 'visualizeExplodedGraphWithGraphViz' respectively.
0caa2d4 Rename AnalyzerOptions 'EagerlyAssume' to 'eagerlyAssumeBinOpBifurcation'.
255d4d4 Store const& to AnalyzerOptions in AnalysisManager instead of copying individual flags.
5705a40 Move AnalyzerOptions.h to include/clang/StaticAnalyzer.
82f5ace Move Analyses.def to include/clang/StaticAnalyzer.
9617130 objective-C: clang must implicitly convert __objc_yes/__objc_no to (BOOL)1/(BOOL)0 when BOOL is declared; otherwise it resorts to default of 'signed char'. This is important to selecting the correct Numeric API numberWithBool: Can't have a clang test for this. Will checkin and executable llvm test. // rdar://12156616
c30981a Make preprocessor act in a GCC-compatible fashion when a macro is redefined within its own argument list. The original definition is used for the immediate expansion, but the new definition is used for any subsequent occurences within the argument list or after the expansion.
3bc2226 PR13652: Don't assume the parameter array on a FunctionTypeLoc for a lambda will be filled in; they won't if the lambda's declarator has an invalid type. Instead take the parameters from the declarator directly.
6f79420 WWW: Force word wrapping of the content to avoid horizontal scrolling.
318cc3c Change -analyzer-config to use '=' as the key-value separator, and only support the '-analyzer-config key=val' variant.
50f88b9 Reland r160052: Default to -std=c++11 on Windows.
5666988 Tooling: Add a runToolOnCodeWithArgs() function that allows passing additional parameters to a tool.
6422149 Fix C++ comment in C source
c586d5d Fix a crash in type merging with enum types.
ecbbea4 Emit .gcda files as absolute paths instead of relative paths.
9757377 Make this test portable.
554067f [analyzer] Stop tracking symbols based on a retain count summary of inlined function.
28694c1 [analyzer] Fixup 162863.
9af9122 Fix serious regression introduced in r157780 where __attribute__((NSObject)) could not be attached to a CFTypeRef.
97d3f3b Fix PR reference in test.
45dae62 Fix run-line for test.
3defb0b [analyzer]Fix typo, unbreak static analyzer BuildBot (at least partially).
80de487 [analyzer] Improved diagnostic pruning for calls initializing values.
a484fc7 Make alignment computation for pointer values for builtins handle non-pointer types with a pointer representation correctly. PR13660.
600a513 Define __mips64 / __mips64__ macros for MIPS 64-bit targets. The patch suggested by Brad Smith.
1d8ae1d Use getTargetDefines() virtual function in MipsTargetInfoBase successors to define all macros for MIPS targets. Remove redundant virtual function getArchDefines(). Two virtual functions for this task are really too much.
d4935a0 Factor out MIPS macro definitions common for all MIPS targets.
48def65 Move TLS check from LValueExprEvaluator::VisitVarDecl to CheckLValueConstantExpression.
a414a2f objective-C: make -Widiomatic-parentheses work when assignment expression in conditional invloves property reference. // rdar://11066598
e40c423 Fixed a problem with #pragma push_macro/pop_macro implementation.
260e506 Define _MIPS_ARCH and _MIPS_ARCH_<cpu name> macros for MIPS targets. The patch suggested by Logan Chien.
a14f400 Reversing the logic since C99 mode is actually not an extension.  Also, changing the group to the singular to match the diagnostic better.

   * external/compiler-rt
e42ad69 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/compiler-rt into mr1-staging
1f922a5 Merge up through LLVM r163557.
5693718 Merge branch 'upstream' into merge-2012_09_10
78aedd4 build/clang_darwin: Add the ASAN dynamic library.  - Now with spelling fix for -lstdc++.
d2f2615 Revert r163415 in an attempt to bring back the buildbots.
4a4719c [asan] There is no __libc_malloc on Android.
8d6e3f7 Allow to call strchr() from __asan_init(). Fixes PR13794.
5b36c14 build/clang_darwin: Add the ASAN dynamic library.
0d02f1f [asan] Use a relative include path instead of requiring build system involvement.
38b7c1b build: Teach Makefile build system about asan/dynamic subdir.
8bc01cb build: Add support for building dylibs.
f4e21fb [asan] Suppress some bogus -Winvalid-noreturn diagnostics.
0c2feef tsan: ignore destruction of global mutexes (causes a lot of non-interesting reports)
8e23d27 Remove the infinite recursion check for now, as we don't have __thread on Mac, and TSD is an overkill.
5aabcb5 Two minor changes:  -- exit from infinite recursion in CHECK()  -- print a verbose message if mapping of the shadow memory has failed.
7315c26 [asan] Raise quarantine size a bit with ASAN_LOW_MEMORY.
d796359 [ASan] hack initialization-bug test so that it stably passes on both Linux and Mac: make the bug appear independent of the translation unit order
ef69812 [ASan] add Linux-specific test for initialization order that checks that we find a bug independently of translation units order
3bb7e52 [Sanitizer] add --demangle option to llvm-symbolizer (for now just assume that __cxa_demangle option is available)
03e23bb tsan: fix code style
0ab628c tsan: increase max shadow stack size + reduce memory consumption at the same time (by not memorizing full stacks in traces)
dd5a237 tsan: fix Go build script
78c7f57 Fix two compiler warnings: must use at least one argument for "..." in a variadic macros, signed vs. unsigned comparison.
e0e9eea [asan] Use __ANDROID__ guard in asan_test.
e9f5785 Use the return value of dladdr() to avoid Clang warning.
6d924fa [asan] increase max stack size to 256 (+test)
6d8091d Add "movsbl %dh, %ecx" and "testb %r8, %r8" to mach_override. This should fix http://code.google.com/p/address-sanitizer/issues/detail?id=105
ba534e7 [ASan] actually remove old makefile
8cc1f81 [TSan] add support for running external symbolizer other than addr2line (for testing purposes)
03e699f [Sanitizer] remove unused field
5b1f020 [ASan] Nuke output_tests/ in favor of lit_tests/. Stop using Makefile.old.
ff392a4 [asan] increase the maximal size of malloc/free stack
d1b8f58 [Sanitizer] implement readlink as syscall on Linux
4a78b1e [ASan] Hack ASan lit config to allow running lit on tests manually
5f799c7 [asan] added tests for asan-initialization-order, patch by Reid Watson
0f7d4a4 [ASan] hoist more compile flags to SANITIZER_COMMON_CFLAGS var and add the rest of flags/defs from old Makefile to CMake
656e4ee [ASan] Add CMake support for building ASan benchmarks
71b42c9 [ASan] Add print_full_thread_history runtime option (on by default) that prints all full thread creation paths for threads involved in ASan error report
1dc4cf7 [Sanitizer] Remove implicit conversion of InternalScopedBuffer<T> to T*
38e853d [Sanitizer] Support for reading inlined frames from llvm-symbolizer
c5fee8e [compiler-rt] Recurse into 'utils' directory in CMake build of compiler-rt, enable build of llvm-symbolizer binary (currently for one target only)
92656f8 [Sanitizer] llvm-symbolizer util: make it more conforming to LLVM code style, and support fetching inlining info
aaac6e2 tsan: do not crash with obscure message if a user passes invalid arguments to malloc/free/memset/etc
41e8153 tsan: insert cfi directives into assembly (not fully working for now, though)
0542644 tsan: more robust current thread stack restoration
1da1056 tsan: better diagnostics for mutex misuse
9adce67 tsan: fix crash when users pass insane mutex addresses in dynamic annotations
8485311 tsan: add "as if synchronized via sleep" feature
1b1de03 tsan: fix windows build (2)
0d9c08d tsan: fix windows build (1)
c00e30a tsan: slightly optimize mutex unlock
7643a50 tsan: more precise handling of atomic_store(memory_order_release)
84112a3 tsan: improve stack depot
c79c21f [tsan] locate the auxilary space for tsan's Allocator64 after the main region, not before. This simplifies the shadow mappings
98ea507 [Sanitizer] fix overloaded operator error
2132d13 [compiler-rt] fixup for r162988 - remove accidentally commited file
8790f0a [compiler-rt] Move draft code for llvm-symbolizer to compiler-rt/utils/llvm-symbolizer after chandlerc's suggestion
2acf556 [Sanitizer] Remove some calls to libc malloc from symbolizer
678b2fe [Sanitizer] Resolve fixme: break dependency of sanitizer_common tests on TSan RTL
02aa242 [Sanitizer] Make lint checking a standalone script in sanitizer_common
184fdd7 [Sanitizer] Remove lint checkers from our old makefiles in favor of buildbot
ada9236 [TSan] Fix style warinings in output test
5092682 Whitespace/lint
af31087 tsan: speed up allocator64 GetBlockBegin()
9d6f5a8 tsan: simplify TSAN_HISTORY_SIZE code
ff35f1d tsan: use stack depot to describe heap blocks
1b37017 asan/tsan: first version of "stack depot"
6282567 [ASan] fix flakiness of Linux-specific clone_test: waitpid should better be provided with __WCLONE option, otherwise it didn't wait for the subprocess, returned -1, and we went crushing the subprocess stack
2122f70 For invalid pointers passed to free_common check whether they are actually skewed to hold an additional CFAllocatorRef. If so, fix the pointer and pass it to asan_free.

   * external/dnsmasq
78088ee Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/dnsmasq into mr1-staging
c3a70a9 fix memory leaking

   * external/doclava
a5c4ed1 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/doclava into 1.1
a75af37 Temporarily add a content type to fix builds.
5bc5316 add timestamp.cs to doclava to fix break (unknown dependencies for doc builds)
460dd2a remove condition for devsite and use the timestamp js for all doc builds
9b316c8 Doclava: add support for a second html dir and associated output. This is primarily for devsite online docs builds. Also move ca151a9bbea066b0efd0e423bcade8895a83db71 and related changes into production docs branch.
0901a61 another fix to remove generics info from sidenav. they were still appearing in the nav while viewing a package page. bug: 7242415
4ec568b more fixing for tags: provide proper links for @value tags.
f19066f fix build
99e4ebe further support for @value tag to print fully qualified name
e94aecf add support for @value tag
5ab9cb5 add support for gms and gcm javadocs
c60a46c cherypick from jb-dev-docs Change-Id: I1d7b357c6c7fa172cc0099c489072665e8a35a85
40ad147 cherrypick Change-Id: Ic7cc0864518fef95b106ab3d392c47eb225404bf Add HDF meta-data for the version in which an API was deprecated
ccc2f8e cherry pick from jb-dev-docs Change-Id: I87accadfadc9d4535f3c4aed1b4bcebb05a38454
b5a9880 Merge branch 'goog/froyo-ub-gcore-asiago' into jb-mr1-dev

   * external/e2fsprogs
a4ea106 blkid: Add support for probing exFAT
4ecbd86 Fix dev time initialization for cache age caculation
9a32625 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/e2fsprogs into mr1-staging

   * external/eclipse-windowbuilder
47395d9 Merge "Update Guava from 10.0.1 to 13.0.1"
e59c38e Update Guava from 10.0.1 to 13.0.1

   * external/elfutils
a7cdbea Add support for clang: elfutils seems to exclusively use a gcc extension, nested functions. clang does not implement this extension, but does have a similar feature, blocks. They both function in essentially the same way: closures in C.

   * external/emma
f4cbc40 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/emma into mr1-staging

   * external/exfat
99e4fbe Call exit instead of abort on unhandled errors
454ec89 Handle 64-bit offsets correctly on Android
e145047 Add support for building on Android
0869b79 Removed OpenBSD-specific macros because there is no OpenBSD port anyway.
e4672b5 Removed Solaris-specific macros because Solaris support is broken anyway.
5e327ed Fixed __attribute => __attribute__.
96337bd Use C11 _Static_assert if it is supported by a compiler.
fed3a95 Modified STATIC_ASSERT so that it can be used both inside and outside of functions.
7a0d9ca Remove excessive semicolons after static asserts.
9481a09 Move compiler-specific code into a separate header.
5e85d75 Removed extra error message.
18baf0c Update volume label in struct ef on exfat_set_label().
6b83efb Fixed handling of long non-ASCII file names.
c79ca50 Move platform-specific code into a separate header.
347324f Allow arbitrary changing of lower 9 bits of mode. Allow owner/group changing to the same owner/group. Remove "quiet" option.
52da908 Fixed grammar in mount.exfat-fuse manpage.
f5f9a59 Added "quiet" option that makes chmod() and chown() always succeed. Useful for applications that fail if chmod() or chown() is not implemented.
673e96f Allow -v option for compatibility with mount utility (it passes -v to its helpers).
c71ff9d Use getopt() for options parsing.
f970357 Use -V instead of -v option to print version for consistency with other utilities.
855f79f Allow -n option for automount/autofs compatibility.
8f6e8b1 Avoid extra erase on writes to the end of a file.
e83a219 Add fsname parameter as is, without canonicalization and symbolic links expansion. This fixes TrueCrypt disks unmounting.
d7520d6 Use bool type.
4882062 Made next_entry() function static.
3501433 Fixed unexpected removal of a directory if it is moved into itself: return EINVAL in this situation. It also happens when trying to change directory name case.
19e6dd7 Fixed "Operation not permitted" error on reading an empty file: FUSE read/write ops should return a number of bytes actually read/written or -errno on error.
167ba2f Bumped version to 1.0.0 and updated changelog.
de1635e Updated copyright years.
574f0b0 Fixed clusters allocation: a cluster beyond valid clusters range could be allocated.
6a161d7 Avoid using PATH_MAX constant.
bdacfb9 OS X: disable permission checks made by FUSE.
882c51c Removed duplicate code in reset_cache(): now it uses tree_detach() to remove children from the list and the whole tree is consistent at any iteration.
bf2f4fc Moved tree_attach() and tree_detach() upper so that they could be used by reset_cache().
d724d4b Fixed extra decrement of reference counter of hanging nodes.
6c2dc0c Fixed cleaning of libexfat broken in r312.
076b2d4 Get PATH and SYSROOT variables from environment if they are defined.
9501078 Respect AR and RANLIB environment variables in SConscript.
265b26e Seek to the beginning of the device after detecting its size (dumpexfat relies on this).
7f62182 Print device name in the error message.
bfdb715 Fixed indentation.
6dbe4ef Improved trace macros.
5d55696 Enabled big_writes. This improves write speed (larger block size means less switches between kernel- and user-space).
cd909f8 FUSE read and write ops should return either buffer size on success or EOF otherwise.
0bf92e4 Fixed exfat_generic_pwrite(): it should return -1 on error, not -errno.
3f25dcf Replace fixed PATH to the value from environment. This makes scons find build tools in non-standard directories specified in PATH.
16b438a Check compiler presense in SConscript.
b4216a2 Check size of off_t type in SConscript.
0eae19f Do not configure when cleaning.
8264839 Remove symlinks on cleaning the install alias.
b630d12 Fixed crash in exfat_rename() when renaming a file within a single directory and a new name differs only in case.
a8632ca OS X: fixed raw device size detection. Each disk has two names: /dev/diskN (block device) and /dev/rdiskN (raw device).
5aa1ec4 Use bool type.
6ae76ab OS X: correctly detect device size.
f25007b Renamed exfat_mode() to exfat_get_mode().
8f92262 Removed extra include.
98418b0 Check file size after all name entries are parsed and print file name in case of error.
9ba90d1 Do not print directory name on size check failure because name is not yet available.
5deecdf Use bool type.
347216c OS X: set deployment target to Mac OS X 10.5 Leopard.
8143355 On Linux do BLKROGET ioctl to make sure the device is not read-only: after "blockdev --setro" kernel still allows to open the device in read-write mode but fails writes.
8b0faa8 Refactored device access mode handling.
78aa789 OS X support:  - use proper macro for inode numbers bitness management;  - switch to 64-bit inode numbers (this requires Mac OS X 10.5 or later);  - switch from unmaintained MacFUSE to OSXFUSE (http://osxfuse.github.com).
87b5980 OS X utilities report error if fchmod() fails. Added empty chmod() handler as a workaround.
2ffd8be Improved invalid clusters handling.
1f4c14b Reorganized directories checking: check directory before its files, do not check files if directory is corrupt, check root directory.
9fbcec2 Improved error handling.

   * external/expat
bb9f3f7 am 7174719f: Merge "Upgrade to expat 2.1.0."
7174719 Merge "Upgrade to expat 2.1.0."
35e432d Upgrade to expat 2.1.0.

   * external/freetype
8ba9876 Revert "Upgrade FreeType to 2.4.10"
bad440f Revert "freetype: Add Infinality patches"
d4c5fd1 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/freetype into mr1-staging

   * external/fsck_msdos
6ff3a58 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/fsck_msdos into mr1-staging

   * external/fuse
cc7afb6 Allow building when strict aliasing
ef9e674 Add missing config.h for Android
f36e7c5 Support for building on Android
d44bf3a Released 2.9.3
014d950 libfuse: don't close fd if it's -1
ddfd2d4 libfuse: fix multiple close of device fd
44088bc libfuse: fix thread cancel race
22d0d42 Add "nopath" to help.
eb385fb libfuse: rename ./configure.in to ./configure.ac
839550d libfuse: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER
f80f367 libfuse: configure: detect new util-linux
d7bf78d libfuse: fix the 'remember' option
3a2bd4d libfuse: fix crash in unlock_path()
ad38195 Released 2.9.2
66956b6 Fix deadlock in libfuse

   * external/google
c2c36dc use source built gson
94e2ac0 Add gson-2.2.4. Add target to libGoogleAnalyticsV2.
33c92d2 wholesale copy of google sdk bits
9536bb1 initial commit

   * external/gson
ca8ca14 Android.mk
8da5d99 [maven-release-plugin]  copy for tag gson-2.2.4
c0e27bc [maven-release-plugin] prepare release gson-2.2.4
cc77081 Moving broken class to "test" package for now and disabling broken test.
24d67ad Fix hashing in LinkedHashTreeMap, but it still does not work :(
10fd6dc Remove unused import
308003f Added test to use BigDecimal to parse number when requesting it as a long.
e79603a Create a LinkedTreeMap based on the LinkedHashTreeMap; however, removed all the hashing from it as resorted to a single tree. The insertion order is still preserved.
470e057 Fix test that expects an exception to fail if no exception is thrown
a4c68cb Test to expose edge doubling and rehashing bug in LinkedHashTreeMap.
713448c Added test for comments inside a string value.
7202eed 2.2.3 javadocs
c2041fb [maven-release-plugin] prepare for next development iteration
677cf0a [maven-release-plugin] prepare release gson-2.2.3
ac07a9a updated maven plugin versions
d031523 ensuring that LinkedHashTreeMap.contains() returns false when non-Comparable() keys are passed to it
1e25624 made inner classes static and final
bcd6a23 eliminated eclipse warnings by adding a default label to switch.
3460c63 removed more eclipse warnings
983fc64 removed eclipse warnings, unused fields. Made inner classes static where possible.
0e8569a Remove usage of StringPool as it appears to slow things down and avoid Java String intern for the common cases.
d5140b8 Re-add non-comparable key tests to LinkedHashTreeMap.
879df27 fixed https://code.google.com/p/google-gson/issues/detail?id=491 by adding OSGi entries for maven-source-plugin
c22c668 deleted unused enum and reordered imports
05c8a39 Use the LinkedHashTreeMap instead of LinkedTreeMap and delete the LinkedTreeMap version.
f31a285 fixed https://code.google.com/p/google-gson/issues/detail?id=509 by adding construction for EnumSet
d5b5d0d Use the right method name in error messages.
7efb59c Permit serialization of "Class" fields, but only if they're null.
1d73cf3 Tag member fields as transient since a LinkedHashMap is used for serialization.
f4ae65f Additional changes to a map test with "null" string key.
c54f1c3 Fix object leak from ThreadLocal.
377380d Minor addition to the JsonNullTest.
22d573c Do not peek during a "skipValue" if a value has already been peeked.
8b3b867 Stop blowing up on a null key, but rather return that the element is not found.
95e7683 Ensure "excluder" is added prior to user defined type adapters/factories. - Added test expose bad behaviour.
ebba6e2 Make JsonElement TypeAdapterFactory a type hierarchy factory.
ae7d132 Add a test case for a problem reported on the group.
4132b0d Allowing instance creators to be registered with the raw type only (without specifying type parameters).
3c98ccd Move interceptors from 'alpha' to 'extras'.
ab5d3cf Don't subclass ThreadLocal.
ebe4cb5 Fix compile warnings
2e701e8 Added support for collections, maps, and arbitrary depth of type adapters for Intercept annotation. Added more tests for the features.
dff5546 added tests for using intercept in fields and lists. These tests are currently failing.
9f49203 Created an alpha package that holds experimental feature. Added support for JsonPostDeserializer that allows you to invoke postDeserialize methods on an Gson deserialized object.
34e1ec5 Adding Red-Black Tree implementation and tying it into the Gson bindings.
000a583 Optimizations and bug fixes for LinkedHashTreeMap.
0bd7019 Add a hashing layer to LinkedTreeMap. Instead of having 1 root node, the class now has several root nodes, one for each hash bucket in a hash table.
1431726 New code that can split an AVL tree into two AVL trees.
6ffdaae Tests for LinkedTreeMap with incompatible keys.
23e24f7 Fix a bug where we were unlinking nodes that shouldn't have been unlinked.
fb262da Draft of LinkedTreeMap. Its ordered like a LinkedHashMap but it doesn't do any hashing for DoS resistance.
83b1af3 Reintroduce string pooling in JsonReader.
4b46f3e Deleted spurious directory gson-codegen. The real codegen code is in trunk/codegen
45290ad Follow up on r1197 and make deepCopy package-private. We don't want to use protected because some of the classes are non-final and protected shows up in the Javadocs.
9b8714a made deepCopy protected to eliminate it from the public API for now. It will be in the subsequent release.
77c25b1 Fix cut & paste issue in JsonToken Javadocs.
aca3d0f Change number parsing to use one big loop. This changes it to return JsonToken.STRING for very long (>8k digits) numbers.
1223cf0 rename peekedInteger to peekedLong

   * external/gtest
344e5f3 Use $EXTERNAL_STORAGE instead of /sdcard.

   * external/guava
fa1a9b0 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/guava into mr1-staging
5153708 Merge "Fixed Maps.java comment to reflect current code"
82ecaa2 Merge "Add Ubuntu patch to work around OpenJDK bug"
fc8e523 Fixed Maps.java comment to reflect current code
f2dad04 Add Ubuntu patch to work around OpenJDK bug

   * external/harfbuzz
6842c62 Fix to make space width consistent in bidi

   * external/heimdall
d6bd426 remove misleading variable from Android.mk
03200ae Merge pull request #1 from tpruvot/cm-10.1
db8811f fix readme mixed dos/unix
117b4fa Heimdall: change line endings on osx install script. Heimdall detect: add more detail on verbose option.
7f3c870 Add linux linker dependencies
ffeaed1 Fix linux check derp from one of those pesky darwin users
1c6c025 Add root Android.mk
916e88b Create pregenerated config.h.
9d7008e Previous libusbx fix was a red herring of sorts. Inadvertedly it did fix the issue. However, the correct solution was much simpler: https://github.com/libusbx/libusbx/pull/80
fec8bbc Actually fixed the bug (race condition) in libusbx-1.0 this time! Source available at https://github.com/libusbx/libusbx/pull/79
1d2927b Added a patched version of libusbx that fixes device claiming on Windows. Changes to libusbx are documented here: https://github.com/libusbx/libusbx/issues/78
8c6b20a - Incrementing to 1.4 RC2. - Fixed Release xcopy command that was referring to libusb instead of   libusbx.
5212bf5 Added libusbx-1.0 library and DLL missed due to .gitignore
7caa014 Added Galaxy Camera download mode identifier (apparently).
4d850a2 - Updated MSVC projects to MSVC2012. - Changed from libusb-1.0 to libusbx. - Upgraded to C++11 (defined as C++0x for backwards compatibility with gcc < 4.7).
31b1b0b - Changed interpretation of packet size reponses of 0 from meaning "don't   care" to "unsupported". - Changed block size in libpit to mean either block size or block offset.
e0e84b2 Fixed --repartition flag parsing bug.
8734112 Turns out udev ATTR{idProduct} really is case sensitive.
7a8f813 Made Heimdall Frontend pass the --verbose parameter for all actions when 'Verbose Output' is checked.
648bfb1 Added a Qt4VSPropertySheet.props file that will hopefully work for other people.
8ac7412 PIT files are no longer always exactly 4096 bytes. Fixed a bug that was a result of making this assumption.
4f32206 Added missing reference& in heimdall/source/Arguments.cpp
4994531 Made Qt project (qmake) configurable using environment variables on OS X. Also added a missing &reference symbol in heimdall/source/Arguments.h
2826991 Added fixed for g++ parsing issue on OS X.
6cd6b35 Heimdall 1.4 RC1:     - Massive refactoring.     - Support for Qualcomm based devices.     - Print PIT from file.     - Use partition names as arguments e.g. --HIDDEN, --KERNEL, --MOVINAND etc.     - Heimdall Frontend UI improvements.     - And much more...

   * external/htop
e1a8535 Fix the build on CM

   * external/icu4c
5ee0bae Fix encoding of Ç character.
12ffd01 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/icu4c into mr1-staging
7c2b594 am e04f6a6e: Merge "Restore "tl" (Tagalog)."
e04f6a6 Merge "Restore "tl" (Tagalog)."
2837d75 Restore "tl" (Tagalog).
97f4763 ucnv: Add ICS symbols for back-compat
fec7dd1 am 8d1f1c0f: Merge "Add missing locale aliases for in, iw and tl."
8d1f1c0 Merge "Add missing locale aliases for in, iw and tl."
f1e9c4d Add missing locale aliases for in, iw and tl.

   * external/ipsec-tools
f24812b ipsec-tools: avoid the case where malloc(0) returns non-NULL.
bec9d4b ipsec-tools: revert accidentally increased value for MAXNS.
a0315ad ipsec-tools: fix possible SEGV in isakmp_cfg_setenv().
981eda8 ipsec-tools: back-port SPLIT_*_CIDR from 0.8.0 to 0.7.3.
66d08f4 ipsec-tools: fix the reconnecting issue by delaying closing sockets.

   * external/iptables
0f9384d Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/iptables into 1.1
42ea667 ignore SIGPIPES

   * external/javasqlite
b119030 Some changes added to compile and run with Java 6 and Java 7.

   * external/jhead
3038002 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/jhead into mr1-staging
2b64e33 Fixes exif corruption issues in jhead.
53dee91 Handle locations with more than 30 chars for lat/lon.
dc4fa4c Fix SRational parsing code.

   * external/jpeg
ccfc460 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/jpeg into mr1-staging

   * external/kernel-headers
4e9b004 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/kernel-headers into 1.1
66111e8 kernel-headers: update msm_mdp.h original header
4af6a3c merge in jb-mr1-release history after reset to jb-mr1-dev
415c5e6 external/kernel-headers: update original msm_mdp.h
41f851b update original msm_vidc_enc.h
4cf7262 merge in jb-mr1-release history after reset to jb-mr1-dev
4977b3f external/kernel-headers: update original msm_mdp.h
ec65dd7 merge in jb-mr1-release history after reset to jb-mr1-dev
ec8e880 merge in jb-mr1-release history after reset to jb-mr1-dev
ddbcadf update original msm_mdp.h kernel header
c1b6ab8 Update ion header to add flag for CACHED_NEEDS_SYNC
ad52877 merge in jb-mr1-release history after reset to jb-mr1-dev
a257d8b update original kernel headers for Adreno GL driver
d3e4654 am 6bb5bf61: Merge "Add watchdog.h"
ccf1629 am 4faabd07: Merge "update filter.h / prctl.h / seccomp.h"
6bb5bf6 Merge "Add watchdog.h"
e934602 Add watchdog.h
4faabd0 Merge "update filter.h / prctl.h / seccomp.h"
80e8fb4 update filter.h / prctl.h / seccomp.h
1139873 merge in jb-mr1-release history after reset to jb-mr1-dev
b1045ea am c5c42d64: Merge "kernel-head: __NR_perf_event_open has wrong definition for x86"
c5c42d6 Merge "kernel-head: __NR_perf_event_open has wrong definition for x86"
235a281 kernel-head: __NR_perf_event_open has wrong definition for x86

   * external/koush/Superuser
fdc28d8 always start daemon, as that is the default behavior.
0fc942f update WHATS_NEW
ed2bc86 Merge remote-tracking branch 'koush/master' into cm-10.2
6aba49a v1021
f9cee64 Merge remote-tracking branch 'github/cm-10.1' into cm-10.2
2c92504 Fix potential trust issues by using SO_PEERCRED.
72d5412 sanitize inputs. verify mallocs.
72bebe6 Superuser: fixed FI translations
f1adc4c Superuser: fixed FI translations
f3454b5 Merge remote-tracking branch 'github/cm-10.1' into cm-10.2
e72d31c Fix Makefile for non embedded ROMs
609f489 Merge "superuser: updated finnish translations" into cm-10.2
7c66ccb Superuser: FI translations
c52767b Helium
c7d759a v1020
45af423 Fix recovery install via app. Fix adb shell not being able to access /data. Use thin font on values-16, only on Superuser-light theme. Better logging.
e015fc5 superuser: updated finnish translations
6f1029c unset immutable bit on su
70d5169 Fix endif spacing
7b7c154 unset immutable bit on install-recovery.sh
69a0436 more cleanups around waitpid
5f2c658 Submitting to POSIX C standard: fork_zero_fucks. For when you give zero fucks about the state of the child process. This version of fork understands you dont care about the child. deadbeat dad fork.
ff79bcb For some reason log exec calls from the daemon result in zombie log processes... just disable logging from the daemon. Forked daemon clients do not seem to have this issue, I presume because they die?
5ba79e6 fix script failure
0cb0e4c fix 4.3 check logic
c7adb38 Rev the su binary version. Add --daemon documentation. Only allow recovery install on 4.3+.
e37046f Merge remote-tracking branch 'github/cm-10.1' into cm-10.2
33489f1 install-recovery.sh packaging
d0db622 Add support for su daemon installation and detection in recovery zip.
9ff3fb4 cleanups and sanity check string length
ce4060f Fix build
ca54630 Superuser 4.3 fixes.
a084ab9 Add support for su daemon installation and detection in recovery zip.
4f8c024 Add missing NULL sentinel.
984ec08 Add missing NULL sentinel.
5ef9f3a cleanups and sanity check string length
8c918b2 Fix build
c200cf7 Superuser 4.3 fixes.
1fc34f3 Merge pull request #165 from CyanogenMod/cm-10.1
1e6eb3c Superuser: Fix German translation
e6e1886 Merge "Superuser: Translation fixes" into cm-10.1
6c114af Merge "Superuser: PT-PT translations: minor corrections" into cm-10.1
5a9cc29 Superuser: Translation fixes
a7752e9 Superuser: PT-PT translations: minor corrections
d7dac49 Merge "Superuser: Simplified Chinese Translations" into cm-10.1
9eaeab2 Added PT-PT language support for Superuser
ba3c786 Superuser: Simplified Chinese Translations
88b8c54 Superuser: TR translations
bc52d17 Superuser: ES translations
0a99cad Superuser: Add AF Translations
991f706 1018
d4329a1 add reboot binary
e644b23 Superuser: CS translation
a8d0305 Superuser: NL translations
74d131a Merge "Superuser: added Norwegian translation" into cm-10.1
e7122ae Japanese : update Japanese translation.
f694b41 Merge "Add Superuser uk translation" into cm-10.1
0f651e8 Superuser: added Norwegian translation
6450d0e Whats new
27c5fb1 Rev version. Null check.
acf7528 Merge remote-tracking branch 'github/cm-10.1' into cm-10.1
2aa2d41 Merge remote-tracking branch 'koush/master' into cm-10.1
3dcccd3 SECURITY FIX: Fix package uids being reused between uninstall and reinstall of different packages. Policies for older packages were being granted to the newly installed package that got the recyled uid.
e608b5d Add Superuser uk translation
e160a93 Superuser: Update Polish translation
528b5c5 Merge pull request #143 from pylerSM/master
e8b4624 Update strings.xml
90c2944 Update strings.xml
263fb47 The reason for the original commit is flawed: some languages were not part of AOSP.
2be82fa rev version;
d5bba03 rev version;
2c1a38b fix up x86 detection during in app system install
446bb5b Merge "Superuser: Update German translation" into cm-10.1
ac6ed69 Merge "Added Polish language" into cm-10.1
6fbdbc5 Merge "Superuser: Initial Greek translation" into cm-10.1
985e195 Merge "Superuser : French translation correction" into cm-10.1
768b892 Merge "es_ES: Fix spanish translations" into cm-10.1
e4ec543 Merge "Added Hungarian translations" into cm-10.1
e70db36 Merge "Superuser: Add Czech translation" into cm-10.1
811d07d Merge "PT-BR: Update translations" into cm-10.1
b73fad6 Added Polish language
6398fa9 Added Hungarian translations
17df638 Superuser: Add Czech translation
4f4c8bb Superuser: Initial Greek translation
e2505a9 Superuser : French translation correction
d9738ea PT-BR: Update translations
d1d6273 es_ES: Fix spanish translations
a430163 Superuser: Simplified Chinese Translations + Chinese Locale Cleanup
064277e Superuser: Update italian translation
4ac5aa1 Superuser: Update German translation
a4a9c0f rev version
379371b Allow su to execute binary directly if -c is not supplied. Change the exec call to execvp from execv. This matches AOSP behavior, and fixes dumpstate.
7bce4c3 fixup platform detection in update-binary
f8a942d su binary v8
62843e1 autogrant radio/system as appropriate (prevent crashing on stock roms)
2319587 disable market open
db9c81d Merge remote-tracking branch 'cmremote/cm-10.1' into cm-10.1
5b98240 remove arm mode
db5ff67 remove arm mode
406cf3d Update README.md
048f76a Update README.md
4a91aa2 Merge pull request #124 from BytesOfBinary/master
9a4331c [WIP] Added Hindi Translation
1ef4a3e Merge remote-tracking branch 'jchleb/master'
fa7318e Update strings.xml
2db5921 Update strings.xml
318bf04 minor update
e2bf07c Merge pull request #121 from TheHamster95/patch-4
c67772d Update to add theme + PIN-translations
7a2ec1f Merge pull request #117 from ogr3/master
3356c40 Merge pull request #118 from vinhtantran/master
7f63380 Merge pull request #116 from 5boro/patch-1
575a68a update vi translation
71e8ef1 Fixed whitespace and removed extra backslash
9d2281b Merge remote-tracking branch 'upstream/master'
5dd5348 Update strings.xml
c9fb2c0 slovak
f4d2a4e style renames in Widgets
828fdf5 removed unnecessary files
daeb536 remove values-fr files that are unnecessary
f57dde7 Merge pull request #113 from jchleb/master
32ca964 Update strings.xml
2d889b2 Update strings.xml
87158e3 Update strings.xml
4a7844f Update strings.xml
615225d Merge pull request #110 from ed10vi/master
f867387 Merge pull request #111 from udK/patch-2
c3ca41c Merge pull request #112 from pvolkov/patch-5
ad60ab9 allow hooking for the native fragment for CM. CM requested feature to change the stylings.
8cbee1d Update strings.xml
0b8974b allow hooking for the native fragment for CM. CM requested feature to change the stylings.
4313c7b Update strings.xml
2864e03 Create styles.xml
4516199 Update dimens.xml
c2dca72 Create attrs.xml
b238e09 Russian fixes
692683a Update values-it/strings.xml
7b6dea5 Update spanish translation
09b8617 Merge pull request #109 from maniac103/fix-switch
fd8024d Fix switch not updating the DB when toggled by sliding instead of clicking it.
74c4cf0 Merge pull request #108 from MrYadro/master
2cfe748 Updated Russian localization
aa9e285 Merge pull request #107 from ogr3/master
019f155 Theme + PIN disabled translation
edb0644 Merge pull request #105 from huawuxin/patch-1
d26afca Merge pull request #106 from huawuxin/patch-2
fa1b6c2 Update values-zh-rSG/strings.xml
12f3382 Update values-zh-rCN/strings.xml
077437c formatting
64d7aa6 Merge pull request #104 from alvinhkh/master
241e804 Update strings.xml
42f1d14 Update strings.xml
57a011f Update strings.xml
9df2012 Merge pull request #5 from koush/master
453541d make the process of removing pin protection more apparent.
e4dca60 fix the pin protect screen to be a proper dialog on tablets.
24f10c2 be verbose about the dark/light activity themes
5602c12 whatsnew
8e9177a Merge pull request #103 from sparkym3/patch-1
bbc08f1 apparently some phones crash if a notification is made without a contentIntent
f94d2bd Update system install to set safer access rights.
9e1c64f missing files
83458cd Merge pull request #102 from udK/patch-1
85dc86f small fixes and optimizations
b6ef870 Merge pull request #100 from alvinhkh/master
cc5dd6d Merge pull request #101 from ed10vi/master
d07560e Update spanish translation
73bc7a2 Update strings.xml
2d0c668 Update strings.xml
c76c645 Update strings.xml
71da137 Merge pull request #4 from koush/master
4652aec 1012
6186eb2 remove logging
7c6f4e9 Add dark theme option. Fix bug where the version string was sent as an int, instead of the version code.
2cd157d add missing /system/bin/su symlink
0011831 Merge pull request #96 from Whitexp/master
46c29a5 added pt translation
ee3f52c Merge pull request #95 from yuvalabou/master
567e9f8 Merge pull request #6 from koush/master
781398b send the binary version in the protocol, so a notification can be shown if it is out of date
8327778 send the binary version in the protocol, so a notification can be shown if it is out of date
d35dfef Merge pull request #93 from huawuxin/patch-3
41f6cd8 Merge pull request #94 from huawuxin/patch-4
d9ad0dd Update values-zh-rSG/strings.xml
01c3ee0 Update values-zh-rCN/strings.xml
c5865ca Update README.md
cf36b45 update whatsnew
164a30a Update README.md
b2772e7 purge logs over 2 weeks.
8650c58 db refactorings
1bd25fc fix up some db churn by reusing a single db connection
47f5cff Move the logs and settings into a separate database, to prevent database locks by su binary. The policy database, for the most part, should just be read only.
df28ef7 Merge pull request #92 from Smurph82/master
36ed873 Should use getWritableDatabase() instead of getReadableDatabase() because we run db.delete();
6b47bc9 Merge pull request #85 from zanza00/patch-1
e7d7afd Merge pull request #86 from ogr3/master
b24d993 Merge pull request #87 from alvinhkh/master
f54b506 fix uninitalized variable usage
99ddf56 Hebrew update
9df5ad9 Merge pull request #5 from koush/master
0e8419b Update strings.xml
399d600 Update strings.xml
57f31a9 Update strings.xml
0b8351a Merge pull request #3 from koush/master
2c71621 Two new rows Swedish translation
2be3791 Update strings.xml
220f93b Merge pull request #84 from pvolkov/patch-4
e57c0e5 dont handle config changes, so the entire layout is rebuilt.
449686c Update Russian Translation
6d2d1bd fix margins
81e7ced Merge pull request #81 from huawuxin/patch-1
af216c9 Merge pull request #82 from huawuxin/patch-2
c2df57a Merge pull request #83 from osakanataro/master
726574a add japanese language
8b09aca Update strings.xml
dac17b3 Update strings.xml
b9227ef Merge pull request #80 from ed10vi/master
3dc267c Update spanish translation
75c720a always allow root/shell, no matter if superuser is not installed
325d48e "nice" the logging by waiting a bit before adding it to the db. some wacko apps send a ton of concurrent su requests and hit a db lock
8603722 add whats new notice. 1008
9e23691 switch from opening the market to explain why superuser is broken
3d762df Fix froyo pin crash
7ba418f Merge pull request #78 from pvolkov/patch-3
7170355 Merge pull request #77 from yuvalabou/master
71ba215 Merge pull request #76 from zanza00/master
cef7ee1 Merge pull request #75 from ygorigor/master
cc33de1 Merge pull request #74 from alvinhkh/master
819f271 Merge pull request #73 from ed10vi/master
b98d41b Merge pull request #72 from htchoi1995/master
c47c200 Update vi translation
03b453d Russian fixes
0258304 Russian fixes
51c2901 Russian fixes
bbee8ed Merge pull request #4 from koush/master
f170d92 Updated and tweaked italian translation
4af8a83 Update romanian translation
d7d77e2 Use existing translations in Cyanogenmod/Superuser
fbf99a7 Update strings.xml
7828c82 Update strings.xml
41e6b86 Update strings.xml
bcf5d97 Update strings.xml
0b63d64 Update strings.xml
872cdfc Update strings.xml
91b74d8 Merge pull request #2 from koush/master
b92f10c Update spanish translation
617f82c Update korean translation
6dfb209 Hebrew update
1760433 Merge pull request #71 from coolzjy/patch-3
06a0917 Merge pull request #70 from coolzjy/patch-2
e12c4e9 Update strings.xml
30a3cc5 Update strings.xml
d0a7a93 refresh on resume
d9d7095 only show the market app if the requestor is the same as the market app. This fixes the embedded scenario.
7cddbad remove logging
a601e52 Merge pull request #66 from TheHamster95/patch-3
0c9696d Merge pull request #67 from coolzjy/patch-1
d20df9a Update strings.xml
b93d09f Updated Danish.
8cb8fe2 Merge pull request #64 from ogr3/master
9babc7d allow customization of the requestor prefix
ba0aea9 Swedish translation for superuser access block
bd7b8a6 Merge pull request #63 from MrYadro/master
aaab308 Updated Russian localization
1b875b2 escaping fixes
41aa18a Merge pull request #61 from huawuxin/master
85372cb Merge pull request #62 from MrYadro/master
7b6d9de 1007
33b3f16 Add settings toggles for superuser global policies: apps only, adb only, apps + adb, or disabled. su: fix binary so Superuser always gets access, even if root is disabled. Obviously need this to reenabled root. Check superuser binary version.
f27a4e7 Updated Russian translation
ced721a Updated Russian localization
e2888e3 Simplified Chinese translation
d35902d Merge pull request #59 from ogr3/master
d6bc366 Removed extra backslash
235a471 Merge pull request #58 from pvolkov/patch-2
57f6211 Update russian translation
3963437 Update some russian typos
9359945 Merge pull request #56 from alvinhkh/master
0f86b40 Update strings.xml
fd192b0 Update strings.xml
71871ac Update strings.xml
7460624 Merge pull request #1 from koush/master
6b458b2 stopgap to fix rotation crash
c9c5464 Merge pull request #55 from vinhtantran/master
62f0207 Update README.md
870a419 Remove redundant file
da4c4c4 remove draft
9861d11 Add Vietnamese translation
976c7df 1006
db466b7 check superuser on boot. but do it nicely... with a notification. and back off if notification is deleted.
ec3ec35 Merge pull request #54 from ed10vi/master
56d3166 fix up menu about and other icons for pre ics. try a new launcher icon. add superuser version to about section.
6fd6f59 Merge branch 'master' of git://github.com/koush/Superuser
bdc3282 add version info to about page
2a9c855 Merge pull request #53 from TheHamster95/patch-2
e4229dc Spanish: Use the same word for the same thing
099f363 Added missing translations in Danish
6da55d8 Merge pull request #52 from alvinhkh/master
d5a0f49 Merge pull request #51 from zanza00/master
5cb6968 Merge pull request #48 from pvolkov/patch-1
9a8c03f Merge pull request #47 from ogr3/master
1bab94c Add Traditional Chinese translation
7cf7e6b Updated italian translation
88ea514 Russian-Removed extra backslash
910bb58 opening the github url requires Intent.ACTION_VIEW
24c0d78 Merge pull request #3 from koush/master
3bc8154 Merge branch 'master' of git://github.com/koush/Superuser
a6c5775 1005
8db1811 Russian fixes
4a7db7e Removed extra backslash
3ca7e85 Merge pull request #46 from ogr3/master
84942b1 fix ndk to go to assets?
a234c09 Extra backslash removed
182a2eb Removed extra backslash
a8bba54 1003
c0fce47 Merge branch 'master' of github.com:koush/Superuser
5a1873b most devices dont support rm -f
8eaa053 Preceed apostrophes with backslash.
40ffb32 Italian fixes
dbc2bdb missing resources
710e591 Merge branch 'master' of github.com:koush/Superuser
14e3ed6 resource name changes
c7b90a3 Merge pull request #42 from ogr3/master
d779ad7 Merge pull request #43 from ed10vi/master
9711409 Merge pull request #45 from zanza00/master
db351b5 Added Italian Translation
6190ead Update Spanish translation
82b01ef Merge branch 'master' of github.com:koush/Superuser
142edbc Fixed typo (installation)
3d3b74b Updated Swedish translation (installation)
0e4d4fe check file exists
b0bb3a6 remove cruft
832bdaa Merge branch 'master' of git://github.com/koush/Superuser
146c946 In app installation done. Release on Play soon.
9e23cb6 Merge pull request #39 from MrYadro/master
03a5c36 Merge pull request #40 from ogr3/swedish-translation
0c97a30 Updated Swedish translation whitespace
4c7db2a Updated Swedish translation
edd167c Update Russian localization
cb4beb8 Merge branch 'master' of git://github.com/koush/Superuser
b2984d1 Merge pull request #38 from djMesias/master
8ea7853 open the superuser link on the market if the app is missing.
7702d91 es_ES: Update spanish translations
0abc04b Merge pull request #37 from htchoi1995/master
9f742ca Add About Page linking to my twitter, apps, and Superuser github in the standalone APK version of Superuser. Embedded users (like CM, PA, etc) wont see this.
523363d Update korean translation
5eac08a use full path on symlink
0417d16 fix recovery zip su location to be aosp standard. /system/bin/su symlinks to xbin/su
e4127f8 fix recovery zip su location to be aosp standard. /system/bin/su symlinks to xbin/su
75b42a7 Set noHistory on MainActivity to prevent a running instance of Superuser from regaining focus after a request is finished.
5432953 Merge pull request #35 from MrYadro/master
50670f9 Merge pull request #36 from ed10vi/master
b0b378f Merge pull request #34 from TheHamster95/patch-1
16f431e Merge pull request #2 from koush/master
7f13d79 update spanish translation
b38126a Merge remote-tracking branch 'upstream/master'
3774120 Fixed Russian localization
dded0b4 Fixed a typo.
be58cb5 Merge pull request #33 from MrYadro/master
8f10c64 Fixed Russian localization
a04a83d Update README.md
10ad315 Update README.md
b68f516 pin related fixes
2c528e4 Dont crash if log could not be added. This happens during su -c reboot, when /data is unmounted, etc.
152ab99 use android:excludeFromRecents instead of noHistory
b136b82 Fixup theme usage for light/dark
53b2770 fix bug where logs were not shown on startup
3981de0 fix bug where logs were not shown on startup
10e99d9 fixes
8bc1037 Merge remote-tracking branch 'ygorigor/master'
5f0ba0e Merge pull request #29 from yuvalabou/master
ceb9e81 Merge pull request #30 from htchoi1995/master
9a5905e Merge pull request #31 from Mustaavalkosta/master
45fe52a add Finnish translation Partly a bit clumsy but will do for now.
d68c5fa Update Hebrew translation
d5f7fdf Merge pull request #1 from koush/master
a5075c6 Updated romanian translation
09c7327 Merge remote-tracking branch 'upstream/master'
2b0dff2 Update korean translation
fea9a00 Update README.md
b27dc5d Update README.md
6d98315 Update README.md
e351463 remove watermark from anything but koush builds
5de9952 fragment stack fixes
6148624 LICENSE
b182cc1 refactor into single db
064eb12 Merge pull request #27 from DevZombi/patch-1
053a5dc Update strings.xml
0ad36a7 Merge branch 'master' of git://github.com/koush/Superuser
b68cafb fix up pin stuff that i had commented out
7559411 Update README.md
d3d9d44 Fix build
9a39394 Merge branch 'master' of git://github.com/koush/Superuser
db0b359 LOCAL_PATH fixes
9fef856 Merge pull request #25 from TheHamster95/master
082d156 Moar fixes!
a8e3db5 ant now builds zip
106e001 Fixed typos
e2afc95 Merge remote-tracking branch 'upstream/master'
e76f4bd add module tag
e92759c Merge remote-tracking branch 'upstream/master'
4927893 Merge pull request #24 from ogr3/swedish-translation
8914529 Update README.md
006130a Update README.md
d2af808 Update README.md
6b5e219 Merge branch 'master' of git://github.com/koush/Superuser
a85f899 Fix build
b6164a4 First draft
0507cdf Merge remote-tracking branch 'upstream/master'
2c52e06 Partial Swedish translation
6689af8 Update README.md
2b8af3c Update README.md
92020b4 Update README.md
39460b5 Update README.md
c30abe5 Update README.md
6244f28 Update README.md
bac1746 Update README.md
b75f6d7 Update README.md
180c7e3 Merge pull request #22 from TheHamster95/master
9628a30 add local_manfest.xml for AOSP embedding
a4754f4 Merge remote-tracking branch 'upstream/master'
03393b0 native fragment stuff working
c8b3211 Danish translation. First translation
b9946dc remove noisy logging
c551a4b remove noisy logging
8dbb8f4 fixups for embedding. proper back stack support
fe628a4 fragment instance fixes
1bc72ca Merge pull request #21 from ed10vi/master
2dc2555 Merge remote-tracking branch 'upstream/master'
c1e4afd First translation
eea41b8 Merge pull request #19 from MrYadro/master
0965359 Update Russian localization
3a1d1a3 embedded fixes, need to move fragments out of inner classes.
91799b4 license
f521881 Fix german crash and mistranslation of english
b4978e5 crash fix
674baf5 merge with german changes
9aeb37e Merge remote-tracking branch 'maniac103/master'
e3cd461 fragment revamp to support both native and support fragments (blerg)
10c2373 Split automatic response summary.
6c94483 Improve German translation.
4f67115 change app_name to superuser as that is more resource friendly for embedding into Settings
baec29f Fixup third party embedding su
fef458b C code fixups. Modify REQUESTOR if embedded in ROM.
f225252 if a ROM is building superuser (vs embedding it into Settings), put the package into a com.thirdparty.superuser This is so that it doesnt try to get updates from google play, which will be signed with a different key.
bc01b94 move su to optional executables so it is suid
a8140eb Fix up request theme/
01d17e0 Crash Fix on tablets
caeb31e holo dark done
8932c5b aosp fixes
3d51f14 Update README.md
ea18972 Merge pull request #16 from sparkym3/patch-1
74173ba AndroidManifest to use the "signature" protection
af3b0f4 Merge pull request #15 from Smurph82/master
83f1b3e 2013_0226 make sure to call close on the DataInputStream line 233
b9412d7 Merge pull request #14 from ogr3/ndk-tool-platform
edb4307 added possibility to change ndk-executable
0c6c087 fix russian string formatting. lint fixes
97f185e fix widgets ref
bda6283 Fix bug where "Remember" does not work when pin protected.
6e20853 Merge pull request #12 from UniqueDroid/master
2649735 Merge pull request #3 from jchleb/master
be9ce5c Added German translation last part1
b9cbd13 Added German translation last part
05b4c94 Added German translation part2
f988a2f Added German translation part1
6b8c7a1 disable per command policy, as it is dumb. db close cleanups. fixup uid name in the notification when logging is disabled.
cce09ca recoveryzip: handle spaces in zip path Fix up themes to inherit from Widgets project.
add9388 pull req rewritten. whitespace issues in original fix. https://github.com/koush/Superuser/pull/10
4688661 Add permission group so the name shows up properly in the market description. It was showing "Default" before.
ef5d377 remove noisy logging and cruft code
35604b5 use TextUtils.isEmpty
53dcdeb Merge pull request #9 from ygorigor/master
2298f32 ant: reenable ant. dont run this when eclipse is open. Fix NRE in PIN entry when PIN is empty.
2a5c3d3 Merge pull request #8 from MrYadro/master
9fca82d Initial Romanian translation for Superuser
5cbf1a7 Merge pull request #7 from gweedo767/master
96281d3 Oops, missed it
4e076e5 Added Russian translation
dbf09f7 Added Russian translation
ba90de2 Capitalization updated
35d6cba remove duplicate include
3de01df Merge pull request #4 from Decad3nce/aesthetics
9a133b2 Receiver: Set toast to content text not title
74d9f0a ant signing is derpy, disable
15c749b Update README.md
e812bda superuser
ebbe48d usermanager is only present >= api ver 17
216b41c fix crash
9f208a3 multiuser all working
da7e4af fixup multiuser mode detection and usage, add -u option to print multiuser mode
75235fb ant support for creating a recovery.zip x86 su
9e55691 fixes for froyo-gb
4956d56 su: add pid to request. su: fixup version info Superuser: declared permission support Superuser: Automatic responses Superuser: notifications
fa2e2b3 superuser perm
7b7dc2f auto deny shouldnt create a policy
47e03af remove junk xml
2e85f60 almost done...
2dde784 settings and logging config
01bc697 Update README.md
50f417a Update README.md
4f8c8fd add ant build.xml and remove gen
5592aeb Update README.md
a61a442 Update README.md
fb08454 readme
efe3f9b wip
30c6931 back fix
a194322 wip
bacb1d8 Update Superuser/res/values-fr/strings.xml
8e22624 consolidate large resources
c585e71 wip
f3e5e5d fixup not using datalen default
0cefade change up activity hierarchy to get rid of nonsense inheritence. switch to new extensible (future proof) wire protocol.
0b87f5f French Translation
07f4ab4 add missing layouts
b7839f7 watch for socket disappearing.
652b00e fixes around superuser first launch
86969ff db requests are working... time for cleanup in aisle 4 (layouts)
94d2848 work in progress...
045c68a add sqlite. fixes for multiuser.
9fa4aa2 more cleanups. TODO: whitelist/blacklist db. TODO: logs.
aa80fe6 i gud at english
e1d0293 explain my insanity
cbec9db explain my insanity
9b25f39 wip
8066f2c revert back to file sockets
05258fd intial commit

   * external/koush/Widgets
6aebba7 gitignore
2cc45f3 build.gradle
6ef5716 android studio
ef6a7d2 android studio
03aca82 Fix ensureHeader with index
7aa82db Widgets: Remove wrong Czech Superuser translation
ddc3033 Merge pull request #1 from KhasMek/master
3e02265 Czech translation
e076c7c style fixes for pre ics
92bf101 allow base theme override
d1b10a5 move the setAdapter to after the create, so addHeaderView can be used
67155b0 fragment should get replaced on create. config changes cause weird behavior. i did not think fragments stuck around between config changes. surprise!
28f16c3 fix margins
0395899 onResume
a8c4a3a fixups for large devices
3f20298 fix bad style on pre ics
660091a style fixes
03410f0 theme cleanups
43e4c89 LICENSE
3992e84 fixes
036e522 remove comment
5c49445 fragment stack working
b786cad backstack fixes
e220b86 convenience functions and fixes
c23c498 config fixes
2b1a0ce fragment revamp to support both native and support fragments (blerg)
2f3974a remove gen
93d0c1b cleanups and consolidations
cedeafc Android stylization and resources
5cc68ce use standard android dimensions. support for dark theme on listcontent
366824b margin fixes when theres no icon
6f41e92 styling fixes
c49ce98 rename refactor
bc8fd26 remove gen
429ed6f wip
abf8edc onCreate order fix
4934dd5 wip
993bcb4 wip
a301fe0 remove last vesiges of Theme.DeviceDefault.
62c5d9a wip list contnet
c25d42d build.xml
8b29d7a fixes
9c29321 Add support for automatic sorting. Fix visibility bugs.
3ee9377 cleanups and tweaks. setIcon on ListItem
20fdd3f clearSection. Remove noisy logging
ecef1c1 Update README.md
9bb5b4b resize
8130a09 Merge remote-tracking branch 'origin/master'
87a0c69 images
a963a12 Create README.md
f38c702 checkin
7002292 initial commit

   * external/libcap-ng
1d1011a Initial checkin: libcap-ng-0.7
42a4703 Initial empty repository

   * external/libncurses
c1bcd6d set a dependency on $(ACP)
2a46bb7 Change Android.mk to copy only basic terminfo.
565e8f2 Compiliation fixes

   * external/libnfc-nci
0a5586e nfc_nci: Allow passing in the HAL suffix as a variable
e48d95e Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nci into aosp
e9df6ba Snapshot 7ddd630e136a035ba463c427285c5c3e9f199ee0
a058fe3 am a041bc7c: Prevent invalid HCI data being stored on fs.
a041bc7 Prevent invalid HCI data being stored on fs.
095819c am a4b403f6: Merge "Fix config responses not being acked up to the JNI." into jb-broadcom-nfc
a4b403f Merge "Fix config responses not being acked up to the JNI." into jb-broadcom-nfc
c0d257b am ee00835d: Stack shall clear the content of persistent storage
e7dce7c Fix config responses not being acked up to the JNI.
ee00835 Stack shall clear the content of persistent storage
df2580e am c47b3168: Don\'t print error message regarding NCI_VERSION.
c47b316 Don't print error message regarding NCI_VERSION.
0e44001 am 673a037e: Don\'t hang when disabling NFC in low-power sleep.
673a037 Don't hang when disabling NFC in low-power sleep.
df24e0b am 2f38594a: Restart NFC when there is a controller timeout.
2f38594 Restart NFC when there is a controller timeout.
a90c182 am 73ee6bd9: Merge "Force NFC-DEP (p2p) protocol to the DH." into jb-broadcom-nfc
73ee6bd Merge "Force NFC-DEP (p2p) protocol to the DH." into jb-broadcom-nfc
1ba71eb Force NFC-DEP (p2p) protocol to the DH.
514d795 am abaaafe1: Insert a minimum delay of 5ms between back-to-back writes.
abaaafe Insert a minimum delay of 5ms between back-to-back writes.
abd6efd am 30423b8f: Fix T3T reading and RF credits on Manta.
30423b8 Fix T3T reading and RF credits on Manta.
ac814ad am 38666aab: Stack fix for NFA_RwT3tWrite crash.
e40b698 am 5bf83a74: Handle deleted connectivity pipe.
9cbd934 am 794a3220: When EEPROM is not detected, re-initialize controller
38666aa Stack fix for NFA_RwT3tWrite crash.
5bf83a7 Handle deleted connectivity pipe.
794a322 When EEPROM is not detected, re-initialize controller
fc7b623 am 1cee7ea1: Improve robustness of firmware download procedure.
1cee7ea Improve robustness of firmware download procedure.
3cb4865 am c7e1256e: Configuration option to substitute AID in empty select.
c7e1256 Configuration option to substitute AID in empty select.
f62dacc am 4c1bc8e7: Add support for setting MAX_RF_DATA_CREDITS from config.
e0059a7 am 34785a5d: Don\'t hang when warm-reset of SE times out.
4c1bc8e Add support for setting MAX_RF_DATA_CREDITS from config.
34785a5 Don't hang when warm-reset of SE times out.
834826e am ba4c17ee: Upgrade to stack 1.3.45
ba4c17e Upgrade to stack 1.3.45
18e31c9 am 17eea69d: Retry NFC controller reset.
17eea69 Retry NFC controller reset.
9d3823d am fd02a511: Merge "Increase NCI command/response timeout to 2 seconds." into jb-broadcom-nfc
fd02a51 Merge "Increase NCI command/response timeout to 2 seconds." into jb-broadcom-nfc
49f1aee Increase NCI command/response timeout to 2 seconds.
fb7f568 am ea33aa08: During transport error, unblock sync events.
ea33aa0 During transport error, unblock sync events.
9104868 am 6a36486b: Print error message in case of GKI error.
6a36486 Print error message in case of GKI error.
adf746d am 42d73cd9: Tweak logging for enabling error traces.
42d73cd Tweak logging for enabling error traces.
3fce624 am 19d9a743: Merge "Grant license" into jb-broadcom-nfc
e3f7e1b am 43ddc232: Increase delay when downloading NFC firmware.
19d9a74 Merge "Grant license" into jb-broadcom-nfc
e2c4f38 am b58ba0e8: copyright by Broadcom, use Apache License
8a32b54 Grant license
43ddc23 Increase delay when downloading NFC firmware.
b58ba0e copyright by Broadcom, use Apache License
1eeddcc am 8028cdec: Call GKI_freebug after POST_CORE_RESET.
8028cde Call GKI_freebug after POST_CORE_RESET.
8ad2776 am eb190654: Integrate with NFC Hardware Abstraction Layer
eb19065 Integrate with NFC Hardware Abstraction Layer
2e8f66e am 635ce0b0: Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).
635ce0b Added conf file value name for polling duration (NFA_DM_DISC_DURATION_POLL).
d4eed92 am 76ac4570: Use enough delay during firmware patch download
51c510c am 01d28b8f: flush tx data queue after timed out
a9c5521 am 23944481: Remove "brcm" in names
afed28b Remove "brcm" in names
76ac457 Use enough delay during firmware patch download
01d28b8 flush tx data queue after timed out
2394448 Remove "brcm" in names
ad483f6 Upgrade to stack NFA_MI_1.03.36

   * external/libnfc-nxp
f64f7e9 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/libnfc-nxp into 1.1
bc0f99a libnfc-nxp: Add alternate firmware path
dd55580 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp
54222dd Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-dev
35f614f NDEF Type 3 tag reading with padding bytes
31cfc51 Increase default IsoDep timeout to 1200ms.
5199e59 Merge "On some handsets, there is a configuration of hardware that causes a conflict with HCE.  Primarily it is something in the SWP configuration with a SWP sim card.  It appears to be a PN544 register setting that blocks HCE type A only from initialization.  This patch checks for this conflict and disables HCE for those configurations.  The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations" into jellybean
aac6c7f On some handsets, there is a configuration of hardware that causes a conflict with HCE.  Primarily it is something in the SWP configuration with a SWP sim card.  It appears to be a PN544 register setting that blocks HCE type A only from initialization.  This patch checks for this conflict and disables HCE for those configurations.  The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations
ebad753 Merge "card emulation patch port to JB" into jellybean
68c93f6 am e4d3c945: Merge "Add support for target-customized NFC stack configuration"
e4d3c94 Merge "Add support for target-customized NFC stack configuration"
fbeffa5 am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"
caa9f7c am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"
cbef2c8 Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"
1985108 Merge "Support of topaz tag NFC Forum version number 1.1"

   * external/libogg
ec0b24f Add make file for libogg library.
f5f1955 Add config_types.h which is generated by configure normally and is needed by make.
0c681c7 Merge remote-tracking branch 'goog/jumper' into init

   * external/libpng
1c1a497 external: libpng: fix numerous compiler warnings
41e4a03 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libpng into mr1-staging

   * external/libselinux
c3d0c45 Merge branch 'master' into seandroid
f83b5ae Merge branch 'master' into seandroid
b1ae15a Clean up code
9ca4088 android.c: fix free of uninitialized memory
7b9b286 Merge branch 'master' into seandroid
7f90cf4 Merge "Eliminate a memory leak."
0b86a6d Merge branch 'master' into seandroid
afeff7c Eliminate a memory leak.
300bebb Eliminate a memory leak.
eb1af87 Add selinux status functions from upstream libselinux.
bf12ab0 Use NULL instead of 0 as terminator to array
4f2b056 Add selinux status functions from upstream libselinux.
7332592 Sync with master.
a956091 Merge branch 'master' into seandroid
e507419 Merge branch 'master' into seandroid
5900458 Drop /data/system as a location for policy files
77e151b Add new location for policy files
a879598 Generalize levelFromUid support.
299b1e5 Merge "Adjustments to android property backend."
9c57876 Merged in billcroberts/external-libselinux/seandroid-policy-move (pull request #1)
a03e007 Move location of policy files
51c5709 Adjustments to android property backend.
9bb47c2 Adjustments to android property backend.
d2302ca Check mkdir return value before calling mount.
3c98ad9 Return an error if no path is supplied to the label backends.
a55a724 Generalize levelFromUid support.
d10c343 Mount selinuxfs on /sys/fs/selinux when possible.
20f62f3 Do not try to restorecon if selinux is disabled
61e917a Apply context validation when loading file_contexts.
525a224 Switch app_* and isolated to _app and _isolated in seapp_contexts.
d23b9e0 Rework category mapping and perform some code cleanup.
895b446 Clean up libselinux logic for looking up seapp contexts entries.
4a655ec Drop the use of a policy version suffix on the sepolicy file.
8aeb5c5 Only check SELinux enabled status once in selinux_check_access().

   * external/libsepol
b0e0162 Fix memory leak issues found by Klocwork
4ebc669 Update to libsepol 2.1.8.

   * external/libusb
e87262e Add libusb support
8deb973 Make the pregenerated config.h adapt to linux/darwin depending on host

   * external/libvorbis
de55961 Add make file for libvorbis library
eacc9ce Merge remote-tracking branch 'goog/jumper' into init

   * external/libvpx
b9c4e67 Merge "[MIPS] VP8 optimizations for MIPS"

   * external/libxml2
a985089 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libxml2 into mr1-staging
f63137b Changes to also make .so for libxml2

   * external/linux-tools-perf
8b48e9b clang and mac 10.9 fixes. strlcpy is a macro defined by the system libraries in Xcode 5. This causes a duplicate definition error.
48630d7 am 3043b188: Merge "Fix build for x86_64"
3043b18 Merge "Fix build for x86_64"

   * external/littlemock
ef05251 Support for primitive (non-Object) captors in littlemock

   * external/llvm
651dfcf llvm: Fix building libLLVMSupport.
4333e82 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/llvm into mr1-staging
99e8132 Merge branch 'jb-mr1-dev' of https://googleplex-android.googlesource.com/a/platform/external/llvm into merge-2012_09_10
828ded6 Use O0 for the win_sdk build too
68aeecc Merge up through LLVM r163557.
1c4ad5e Merge branch 'upstream' into merge-2012_09_10
1dc2591 Revert r163556. Missed updates to tablegen files.
16c5584 Update function names to conform to guidelines.  No functional change intended.
985dcfc test/CodeGen/X86/ms-inline-asm.ll: Relax for non-darwin x86 targets. '##InlineAsm' could not be seen in other hosts.
24f5fdd [ms-inline asm] Properly emit the asm directives when the AsmPrinterVariant and InlineAsmVariant don't match.
5c3dcb7 Update test case for Release builds.
2de0572 Remove redundant semicolons which are null statements.
8631a90 Disable stack coloring because it makes dragonegg fail bootstrapping.
3b132fa [ms-inline asm] Pass the correct AsmVariant to the PrintAsmOperand() function and update the printOperand() function accordingly.
3c4ecd7 [ms-inline asm] Add support for .att_syntax directive.
b6d52a5 Enable stack coloring.
519daf5 Don't attempt to use flags from predicated instructions.
2c38a66 [Object] Extract Elf_Ehdr. Patch by Hemant Kulkarni!
6165dba Stack Coloring: Handle the case where END markers come before BEGIN markers properly.
b8150d8 Enhance PR11334 fix to support extload from v2f32/v4f32
7ae51be Add "blocked" heuristic to the Hexagon MI scheduler.
10def39 Fold multiply by 0 or 1 when in UnsafeFPMath mode in SelectionDAG::getNode().
06b9690 whitespace
7fdc66b Add boolean simplification support from CMOV
8cd08bf Fix an assertion failure when optimising a shufflevector incorrectly into concat_vectors, and a followup bug with SelectionDAG::getNode() creating nodes with invalid types.
ff1b631 Minor cleanup. No functional change.
9438d1e Stack Coloring: Debug prints to print the slot number and not the array index.
a7de8a6 Stack Coloring: When searching for disjoint regions, do not compare intervals twice or to theirself.
e47feeb Stack Coloring:  Add support for multiple regions of the same slot, within a single basic block.
8100d24 The VPSHUFB 256-bit instruction may be generated when one of input vector is undefined or zeroinitializer. I've added the "zeroinitializer" case in this patch.
1ac4587 Make helper function static.
04142bc Move bypassSlowDivision into the llvm namespace.
c1cbfa8 c bindings: revert LLVMConstInlineAsm to always use the default asm dialect.
4fbaa50 GTest on Android needs a custom tmpdir path.
8cc1494 Fix a typo in the comment.
0aa52ee Add an assertion that the frame index is indeed inside the declared lifetime region.
9a2ae00 Teach the DAGBuilder about lifetime markers which are generated from PHINodes.
2f9fc76 Fix style issues from r163302 pointed out by Evan.
35aec95 Move spaces to the right places. No functionality change.
74eab5a Add missing space before {. No functionality change.
956342b Teach DAG combiner to constant fold fneg of a BUILD_VECTOR of constants.
236bcf1 Fixing a type width warning with MSVC.
3be7584 DSE: Poking holes into a SetVector is expensive, avoid it if possible.
11b4505 LiveVariables: Compute a set of defs and kills to speed up updating LV during critical edge splitting.
12fb5c6 Add instruction selection for ffloor of vectors when SSE4.1 or AVX is enabled.
46b4b11 lit: Util.which(): Use os.path.isfile() instead of os.path.exists(), or it hits to the directory.
cacd9d6 Use 256-bit alignment for constant pool value for 256-bit vector FNEG lowering.
4362067 Add support for lowering FABS of vector types.
a1fb1d2 Set operation action for FFLOOR to Expand for all vector types for X86. Set FFLOOR of v4f32 to Expand for ARM. v2f64 was already correct.
4f50517 Revert "Add -exact-match option to FileCheck to allow clients to do exact matches without using regular expressions."
0d651e0 Add operator< for FoldingSetNodeID.
a344341 Remove an incorrect assert during branch weight propagation.
3adf3b0 Refactored DFA generator. Merged transition class into state class.
a4e87b7 Add IRC handle entry to CREDITS.TXT as a test commit.
d2f43b0 Correct an unfortunately necessary typo.
a9e37c5 Fix alignment of .comm and .lcomm on mingw32.
b72a90e Initial relocations test for the Mips standalone assembler.
26c5d5f Fix indent.
1a005ce Contrary to what the documentation says, .lcomm alignment on COFF is in bytes, not power of 2.
c53ade2 Update function names to conform to guidelines.  No functional change intended.
a7390fa Custom DAGCombine for and/or/xor are for all ARMs.
39646d9 MC: Overhaul handling of .lcomm
8e70b55 PR13754: llvm-mc/x86 crashes on .cfi directives without the % prefix for registers.
38539eb MipsAsmParser: Fix a couple of string use-after-frees and misuses of classof.
c37290e yet another attempt at fixing @OCAMLOPT@ for sed. Patch by Rick Foos.
bf01582 SimplifyCFG: ValidLookupTableConstant should be static
2e57838 Add -exact-match option to FileCheck to allow clients to do exact matches without using regular expressions.
1fdaee9 Stop emitting lifetime region info when stack coloring is not enabled in O0
04376eb The Mips standalone assembler aliased instruction support.
acbea45 The Mips standalone assembler intial directive support.
f740d6e The Mips standalone assembler fpu instruction support.
307525c Re-work bit/bits value resolving in tblgen
35e3aed Remove unused variable introduced by r163346.
a36ff7b Don't include stdint.h directly.
0b95a99 Explicitly erase the file from disk if something bad happened. <rdar://problem/12184899>
6b96c3f The Mips standalone assembler memory instruction support.
cc77eec Release build: guard dump functions with "ifndef NDEBUG"
c8ecb40 TiedTo is an integer, not a bool.
77e300e Release build: guard dump functions with "ifndef NDEBUG"
45c5c57 Allow overlaps between virtreg and physreg live ranges.
e617ccb Handle overlapping regunit intervals in LiveIntervals::addKillFlags().
f9dff0e Clear kill flags while computing live ranges.
5177b3a Dont cast away const needlessly. Found by gcc48 -Wcast-qual.
24b9f25 Diagnose invalid alignments on duplicating VLDn instructions.
eae1d34 Check for invalid alignment values when decoding VLDn/VSTn (single ln) instructions.
3d5f96e BasicAA: Recognize cyclic NoAlias phis
64eacd9 Use correct part of complex operand to encode VST1 alignment.
0290326 BasicAA: GEPs of NoAlias'ing base ptr with equivalent indices are NoAlias
79cb162 Disable stack coloring by default in order to resolve the i386 failures.
6d3d765 Tablegen: Add OperandWithDefaultOps Operand type
4178946 AVX2 optimization. Added generation of VPSHUB instruction for <32 x i8> vector shuffle when possible.
e757640 Fix a few old-GCC warnings. No functional change.
a76d7d6 Fix the test by specifying an exact cpu model.
9515434 Fix self-host; ensure signedness is consistent.
3bd51b8 Fix switch_to_lookup_table.ll test from r163302.
ba8562a Improve codegen for BUILD_VECTORs on ARM.
486270a Build lookup tables for switches (PR884)
c05d306 Add a new optimization pass: Stack Coloring, that merges disjoint static allocations (allocas). Allocas are known to be disjoint if they are marked by disjoint lifetime markers (@llvm.lifetime.XXX intrinsics).
6c822ee Optimize codegen for VSETLNi{8,16,32} operating on Q registers. Degenerate to a VSETLN on D registers, instead of an (INSERT_SUBREG (VSETLN (EXTRACT_SUBREG ))) sequence to help the register coalescer.
7859f43 Remove duplicated helper function
b8d9da1 Use iPTR instead of i32 for extract_subvector/insert_subvector index in lowering and patterns. This makes it consistent with the incoming DAG nodes from the DAG builder.
07149fe Add patterns for converting stores of subvector_extracts of lower 128-bits of a 256-bit vector to VMOVAPSmr/VMOVUPSmr.
ae6a2e2 Revert "Enable MCJIT tests on Darwin."
2de9167 Whitespace.
383fb7f Unix/Signals.inc: Fix a typo. Thanks to Dani Berg!
a7570a3 There are some Mips instructions that are lowered by the assembler such as shifts greater than 32. In the case of direct object, the code gen needs to do this lowering since the assembler is not involved.
557a20a Update function names to conform to guidelines.
88a7e92 Enable MCJIT tests on Darwin.
ad51a4a Mips specific llvm assembler support for branch and jump instructions. Test case included.
30eac71 Don't include stdint.h directly.
f632d80 Remove predicated pseudo-instructions.
098c6a5 Use predication instead of pseudo-opcodes when folding into MOVCC.
366df79 [ms-inline asm] Use the asm dialect from the MI to set the parser dialect.
0c09e76 Add missing file for test.
033d182 Teach libObject about some more ELF relocations. llvm-objdump -r now knows every relocation in C++ hello world built with debug info.
408853e JumpThreading: when default destination is the destination of some cases in a switch, make sure we include the value for the cases when calculating edge value from switch to the default destination.
ec65be8 Mips specific llvm assembler support for ALU instructions. This includes register support. Test case included.
2f1d815 Cleanup a few magic numbers.
5932429 Stop casting away const qualifier needlessly.
77fffa6 [ms-inline asm] We only need one bit to represent the AsmDialect in the MachineInstr.
2943e37 Constify this properly. Found by gcc48 -Wcast-qual.
651e800 Mark checkSignature const, and in turn stop casting away const from ArchiveMemberHeader. Found by gcc48 -Wcast-qual.
141e997 Constify SDNodeIterator an stop its only non-const user being cast stripped of its constness. Found by gcc48 -Wcast-qual.
98eb98b Constify subtarget info properly so that we dont cast away the const in the SubtargetInfoKV tables. Found by gcc48 -Wcast-qual.
b438615 Use const properly so that we dont remove const qualifier from region and MII by casting. Found with gcc48.
576cd11 [ms-inline asm] Propagate the asm dialect into the MachineInstr representation.
a759eb3 Fix a bug.
73e562a revert the additional stuff.
851343c Clean up llvm-bcanalyzer to print to consistent streams. Avoid interleaving fprintf(stderr,...) and outs() << ...;
aadf715 [Docs] Fix Sphinx incremental build. Patch by Sean Silva!
c10d5e9 Move the PPC TOC defs into the PPC64 InstrInfo file.
15515c9 Clean up.
581600b [ms-inline asm] Enumerate the InlineAsm dialects and rename the nsdialect to inteldialect.
7bebddf Strip old MachineInstrs *after* we know we can put them back.
b985e9a Clean up includes.
54b3b30 Update CMakeList.txt for new lli sources.
15d0c81 Remove unused typedefs gcc4.8 warns about.
35ed842 MCJIT: getPointerToFunction() references target address space.
706f03a MCJIT: Add faux remote target execution to lli for the MCJIT.
998d3cc Switch BasicAliasAnalysis' cache to SmallDenseMap.
4c3d3ec LLVM Bug Fix 13709: Remove needless lsr(Rp, #32) instruction access the subreg_hireg of register pair Rp.
7dadac6 [asan] fix lint
3d5e161 Fixed the DAG combiner to better handle the folding of AND nodes for vector types. The previous code was making the assumption that the length of the bitmask returned by isConstantSplat was equal to the size of the vector type. Now we first make sure that the splat value has at least the length of the vector lane type, then we only use as many fields as we have available in the splat value.
59a4a47 [asan] extend the blacklist functionality to handle global-init. Patch by Reid Watson
4e4e6c0 Remove some of the patterns added in r163196. Increasing the complexity on insert_subvector into undef accomplishes the same thing.
c17177f Add patterns for integer forms of VINSERTF128/VINSERTI128 folded with loads. Also add patterns to turn subvector inserts with loads to index 0 of an undef into VMOVAPS.
27b25c2 Add a FIXME that assumes we maintain backward compatibility until the next major release.
ec90cc8 Reorder the comments of EmitExceptionTable.
fd91d8d Fix UseInitArray option for MIPS target.
f6dc792 Convert vextracti128/vextractf128 intrinsics to extract_subvector at DAG build time. Similar was previously done for vinserti128/vinsertf128. Add patterns for folding these extract_subvectors with stores.
f7e0ea6 Removed Trie.h; unused in a long time
a89fb0f Remove redundant semicolons to fix -pedantic-errors build.
5d637d7 Fix function name per coding standard.
90e11f8 Fix function name per coding standard.
f16ae58 [ms-inline asm] Add support for the nsdialect keyword in the Bitcode Reader/Writer.
71f359a [ms-inline asm] Add the nsdialect keyword to the lexer.
3654734 [ms-inline asm] Emit the (new) inline asm Non-Standard Dialect attribute.
230768b Make provenance checking conservative in cases when pointers-to-strong-pointers may be in play. These can lead to retains and releases happening in unstructured ways, foiling the optimizer. This fixes rdar://12150909.
be11991 BypassSlowDivision: Assign to reference, don't copy the object.
f363ebd Search the whole instruction for tied operands.
03fe8f6 [ms-inline asm] Add the inline assembly dialect, AsmDialect, to the InlineAsm class.
4e2132e [ms-inline asm] Remove the Inline Asm Non-Standard Dialect attribute.  This implementation does not co-exist well with how the sideeffect and alignstack attributes are handled.  The reverts r161641.
7a9572f [LIT] Add a clang_tools_extra_site_cfg to match the various other site_cfg.
ed0e3a3 Fix my previous patch (r163164). It does now what it is supposed to do: Doesn't set MadeChange to TRUE if BypassSlowDivision doesn't change anything.
7b2d20d Return false if BypassSlowDivision doesn't change anything. Also a few minor changes: - use pre-inc instead of post-inc - use isa instead of dyn_cast - 80 col - trailing spaces
f2d8190 Remove unneeded code.
4f1a56c Typo.
99c416c Actually use the MachineOperand field for isRegTiedToDefOperand().
daddf07 Move tie checks into MachineVerifier::visitMachineOperand.
9c13067 Allow tied uses and defs in different orders.
2e2efd9 Generic Bypass Slow Div - CodeGenPrepare pass for identifying div/rem ops - Backend specifies the type mapping using addBypassSlowDivType - Enabled only for Intel Atom with O2 32-bit -> 8-bit - Replace IDIV with instructions which test its value and use DIVB if the value is positive and less than 256. - In the case when the quotient and remainder of a divide are used a DIV and a REM instruction will be present in the IR. In the non-Atom case they are both lowered to IDIVs and CSE removes the redundant IDIV instruction, using the quotient and remainder from the first IDIV. However, due to this optimization CSE is not able to eliminate redundant IDIV instructions because they are located in different basic blocks. This is overcome by calculating both the quotient (DIV) and remainder (REM) in each basic block that is inserted by the optimization and reusing the result values when a subsequent DIV or REM instruction uses the same operands. - Test cases check for the presents of the optimization when calculating either the quotient, remainder,  or both.
e20cf3d Make sure macros in the include subdirectory are not used without being defined.
3e59040 Porting Hexagon MI Scheduler to the new API.
67514e9 Patch to implement UMLAL/SMLAL instructions for the ARM architecture
3251020 This patch optimizes shuffle instruction - generates 2 instructions instead of 4. Since this specific shuffle is widely used in many workloads we have ~10% performance on them.
7765492 LICM may hoist an instruction with undefined behavior above a trap.
68d92bd Fix Android build of gtest and lib/Support.
5eae90d Add support for fetching inlining context (stack of source code locations) by instruction address from DWARF.
2d5c28d Be conservative about allocations that may alias the accessed pointer.
2dc88d9 [ms-inline asm] Make comment more verbose and add an assert.
2cc97de [ms-inline asm] Asm operands can map to one or more MCOperands.  Therefore, add the NumMCOperands argument to the GetMCInstOperandNum() function that is set to the number of MCOperands this asm operand mapped to.
efeaae8 [ms-inline asm] Add a comment.
038f3e3 [ms-inline asm] Add an interface to the GetMCInstOperandNum() function in the MCTargetAsmParser class.
ad2d3e6 Remove extraneous return.
87d910e [ms-inline asm] Return the MCOperandNum instead of passing a reference.
94b17f3 Remove always true checks. Noticed by Adhemerval Zanella.
f2210ed Add braces to the case statement.
f68b87f IRBuilderify the SjlLjEHPrepare pass.
7b23d08 When updating live range endpoints, make sure to preserve the early clobber bit.
84451a1 Fix more fallout from r158919, similar to PR13547.
c4d2560 Removed unused argument.
8a04e51 some peepholes that should match horizontal add/sub operations.
3a86e13 [ms-inline asm] Expose the Kind and Opcode variables from the MatchInstructionImpl() function.
61290e3 Move ErrorLoc decl into the scope where it's actually used.
ad5a0ce escape special char when handling CXX_FOR_OCAMLOPT
3ba5de6 fix test's RUN lines
4d00161 add support for ocaml 3.12
2d892c5 replace a couple of single-line comments with /* */ to fix the build of stuff depending on the C headers
ee77da6 Fix a typo.
9f40cb3 Not all targets have efficient ISel code generation for select instructions. For example, the ARM target does not have efficient ISel handling for vector selects with scalar conditions. This patch adds a TLI hook which allows the different targets to report which selects are supported well and which selects should be converted to CF duting codegen prepare.
7de7078 LoopRotation: Make the brute force DomTree update more brute force.
43bf709 Rename ANDROIDEABI to Android.
f55ef64 Generate better select code by allowing the target to use scalar select, and not sign-extend.
d906017 Only legalise a VSELECT in to bitwise operations if the vector mask bool is zeros or all ones.  A vector bool with just ones isn't suitable for masking with.
8dce5b6 PR13689: Check for backtrace(3) in the cmake build.
89f4980 Limit domain conversion to cases where it won't break dep chains.
0fc44ab Revert "Take account of boolean vector contents when promoting a build vector from i1 to some other type.  rdar://problem/12210060"
8fccd01 Fix Thumb2 fixup kind in the integrated-as.
4b6fbf2 Add ARM ELF support to llvm-objdump.
7b3d77e Code cleanup: tools/opt/opt.cpp
e2ac552 Fix typo.
64f30e3 LoopRotation: Check some invariants of the dominator updating code.
8365e9b Typos
58d5729 Teach DAG combine a number of tricks to simplify FMA expressions in fast-math mode.
b79bff5 Fix typo
5cf8bac llvm/test/CodeGen/X86/fp-fast.ll: Suppress FMA4 on AMD Bulldozer host, corresponding to r162999.
c11b719 Fix Atom bots for r163036.
2b7a2e8 SelectionDAG: when constructing VZEXT_LOAD from other loads, make sure its output chain is correctly setup.
dfb1e4b Mark FMA4 instructions as commutable and add them to the folding tables.
42d619b Make sure to build libpthread to check for HAVE_PTHREAD_MUTEX_LOCK.
756d2cc Remove an unused argument.  The MCInst opcode is set in the ConvertToMCInst() function nowadays.
bbdbb05 Add selection of RegOp2MemOpTable3 to canFoldMemoryOperand
9408314 Add MachineInstr::tieOperands, remove setIsTied().
265bcb1 Fix PR12359
3185f9a The instruction DINS may be transformed into DINSU or DEXTM depending on the size of the extraction and its position in the 64 bit word.
e4fb6ea Move the GCOVFormat enums into their own namespace per the LLVM coding standard.
429af6f Add a comment to explain what's really going on.
5d04a56 The ConvertToMCInst() function can't fail, so remove the now dead Match_ConversionFail enum.
cb08486 Mark FMA3 instructions as commutable so that the operands to the multiply part can be commuted.
89b2ff0 Use CloneMachineInstr to make a new MI in commuteInstruction to make the code tolerant of instructions with more than two input operands.
bf40437 Add support for converting llvm.fma to fma4 instructions.
908c0c0 Don't enforce ordered inline asm operands.
cb5f63d Clean up ProfileDataLoader a bit.
2a1b0e7 llvm/test/CodeGen/X86/vec_select.ll: Fix failure on xmm-less hosts, to add -mattr=+sse2.
f91e400 Cleanups due to feedback. No functionality change. Patch by Alistair.
5d60c67 Clean up AddedComplexity further after adding UseSSEx
05e80f2 Fix a couple of typos in EmitAtomic.
9765c6e X86: Fix encoding of 'movd %xmm0, %rax'
359956d With the fix in r162954/162955 every cvt function returns true.  Thus, have the ConvertToMCInst() return void, rather then a bool.  Update all the cvt functions as well.
5dd9e21 Take account of boolean vector contents when promoting a build vector from i1 to some other type.  rdar://problem/12210060
9e3b6df Try to make this test more generic to unbreak buildbots.
43da6c7 Teach the DAG combiner to turn chains of FADDs (x+x+x+x+...) into FMULs by constants.  This is only enabled in unsafe FP math mode, since it does not preserve rounding effects for all such constants.
fafa283 Fix for r162954.  Return the Error.
64b3444 Move a check to the validateInstruction() function where it more properly belongs.
cee2f72 [llvm] Updated the test fold-vector-select so that we test the vector selects exhaustively.
1122fc4 Typo.
389536c Whitespace.
04508c6 Whitespace.
0bad086 Hoist a check to eliminate obvious mismatches as early as possible.  Also, fix an 80-column violation in the generated code.  No functional change intended.
e757f00 Currently targets that do not support selects with scalar conditions and vector operands - scalarize the code. ARM is such a target because it does not support CMOV of vectors. To implement this efficientlyi, we broadcast the condition bit and use a sequence of NAND-OR to select between the two operands. This is the same sequence we use for targets that don't have vector BLENDs (like SSE2).
62316fa [ms-inline asm] Add a new function, GetMCInstOperandNum, to the AsmMatcherEmitter.  This function maps inline assembly operands to MCInst operands.
a03c441 Introduce 'UseSSEx' to force SSE legacy encoding
d566c5f ADTTests: [CMake] Exclude DenseMapTest.cpp and SmallVectorTest.cpp on MSVC9 due to its bug.
54cbadc Apply "/Og-" also to MSC15(aka VS9) on VMCore/Function.cpp.
d2a35f2 PPCISelLowering.cpp: Fix r162725.
25f6b5a PPCISelLowering.cpp: Whitespace.
7498078 test
86c0d8c Fix test case.
d70846e LoopRotate: Also rotate loops with multiple exits.
c81fe9c InstCombine: Fix comment to reflect the code.
e941df5 Don't use MCInstrDesc flags for implicit operands.
1dfe9b5 Whitespace
639570c It is illegal to transform (sdiv (ashr X c1) c2)  -> (sdiv x (2^c1 * c2)), because C always rounds towards zero.
c4a32e6 Add support for moving pure S-register to NEON pipeline if desired
f52f6b9 remove old docs
38a6381 Refactor fetching file/line info from DWARFContext to simplify the code and allow better code reuse. Make the code a bit more conforming to LLVM code style. No functionality change.
6b1e1d8 Add FMA to switch statement in VectorLegalizer::LegalizeOp so that it can be expanded when it isn't legal.
3b9dfc9 Add support for FMA to WidenVectorResult.
b1bdd7d Only perform DAG combine on FMAs of legal types.
73996f4 Pass by pointer and not std::string.
b6efbd2 Should put test case under test/ExecutionEngine/MCJIT/
6e5190c Revert r162855 in favor of changing clang to emit the absolute coverage file path.
55a4b51 Fix HashString's Bernstein hash to use unsigned chars, as is usually done.
faa1159 Fix PR13727
b4e090d Add a bit of documentation to copyPhysReg.
492d76b Verify the order of tied operands in inline asm.
4d69a8c Explicitly cast an expression to bool before handing it off to __builtin_expect.
e160c53 Add some __builtin_expect magic to StringMap.
55907d1 Replace the BUILTIN_EXPECT macro with a less horrible LLVM_LIKELY/LLVM_UNLIKELY interface.
15b7a98 Allow targets to specify a minimum supported NOP size when performing NOP padding.  If the desired padding is smaller than the supported NOP size, we will enlarge the padding to make it work.
6639080 Set the isTied flags when building INLINEASM MachineInstrs.
b1b9783 Preserve branch profile metadata during switch formation.
6b01438 whitespace
f036f7a Rename hasVolatileMemoryRef() to hasOrderedMemoryRef().
ad7ebc2 Add MachineMemOperand::isUnordered().
0d75858 Don't move normal loads across volatile/atomic loads.
688c1cd fix C++ comment in C header
0e76db9 Use the full path to output the .gcda file.
bbd169b Reserve space for the mandatory traceback fields on PPC64.
21b742f Use ArrayRef instead of SmallVector when passing vector into function.
90a4f78 Verify the consistency of inline asm operands.
17dd9a9 Clean this up slightly, doesn't really fall through.
20599ea Refactor setExecutionDomain to be clearer about what it's doing and more robust.
773eb97 Make helper function static.
8e0d1c0 Make MemoryBuiltins aware of TargetLibraryInfo.

   * external/lohit-fonts
ccae9dc Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/lohit-fonts into 1.1
1f37245 Remove improperly mapped glyphs from cmap

   * external/lsof
c361873 Build lsof in xbin
cc9b3c9 Fix the build

   * external/mp4parser
36e04c3 Trimming: add the rotation matrix into TrackHeaderBox
9fcbbda Working around the aspectJ implementation.
d6072f0 Remove all the .svn directory
dd9eb89 Initial drop the compilable version of mp4parser, with least modification
8436c0d Initial empty repository

   * external/nano
ab0bea7 nano: hack to insert newline on enter key instead of "Unknown Command"

   * external/naver-fonts
9238a39 Makefiles for NanumGothic font.
9c62bcc Initial checkin of NanumGothic font.

   * external/nist-sip
cff6e22 SIPTransactionStack: Map.contains(key) was used instead of Map.containsValue(value)
2d42e31 NullPointerException in HeaderIterator

   * external/ntfs-3g
345234e Rename fuse-lite in the Android makefile
70a025c Build mkntfs on Android
d487bde ENGR00234042 Fix file over 2G size can not be written
0f389f8 ENGR00232884-2 Add ntfsfix support
18b4feb ENGR00232884-1 basic porting for ntfs-3g
2111ad7 Initial import of ntfs-3g_ntfsprogs-2013.1.13

   * external/okhttp
975568b Merge "Remove usage of setEnabledCompressionMethods"
3c4b370 Remove usage of setEnabledCompressionMethods

   * external/openssh
eb7ce19 start-ssh: use correct path for authorized_keys
d28e50c sshd: add null check
8acc04f Fixes
7add873 update to openssh 6.1p1
1340eb8 config: use standard path for SSH_USER_DIR
5d4b7a4 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/openssh into mr1-staging

   * external/openssl
ba352ab Remove references to obsolete ThirdPartyProject.prop
0673126 am 13e2fdfa: am b73232f0: Merge "Disable x86 assembly on darwin"
13e2fdf am b73232f0: Merge "Disable x86 assembly on darwin"
b73232f Merge "Disable x86 assembly on darwin"
1d3c00a Disable x86 assembly on darwin
1380211 am 945555bc: am 591d8daf: Merge "Enable openssl crypto optimizations for x86 platform"
945555b am 591d8daf: Merge "Enable openssl crypto optimizations for x86 platform"
591d8da Merge "Enable openssl crypto optimizations for x86 platform"
c58cd0f Enable openssl crypto optimizations for x86 platform
05b4e2d am eb39b600: am fef450d3: Merge "Disable SSL compression"
eb39b60 am fef450d3: Merge "Disable SSL compression"
fef450d Merge "Disable SSL compression"
4027893 Disable SSL compression

   * external/openvpn
23e554d Revert "unmask SIGCHILD so waitpid won't return -ECHILD"
67b8d46 unmask SIGCHILD so waitpid won't return -ECHILD

   * external/powertop
2a29256 powertop: fix power top build for MIPS
06f845a Fix the build on CM

   * external/protobuf
416da13 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/protobuf into 1.1
db9ab02 Build against the NDK for x86 and mips too.

   * external/qemu
7b0d80a goldfish_nand.c: Change sizes
821a8db Show dynamic skin if enabled in AVD settings
b84fb1d Obtain path to dynamic skin layout folder from sdk root
2ed7527 Support dynamic skin layout
a546c70 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging
0f80925 Merge "Add SSE optmized IDCT in JPEG decoding emulator"

   * external/sepolicy
85d21f7 Revert "Add a new context for Google-authored apps"
923bd93 Restore /dev/eac - used by the emulator.
e74ed5e Allow Performance Settings to set sys.cpufreq.restored
b5c32a3 Let system components and apps set the enforce state
96cea0c Fix MMAC permissions
2666f2d Merge branch 'selinux' into cm-10.1
4ba45a3 Fix priority in /cache/dalvik-cache labelling
e83c5a9 Fix some failures in the Settings app
ccd2d60 Fix rild's usage of its netlink socket
188a3a5 Fix adbd's access to its own authorized keys file
47ad856 Add a new context for Google-authored apps
0f49406 Add context for CM's alternate dalvik-cache path
18c1cbc Revert "ISSUE 6849488 Bluedroid stack, remove system/bluetooth."
d7cc9ae keystore daemon can be used by third party apps running in any level.
f59b9d7 Exempt bluetooth domain from property_service set.
043c7c0 Label another node with uinput_device.
aecb16a Label /dev/video4[0-9] nodes as camera_device.
ab6357d Add a disableAudioCapture boolean to disable audio capture.
7b00c5e Introduce new uinput_device domain.
b0fcb3a Add disableAudio boolean to disable audio access.
9bb18c1 Wrap more rules under the disableBluetooth boolean.
352f58f Invert camera and bluetooth booleans.
e0cd769 Introduce booleans for disabling camera and bluetooth.
b3d4a48 Split shell domain into separate domains for adb shell vs init-spawned shell.
cf2af8c Introduce untrustedappdomain attribute
e345ef4 Remove another device-specific device node and type.
faee59a Delete legacy devices and label mdns and gps sockets.
395d756 Revert "Allow logwrapper to be used by all daemons spawned by init"
29bee59 Allow logwrapper to be used by all daemons spawned by init
f97b834 Allow file types to be associated with the rootfs.
51973a9 Various updates to policy.
3717458 Merge branch 'master' into seandroid
df05a11 Label all files under /sys/qemu_trace with sysfs_writable.
97ff811 Merge "Add non_system_app_set"
03fe014 Add further assertions.
09258ad Drop domain write access to sysfs for the emulator.
2524fc8 Remove sys_nice capability from domains.
82ec720 Add further neverallow assertions.
8cd20ef Add non_system_app_set
8ad9d7a Merged in billcroberts/external-sepolicy/nsa-seandroid-runas (pull request #15)
6329721 Support strict duplicate checking
de1020a run-as support for all non system apps
fb3bc20 Add non_system_app_set
bc38824 Drop sys_module from system_server.
3f58b30 Merged in billcroberts/external-sepolicy/nsa-seandroid-checkseapp (pull request #13)
9dbb7de Support strict duplicate checking
d334b17 Fix segfault on -v with duplicates
1e8c061 Fix segfault on -v with duplicates
82fdb48 Introduce new hostapd domain.
9a67168 Sundry policy updates.
22da626 Merge branch 'master' into seandroid
6c4c27e Give domains read access to security_file domain.
fc18c7a run-as policy fixes.
cd516a3 run-as policy fixes.
47756b7 Merge branch 'master' into seandroid
c80389e Give domains read access to security_file domain.
8bb3080 Add new domains for private apps.
0bca157 Merge "Drop SELinux management rules from AOSP."
4ac4bc0 Document the relevant tests associated with specific rules.
4b60cc3 Do not allow reading all directories for the CTS.
33da609 Allow all domains to read /dev symlinks.
c37856c Remove unnecessary rules.
cfd9b6b Allow apps to execute the shell or system commands unconditionally.
ab0cd21 Allow fstat of platform app /data/data files.
b0957fa Coalesce rules for allowing execution of shared objects by app domains.
80c9ba5 Strip unnecessary trailing semicolon on macro calls.
2b73223 Allow all domains to read the log devices.
88ae559 Drop SELinux management rules from AOSP.
434b4df Document the relevant tests.
3bedf8d Do not allow reading all directories.
561818d Allow all domains to read /dev symlinks.
24b2bbf Remove unnecessary rules.
a99320b Allow apps to execute the shell or system commands unconditionally.
c0af807 Allow fstat of platform app /data/data files.
4cd71f2 Allow all appdomains to execute system_data_file.
34403c1 Strip unnecessary trailing semicolon on macro calls.
d0517a8 Allow all domains to read the log devices.
45d74e8 Move admin-related policy to seadmin.te.
9e11559 Merge branch 'master' into seandroid
cebe6a6 Allow ueventd to relabel sysfs nodes.
5b6a13f Give domains read access to security_file domain.
e6e4630 Add new domains for paid apps.
84c46de Remove unneeded device type.
e543a8b Increase policy version to 26.
98d16f6 Increase policy version to 26.
866e290 Merge branch 'master' into seandroid
f4d5f3e Merge "Add missing seinfo tag from mac_permissions.xml policy."
2ae799e Drop separate domain for browser.
0ecb0f8 Eliminate most of the app policy booleans.
b0b772c Drop sample vpn entry.
602ef24 Merge branch 'master' into seandroid
65911e8 Add missing seinfo tag from mac_permissions.xml policy.
96c109e Merge "Revert "Revert "Rewrite mac_permissions.xml file."""
59fd8d4 Revert "Revert "Rewrite mac_permissions.xml file.""
e693ed7 Remove the su domain from -user builds.
1682018 Merge "Expand insertkeys.py script to allow union of files."
e69552b Revert "Revert "Various minor policy fixes based on CTS.""
7f2392e Expand insertkeys.py script to allow union of files.
0d0d0c6 Drop vpn_app_data_file file type.
8856912 Revert vpn_app domain and vpn seinfo tag.
bac8ac4 Merge branch 'master' into seandroid
65d4f44 Various policy updates.
bf539bf Merge "Fix makefile error with ANDROID_BUILD_TOP"
edf7b4c Revert "Revert "Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml""""
52fc95d Fix makefile error with ANDROID_BUILD_TOP
60d4d71 Revert "Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml"""
82fe3d2 Merge "Revert "Rewrite mac_permissions.xml file.""
31d1a40 Revert "Rewrite mac_permissions.xml file."
1620c67 Merge "Introduce security labels for 2 new device nodes."
b24c30b Rewrite mac_permissions.xml file.
cd4104e Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml""
69d04b6 Merge branch 'dogfood-seandroid' into seandroid
645b28c Merge branch 'master' into seandroid
f62af81 Introduce security labels for 2 new device nodes.
a3bf14d Move sepolicy.dontaudit to intermediates directory.
c7e68e2 Update with device node domains and new access perms.
96ba695 Update zygote process.
d584946 Update bluetooth policy.
c329580 Merge "New users need a wallpaper_file type."
eee138c Merge "Allow zygote to search tmpfs."
c5baaff New users need a wallpaper_file type.
8b3b4fe Allow zygote to search tmpfs.
41e5390 New dev_types and other minor adjustments.
905e316 Make ion_device mls trusted.
18b5f87 racoon policy.
dbb82fd Merge "Revert "Various minor policy fixes based on CTS.""
ba84bf1 Revert "Various minor policy fixes based on CTS."
9c0f2df Merge changes I5a3584b6,Ic7252a8e,I2d4ace75
8a814a7 Various minor policy fixes based on CTS.
c195ec3 Split internal and external sdcards
1ed1eff Give sdcard sys_admin capability.
f766c4d Allow bluetooth users to use socket provided by bluetooth app.
ff7e530 Create policy for PAN connections.
4d3f108 Allow domain search/getattr access to security file
9e70c8b Move policy files
05729b2 Create a post-process sepolicy with dontaudits removed.
346cae2 bluetooth app requires net_admin for enabling bluetooth.
cf14142 Merge "Strengthen setenforce and setbool assertions"
9aea69c Require entrypoint to be explicitly granted for unconfined domains.
193d129 Strengthen setenforce and setbool assertions
12381fc Merge branch 'master' into seandroid
15b3ced Add BOARD_SEPOLICY_IGNORE
acea73d Merge "Drop shell from having access to dmesg"
3808414 Generalize levelFromUid support.
ae0fcf1 Merge "watchdog security policy."
566553e Merge "Update binder-related  policy."
767abc0 Drop shell from having access to dmesg
1446e71 Revert "Dynamic insertion of pubkey to mac_permissions.xml"
5a2988f Remove duplicate paths from sepolicy_replace_paths
bac9992 watchdog security policy.
9ce99e3 Update binder-related  policy.
1f5939a Allow search of tmpfs mount for /storage/emulated.
6136284 Permit fstat of property mapping.
aeb512d Disable debugfs access by default.
c8106f1 Only allow read/write not open on platform_app_data_file.
d06104d Merge "property_contexts checks added to checkfc."
6d6c617 Merge "Whitespace and doxygen fix"
ee80bfb Add policy assertions (neverallow rules).
c0890c8 Merge "Allow domain to random_device"
d98d26e property_contexts checks added to checkfc.
6a64897 Do not allow access to device:chr_file for system
1c8464e App data backup security policy.
c57dbcc Merge "Change security policy so all apps can read /dev/xt_qtaguid."
5988bbf Merge "Dynamic insertion of pubkey to mac_permissions.xml"
04598de Merge "Replaceable mac_permission.xml support"
669f679 Merge "mediaserver.te refactor"
eeafabd Merge "Label persist audio properties"
c3e329c Remove the su domain from -user builds.
d463440 Allow drmserver to use open files provided by apps.
26c4655 Need shutdown too.
ef1268b Bluetooth access requires ability to use sockets created by bluetooth app.
6163f45 Allow surfaceflinger to use open files passed by apps.
52a6801 mediaserver needs getattr too.
05f2e05 Allow bluetooth users to use socket provided by bluetooth app.
7a6477a bluetooth app requires net_admin for enabling bluetooth.
171f89d More rules based on CTS testing.
2287833 Require entrypoint to be explicitly granted for unconfined domains.
1059885 Various minor policy fixes.
6b5ccb2 Augment the error reporting for setool.
6208537 Fix deny-all policy stanza case.
a789801 Merged in billcroberts/external-sepolicy/seandroid (pull request #12)
9c597b1 Split internal and external sdcards
11d9f8c Merge branch 'master' into seandroid
e468016 zygote requires setpcap in order to drop from its bounding set.
d0d4709 zygote needs setpcap in order to drop capabilities from bounding set.
ce590eb Merged in billcroberts/external-sepolicy/seandroid-assert (pull request #10)
a1830cf Strengthen setenforce and setbool assertions
67cfa6d Merged in billcroberts/external-sepolicy/seandroid-ignore (pull request #11)
85f63ce Merged in billcroberts/external-sepolicy/seandroid-dev (pull request #9)
09340b7 Add BOARD_SEPOLICY_IGNORE
c63fd33 boolean for system_app management
581b366 Merged in billcroberts/external-sepolicy/seandroid-dev (pull request #8)
4e1a6c5 Allow system(_app) access to audit logs
fe9020d auditd policy changes for switching uid/gid.
82aa0bd Update auditd permissions to reflect code changes.
3ffe087 Update policy for new audit file location.
2da7993 Merged in billcroberts/external-sepolicy/seandroid-auditd-rename (pull request #6)
0e42f0d Allow domain to random_device
702703c Drop shell from having access to dmesg
4a0ccba Allow auditd to rename logs
cd36547 Merged in billcroberts/external-sepolicy/seandroid-security-domain (pull request #5)
16223f6 Merged in billcroberts/external-sepolicy/seandroid-auditd (pull request #3)
1a74b96 Allow domain search/getattr access to security file
d270aa3 Initial auditd policy
0992f48 Allow search of tmpfs mount for /storage/emulated.
f1a707d Permit fstat of property mapping.
40356b9 Allow domain to random_device
f357d04 Introduce security labels for 2 new device nodes.
31b3980 Give sdcard sys_admin capability.
8351114 Allow release_app to read current selinux state.
97fa2ba Merged in billcroberts/external-sepolicy/seandroid-policy-move (pull request #2)
4be6c83 Move policy files
185e780 property_contexts checks added to checkfc.
273a52a Do not allow access to device:chr_file for system
b6fea7f mediaserver.te refactor
e039cb8 Whitespace and doxygen fix
7e309f9 Label persist audio properties
0f7a051 Remove duplicate paths from sepolicy_replace_paths
41c106e Merge branch 'master' into seandroid
58b0fb6 Fix invalid specification for adb_keys.
2552023 Disable debugfs access by default.
a005018 Only allow read/write not open on platform_app_data_file.
24c4587 Add policy assertions (neverallow rules).
6a12b72 racoon policy.
e60ae0a Merge branch 'master' into seandroid
92b9aa0 add file_contexts entries for root filesystem
26e51a2 Remove ump device type.
9d66faf Undo some watchdogd related changes.
dae746f Expand insertkeys.py script to allow union of files.
9f2ff75 Dynamic insertion of pubkey to mac_permissions.xml
a3394d7 Replaceable mac_permission.xml support
22fc041 Dynamic insertion of pubkey to mac_permissions.xml
c451642 Make ion_device mls trusted.
8fd1a08 /dev/__kmsg__ and /dev/__null__ security labeling.
2c8a55d Replaceable mac_permission.xml support
4c266ba Change security policy so all apps can read /dev/xt_qtaguid.
d7e492d Allow zygote to search tmpfs.
11e5944 App data backup policy.
5ce1d0b Create policy for PAN connections.
bf2ba7c New dev_types and other minor adjustments.
049b81a Allow all apps to read from /dev/xt_qtaguid.
4b0eb99 watchdog policy.
741734c New users need a wallpaper_file type.
438ea7f Allow Settings app to read sdcard for storage stats.
4e030c2 mediaserver.te refactor
e2ad318 Label persist audio properties
80d00d2 Generalize levelFromUid support.
91e44c6 3rd party VPN applications use a tun device
fff2980 Whitespace and doxygen fix
6271d66 Merge branch 'master' into seandroid
e884872 Add policy for run-as program.
fdaa786 Merge "README for configuration of selinux policy"
7930d3b Allow shell to connect to property service
c34a252 Allow shell to connect to property service
3f1ed6e README for configuration of selinux policy
46bf696 Merge branch 'master' into seandroid
a7b38a2 Update mac_permissions.xml for 4.2.
165ccc8 keystore uses the binder now, and adbd requires read to its entrypoint.
61c80d5 Update policy for Android 4.2 / latest master.
7ce11bb Cleanups.
eb11be4 Allow surfaceflinger to transfer reference to init on reply.
634b1fc Allow binder reference transfer on server reply.
8571cb7 Kill extra whitespace.
7e1cb56 Allow transferring refs to servicemanager.
b98b5f9 Update for changes to binder security checking.
ebd1d39 Further fixes for 4.2.
9de444f Policy changes for 4.2.
b35b24b Define a bluetooth domain for apps running in the bluetooth UID.
5c7d78f Merge branch 'master' into seandroid
bfdb440 Add policy for run-as program.
e4c5b2d Merge branch 'master' into seandroid
eab2389 Merge "Revert "Include su.te only for userdebug/eng builds."" into jb-mr1-dev-plus-aosp
8c87a18 am df822f41: Merge "Add SELinux policy for asec containers."
eefaa83 am cdfb06f5: Moved Android policy tools to tools directory
df822f4 Merge "Add SELinux policy for asec containers."
9ceb47b Revert "Include su.te only for userdebug/eng builds."
c6d27ec Moved Android policy tools to tools directory
668f311 Revert "Moved Android policy tools to tools directory"
cdfb06f Moved Android policy tools to tools directory
e8ac72b Moved Android policy tools to tools directory
1b5080c Add description to setool usage statement.
955a254 Add AOSP Copyright header to select files.
9491e11 Relocate setool program.
d355143 Add SELinux policy for asec containers.
cd5cc11 Some edits to comments concerning mac_permissions.xml.
3ef88ca Add seinfo tag to inner browser package stanza.
bbb439b Allow system to getenforce, setenforce, setbool
83dde22 am f6647eb9: Change 0 to NULL Byte
f6647eb Change 0 to NULL Byte
a2517b2 resolved conflicts for merge of 47cd396b to jb-mr1-dev-plus-aosp
47cd396 Add better per-device sepolicy support.
6b964fa am d8b122c7: Use file target as dependency.
d8b122c Use file target as dependency.
8f4600c am 5dbfdc0b: Add double free protection to checkseapp.
5dbfdc0 Add double free protection to checkseapp.
7672eac Add SELinux policy for asec containers.
84b7472 am 6766cc9e: Merge "allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access"
ca895fb am 91c12e3c: Merge "file class macro cleanup"
6766cc9 Merge "allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access"
91c12e3 Merge "file class macro cleanup"
ced365a am 01a58af1: Add a checkfc utility to check file_contexts validity and invoke it.
01a58af Add a checkfc utility to check file_contexts validity and invoke it.
b83bb3f Revert "ISSUE 6849488 Bluedroid stack, remove system/bluetooth."
44374bc am 659aaced: Remove HAVE_SELINUX guard
f26d813 allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access
659aace Remove HAVE_SELINUX guard
7104df5 file class macro cleanup
382381b am 3ac1d26a: Switch app_* and isolated to _app and _isolated in seapp_contexts.
3ac1d26 Switch app_* and isolated to _app and _isolated in seapp_contexts.
acbded3 Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
c6c6aba am 061f254d: Define security labeling for isolated processes.
b620dc6 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
061f254 Define security labeling for isolated processes.
9822c1d am 66a3e8d9: Drop the use of a policy version suffix on the sepolicy file.
66a3e8d Drop the use of a policy version suffix on the sepolicy file.
dfd4cfc am fc6b1032: Merge changes I98fc14e1,If334ba73
fc6b103 Merge changes I98fc14e1,If334ba73
b3ab56c Fix for segfault/jmp depends on unitialized variable
a53ccf3 Fix check_seapp segfault and undefined linking err
2e44ea3 am 9c08abbd: Merge "Allow domain access to /dev/ion"
9c08abb Merge "Allow domain access to /dev/ion"
c2cb712 am c27d30a6: Correct spelling mistake
ccc8271 Allow domain access to /dev/ion
c27d30a Correct spelling mistake
d0f027c am 10f9a372: Merge upstream sepolicy into AOSP
10f9a37 Merge upstream sepolicy into AOSP
1148bc2 Merge checkseapp support.
ae23a1f Corrected gramatical issues
a861318 Added new line to end of file
98ed392 Changed seapp_contexts temporary file naming
0ae3a8a Fix mls checking code
f0e0a94 Support overrides in seapp_contexts

   * external/skia
a6c45fb Fimg2d: set fimg.isFilter in SkDraw::drawBitmap
9c7be1b Fimg2d3x: fix icon scaling issue with acceleration enabled
4adc54b skia: exynos4: add support for fimg2d3x
647876b exynos4: fimg2d acceleration
506e364 Add optimized S32A_D565_Opaque_Dither blitter.
416f34f Add optimization of Skia S32A_Blend blitter
49cd20f Add optimization of Skia S32A_Opaque blitter
1f089a2 Modify sample buffer size for larger displays.
ef1ba57 Add optimized S16_opaque_D32_nofilter_DX blitter.
0f1f6b4 Add shader for Clamp_S32_Opaque_D32_nofilter_DX.
5dd8eff Add shader for Repeat_SI8_opaque_D32_filter_DX.
4fde5f6 Add shader for Clamp_SI8_opaque_D32_filter_DX.
d1e52fc Add shader for Clamp_S32_Opaque_D32_filter_DX.
c3a04a0 Revert "Neon optimized implementation of S16_opaque_D32_nofilter_DX"
705eb62 Skia: Introduce caching of unscaled Bitmaps.
425325c skia: SkPaint::SkPaint(): don't cast away const
5faf751 memcpy_76(): fix behavior on non-ARM architectures
f4be52e FIX: memcpy_76(): add support for non-ARM architectures
a8ce1a0 Revert "memcpy_76(): add support for non-ARM architectures"
ad673c1 memcpy_76(): add support for non-ARM architectures
cb5701e Several skia tunings for JB_2.5
6818083 Support NEON anti-aliasing blit function in SKIA
a0a3a4d Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/skia into mr1-staging
93df05a Revert "skia: Several tunings"
7cd90d4 Add Android specific API Bug #7353771
4979366 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/external/skia into aosp-merge
6ab8707 skia: Several tunings
9c1f88b Update Skia's handling of vertical text when freetype metrics are available.
faa8dc5 Reduce tolerance for going into our fast path for gradients.
ef9e72c Squashed commit of font rendering fixes from Skia master
0a58de2 Landing arm patch from contributor.
9f378eb Implementing Color32 functions for Neon platforms.
ebb0af8 Increment SkPath's generation id when transform() is called
efda4cb am 867c7f44: am 6a22037d: Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery"
867c7f4 am 6a22037d: Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery"
6a22037 Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery"
2f7c075 am a223e0da: am 2f12560c: Merge "Enable dynamic effect of GIF animating images in browser"
a223e0d am 2f12560c: Merge "Enable dynamic effect of GIF animating images in browser"
2f12560 Merge "Enable dynamic effect of GIF animating images in browser"
42490b9 Enable dynamic effect of GIF animating images in browser

   * external/sonivox
4a21314 am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"
274d057 Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"
9a86c64 Added support for parsing XMF versions 1.00 and 1.01 headers

   * external/sqlite
a683f4e Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/sqlite into mr1-staging

   * external/srec
38b8fdb srec: Fix srec using new AudioRecord API.
5550947 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/srec into mr1-staging
6845c18 Revert "external/srec: Fix build error (-fpermissive)"
88fa3a3 Revert "Fixes for building with clang."

   * external/svox
17e32ee PicoTTS: Set mNativeSynth prior to TextToSpeechService#onCreate

   * external/v8
eaf9902 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/v8 into mr1-staging
1271ef1 am a1900418: Merge "V8: enable no-pic compiling option"
a190041 Merge "V8: enable no-pic compiling option"

   * external/webkit
25c2cc2 Fix memory leak when creating SkBitmapProcShader
6d89cd5 [HTML5] Implementation of WebSockets (WebKit).
016661c Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/webkit into 1.1
970019d external/webkit: check element object for NULL
861433c Performance enhancement.  Don't process non-visible lines for layout.
3b32931 external/webkit: use Cpu Upload path
e4a9afa Revert "Workaround double blit failure"
68e9c4e [WebKit] Fix for the memory leak
4bb8cc2 [WebKit] Make PLD DOM traversal optimization configurable
9143796 [WebKit] Browsermark DomAdvSearch and DomSearch optimizations
0f5d435 DOM Optimizations
8f6cf52 Add call to parent to resync for webgl
f7256e9 Bug fix for guimark3 test banner
4da5f26 Improve WebGL object lifetime management in WebGLRenderingContext
c018655 Fix for memory leak in WebGL
77ab7f7 Implement requestAnimationFrame
70f026a WebGL implementation for Android
e02247f Only signal collection swap on true swap
a815c62 webkit: fix for perl 5.14+
0b65fac Revert "TransferQueue: use a few extra buffers"
322b973 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
f48fa4a merge in jb-mr1-release history after reset to jb-mr1-dev
398703a Vertically writing characetrs even if the carrier emoji is available on the device.
2a6ef96 TransferQueue: use a few extra buffers
923f222 TransferQueue: use a few extra buffers
456b899 merge in jb-mr1-release history after reset to jb-mr1-dev
cbc18c5 Merge "Ensure AndroidAnimation's copy of its name string is unique" into jb-mr1-dev
21251e4 Ensure AndroidAnimation's copy of its name string is unique
173b31a merge in jb-mr1-release history after reset to jb-mr1-dev
a464817 Always use full transfer queue size on highEndGfx devices bug:7393228
5356846 merge in jb-mr1-release history after reset to jb-mr1-dev
285c057 Add src rect ptr null check
8ff03fa am d60f8336: (-s ours) am 66ad15e4: DO NOT MERGE Control access to inherited methods of jsinterface objects
d60f833 am 66ad15e4: DO NOT MERGE Control access to inherited methods of jsinterface objects
d9e7bdc merge in jb-mr1-release history after reset to jb-mr1-dev
66ad15e DO NOT MERGE Control access to inherited methods of jsinterface objects
3430821 Deep copy animation keyframe names
b12afef merge in jb-mr1-release history after reset to jb-mr1-dev
df108a7 Merge "Prevent fixed background layers for iframes" into jb-mr1-dev
817a553 merge in jb-mr1-release history after reset to jb-mr1-dev
62e0cc5 Prevent fixed background layers for iframes
e70c8a5 Merge "Compensate for canvas-side vertical text translation in bounding box computation" into jb-mr1-dev
85fb590 Compensate for canvas-side vertical text translation in bounding box computation
58ca90e merge in jb-mr1-release history after reset to jb-mr1-dev
4232600 Determine maxZoomScale from bitmap/text drawing
8398160 merge in jb-mr1-release history after reset to jb-mr1-dev
224e946 Fix opaque rect calculation to quickreject transparent shader drawn ops
98f974e Force stroke style for radio drawing
5419f63 merge in jb-mr1-release history after reset to jb-mr1-dev
866f5ba Merge "Paint into the right PicturePile" into jb-mr1-dev
e581cc1 Merge "Remove broken RLE path" into jb-mr1-dev
6fc2164 Paint into the right PicturePile
6aa888f merge in jb-mr1-release history after reset to jb-mr1-dev
a3bef91 Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev
d79b251 Remove broken RLE path
f2d8c5b Control access to inherited methods of jsinterface objects
5248b7b Merge "Disable clipping painter when painting 400+ operations" into jb-mr1-dev
7dd8f78 Disable clipping painter when painting 400+ operations
e1f8469 merge in jb-mr1-release history after reset to jb-mr1-dev
61df014 Fix crash if SVG tries to load a resource
7fe521c Merge "Update RenderThemeAndroid drawing" into jb-mr1-dev
8660876 Update RenderThemeAndroid drawing
dd969a9 merge in jb-mr1-release history after reset to jb-mr1-dev
49a1052 am 43e94fa8: am 1a6030e7: Merge "Remove inconsistency between HistoryItem writing/reading"
43e94fa am 1a6030e7: Merge "Remove inconsistency between HistoryItem writing/reading"
1a6030e Merge "Remove inconsistency between HistoryItem writing/reading"
a6c4309 merge in jb-mr1-release history after reset to jb-mr1-dev
8eb920d Remove inconsistency between HistoryItem writing/reading
abf93d7 Merge "Avoid unsafe use of SkRefCnt::getRefCnt() in ImagesManager" into jb-mr1-dev
cf1488f Avoid unsafe use of SkRefCnt::getRefCnt() in ImagesManager
0bcdd83 Merge "Fix initialization" into jb-mr1-dev
9fa7e7c Merge "Fix potential corruption/leak in cookiejar." into jb-mr1-dev
bae7aea Fix initialization
7151ed0 Fix potential corruption/leak in cookiejar.
9c867b2 am 4d33d9fb: am 5fe0a0be: Merge "Crash on Orange media portal"
4d33d9f am 5fe0a0be: Merge "Crash on Orange media portal"
5fe0a0b Merge "Crash on Orange media portal"
e90019d Crash on Orange media portal
3f9aace am 76150b63: am 5423878e: Merge "Enable dynamic effect of GIF animating images in browser"
76150b6 am 5423878e: Merge "Enable dynamic effect of GIF animating images in browser"
5423878 Merge "Enable dynamic effect of GIF animating images in browser"
c4c9319 Enable dynamic effect of GIF animating images in browser
9f828fb am 88c8b226: am 9b636ce4: Merge "webkit: enable no-pic compiling option"
88c8b22 am 9b636ce4: Merge "webkit: enable no-pic compiling option"
9b636ce Merge "webkit: enable no-pic compiling option"
9afc4a4 merge in jb-mr1-release history after reset to jb-mr1-dev
9976df9 Merge "Provide referer when download requested" into jb-mr1-dev
fd1365e Provide referer when download requested
abb74d1 merge in jb-mr1-release history after reset to jb-mr1-dev

   * external/wpa_supplicant_6
0ff75d6 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/wpa_supplicant_6 into mr1-staging
fe36dc5 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/external/wpa_supplicant_6 into aosp-merge
2716d65 Merge branch 'jb-release' of https://android.googlesource.com/platform/external/wpa_supplicant_6 into aosp

   * external/wpa_supplicant_8
5735c99 wpa_supplicant: Add get_capability freq
4d11042 wpa_supplicant_8 - Hostapd: Android related changes for sockets
4d29f0d Add capability flag for IBSS and get_capabiliy modes
a526cad Save frequency to network config
ad60a61 Revert "enable CONFIG_PCSC"
d04091d enable CONFIG_PCSC
ee1a2bc Fix regression in LEAP
581ae3a nl80211: add ifndef on AP SME condition
3b571a6 wext: Re-add support for SIGNAL_POLL and DRIVER
261a70c Use legacy NL80211 STA events for older drivers
279731e merge in jb-mr1-release history after reset to jb-mr1-dev
86c93df Merge "Increase timeouts for p2p" into jb-mr1-dev
1a2ce11 Increase timeouts for p2p
31322d3 merge in jb-mr1-release history after reset to jb-mr1-dev
b8fdecb Add parameter checking and error reporting to wpa_blacklist API.
54cb0f6 wpa_supplicant: Try to reject proper BSSID even if not set by the driver
1158d27 merge in jb-mr1-release history after reset to jb-mr1-dev
b485b18 Add better handling of CTRL-EVENT-ASSOC-REJECT
ed9aced merge in jb-mr1-release history after reset to jb-mr1-dev
12b1cd9 Support conc_pref when use_p2p_group_interface=0
6e33bb9 merge in jb-mr1-release history after reset to jb-mr1-dev
81931b8 Increase channel delay to 100ms
ad78b33 merge in jb-mr1-release history after reset to jb-mr1-dev
2c5b17d P2P: Improve robustness against lost ctrl::ack
1cccfe8 P2P: Fix network removal to select correct block
9d71283 P2P: Fix network removal to select correct block
ba39653 merge in jb-mr1-release history after reset to jb-mr1-dev
adddfc4 P2P: Fix p2p_cancel processing during group formation
cf24ade merge in jb-mr1-release history after reset to jb-mr1-dev
9662bcd merge in jb-mr1-release history after reset to jb-mr1-dev
069fa2c Remove unnecessary channel list filtering
91c40cd wpa_supplicant: P2P-related fixes
2b1bd2a merge in jb-mr1-release history after reset to jb-mr1-dev
aa53251 wpa_supplicant: P2P-related fixes
8662198 merge in jb-mr1-release history after reset to jb-mr1-dev
f061966 Fix build: Add ANDROID_P2P for SCC interop fixes
60d855c merge in jb-mr1-release history after reset to jb-mr1-dev
af84a57 GC channel fixes for better interop with SCC
2b00140 merge in jb-mr1-release history after reset to jb-mr1-dev
c90b24f merge in jb-mr1-release history after reset to jb-mr1-dev
89ca702 Do not inform other virtual interfaces of scan results in all cases
fa08f9e P2P: Schedule new scan if P2P operation delays scan
043a5a9 P2P: Check all interfaces for pending scan for p2p_scan failures
dc7b713 P2P: Move p2p_cb_on_scan_complete to global context
5887a9d wpa_supplicant: Skip unnecessary scan attempts
36c93fb merge in jb-mr1-release history after reset to jb-mr1-dev
9bce59c wpa_supplicant: Update to 10-Sep-2012 TOT
2b38048 P2P: Skip join in case of provision discovery failure
07f427a wpa_supplicant: Fix P2P command processing
9804cb1 merge in jb-mr1-release history after reset to jb-mr1-dev
f4f5db3 wpa_supplicant: Improve scan during p2p_find
5a85f72 Merge "clear wfd_dev_info_hex before use" into jb-mr1-dev
8d96518 clear wfd_dev_info_hex before use
b674ee5 merge in jb-mr1-release history after reset to jb-mr1-dev
79cad77 wpa_supplicant: Postpone P2P scan if usual scan is in progress
9bc61e1 Merge "Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"" into jb-mr1-dev
05c12da Revert "wpa_supplicant: Explicitly enable 802.11n and 802.11d for qcwcn"
a2854ab wpa_supplicant: Postpone P2P scan if usual scan is in progress
4530cfd wpa_supplicant: Update to 07-Sep-2012 TOT
8367dc9 Add WFD dev info in device found event
2d26606 AP: Configure basic rates from iface and not conf
5c44edb P2P: Do not fail p2p_group_remove just based on current_ssid
31be0a4 P2P: Allow p2p_invite-persistent to specify channel for GO
dee117d Merge "SME: Fix disconnec-while-authenticating" into jb-mr1-dev
37f5fa5 Merge "Fix disconnection event processing" into jb-mr1-dev
164eea3 Merge "Fix REMOVE_NETWORK to not run operations with invalid current_ssid" into jb-mr1-dev
8084af8 Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev
f8a26a8 SME: Fix disconnec-while-authenticating
2b89da8 Fix disconnection event processing
a831d78 Fix REMOVE_NETWORK to not run operations with invalid current_ssid
1e6c57f nl80211: Register read_sta_data() handler for station only builds
66bf9c4 am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge
26e08cb Reconcile with jb-mr0-release - do not merge
a7534b9 Fix join for p2p_connect
e488da3 Fix 'restore STA reconnection behavior' cherry-pick
6b24b49 Restore STA reconnection behavior
205f214 hostapd: Allow hostapd_cli to work on Android
61d9df3 wpa_supplicant: Update to 29-Aug-2012 TOT
4b86ea5 wpa_supplicant: Update to BRCM version 0.8.0-38
286cca5 Fix am cef482f8: merge
1c1426e am cef482f8: am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick
cef482f am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick
0531f20 Fix 'restore STA reconnection behavior' cherry-pick
59d1b47 am c5c02f1d: (-s ours) am a831bff7: Restore STA reconnection behavior
c5c02f1 am a831bff7: Restore STA reconnection behavior
a831bff Restore STA reconnection behavior

   * external/wpa_supplicant_8_ti
161f26d Add WFD dev info in device found event
7193ff6 WFD: Add preliminary WSD request processing and response
d275d38 WFD: Add support for sending Wi-Fi Display service discovery requests
c293a48 WFD: Add wfd_subelems hexdump in BSS ctrl_iface command output
0793c79 wpa_supplicant: enable Wi-Fi display config
a1fde16 WFD: Add Wi-Fi Display support
e7a1616 wpa_supplicant: enable mr/mc by default
68bd90b Merge commit 'ol_r8.a5.06' into p-jb-mr1-release
4e1835b P2P: Fix broken rx action frame handling (INTERNAL-SQUASH)
f632381 wpa_s: don't accumulate delayed sched scan requests (UPSTREAM)
865eb5d wpa_s: restart sched scan on channel list change
8975c16 Avoid sched scan flood in case of mismatched security (UPSTREAM)
b1ce8a6 nl80211: add support for DRIVER COUNTRY command
0e14818 hostapd: enable dynamic modification of acl policy
fb634d7 P2P: Fix duplicate handling of rx action frames (UPSTREAM)
98fe407 android: wpa_s template: set p2p_go_max_inactivity to 60s (ANDROID)
1b5944c P2P: cancel action frame offchan wait after recv go neg resp (UPSTREAM)
c35ef2e P2P: set P2P_GO_MAX_INACTIVITY to 100s
80a505a Don't disable and select new network if SETBAND didn't change (ANDROID)
76efd31 Trigger sched scan on wpa_s init if enabled networks (INTERNAL)
264e5ef android: wpa_s template: enable concurrent_sched_scan (ANDROID)
58a8af2 Allow concurrent normal scan and sched scan (UPSTREAM)
022c2f9 Avoid normal scans before sched scan if max_scan_ssids=1 (UPSTREAM)
a54d554 Disable p2p on wlan0 (JB)
82a982e P2P: Allow P2P functionality to be disabled per interface
e62ecda Revert "Add P2P IEs to probe requests only when in P2P (UPSTREAM)"
25dec55 P2P: speed up scans when connecting to persistent GO (UPSTREAM)
597e897 wpa_s: fix bss selection on identical SSIDs with WEP+AES/TKIP
0613a96 Add delimiter for bss command
fd831be P2P: cancel action frame offchan wait after recv go neg conf
abcd165 Merge commit 'ol_r8.a4.04' into d-jb-release
ba611a1 P2P: Don't delete group on non P2P interfaces (UPSTREAM)
7b2121a android: wpa_s template: disassoc on low ack by default (ANDROID)
a9c73cb P2P: block find if P2P GO or CLI are active (INTERNAL)
67bd4fc Revisit "nl80211: dummy DRIVER SETBAND handler"
4ecf514 wpa_s: handle channel conflicts on GO+STA shared interface
a4b1942 nl80211: dummy DRIVER SETBAND handler
4e69322 P2P: correct p2p_mult_chan operation (SQUASH)
326e560 android: wpa_s template: allow p2p multi channel operation (ANDROID)
61d59ea P2P: add conf param to prefer p2p multi channel
6fdeed2 P2P: fix oper channel selection (SQUASH)
82cd40e P2P: don't handle concurrency conflicts in multi-chan mode (ANDROID)
761368a Merge commit 'ol_R5.SP3.01' into d-jb-release
846a11d wpa_supplicant: template conf file update
38c89c9 Merge commit 'ol_r8.a4.02' into d-jb-release
9c03c3c nl80211_copy: update from latest 12xx drv (INTERNAL)
fae6f45 nl80211: add channel switch ability to AP & GO (INTERNAL)
ff0a677 hostap: add channel switch ability to AP & GO (INTERNAL)
7b65de1 hostapd: implement channel switch request drv ops (INTERNAL)
7973c9e nl80211: make unicast RX filter always match STA iface mac (ANDROID)
d4ae515 nl80211: reconfigure RX filters whenever a new interface is added (ANDROID)
5d3dfd2 nl80211: support configuring RX filters dynamically (ANDROID)
29657cc nl80211: make rx filters config global (ANDROID)
7eaeff4 nl80211: Remove driver specific commands not used in JB (JB)
78fd69a nl80211: Remove driver command DROPBCAST (ANDROID)
c820dd2 Make copies basic_rates list more useful
58a188a P2P: prefer operating channels where HT40 is possible
66b8140 P2P: always re-select oper channel if not hard coded
886a589 android: wpa_s template: allow HT40 GO by default (ANDROID)
0e1be19 P2P: add a conf parameter to start a GO as HT40 if allowed
c811c2a P2P: Use larger GO config timeout if HT40 is used
d6800fc P2P: Add optional "ht40" argument for p2p_connect
989a796 P2P: Enable 40 MHz support for autonomous P2P group addition
6fe0d96 P2P: Move channel validation into a separate function
7a9961a Supply the connection scan results to bgscan after init
d8833b1 Revert "Supply the connection scan results to bgscan after init"
fd00760 Remove default ACM=1 from AC_VO and AC_VI
a14ea01 AP: configure basic rates from iface and not conf

   * external/xmp_toolkit
f12f744 Submitting the Java XMPCore version currently in google3/third_party. Difference: Removed docs, BUILD, build.xml, .project, .classpath
3960586 Initial empty repository

   * external/yaffs2
f58e662 Remove superfluous eng tag on host binary. This fixes the build warning spam.
4aef4ad Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/yaffs2 into mr1-staging

   * external/zlib
0434f39 Fix broken symlinks
cbb322c Upgrade to zlib 1.2.8.
5fe9a3f Separate the Android build stuff from the upstream zlib stuff.
b481bdc Remove usage of LOCAL_NDK_VERSION etc
c7b5f21 zlib: revert x86/adler32.c to b42095f4f1
be282a7 zlib: Update to version on adler32/slhash repo as of Aug 13, 2012

   * frameworks/av
c6d665d camera: Fix preview on SEMC msm7x30 devices
8f94116 Add LG camera HAL parameters
abf3ce3 Add some Samsung camera color effects
1f48f3c Merge "Camera: Add more htc parameters" into cm-10.1
f028083 Fix includes for media-caf
78e8d9f libstagefright: [Reworked] Fix incorrectness nPortIndex value for QueryCodec
01d0bd2 audioflinger: remove redundand ifdef
ffa1b64 Camera: Add more htc parameters
55825a6 camera: add more htc parameters
03fdfde libstagefright: Fix a video lag bug after audio reached EOS.
c58721c libstagefright: fix indefinate loop in QueryCodec
43b58a4 Revert "libstagefright: Fix incorrectness nPortIndex value for QueryCodec"
1216ed8 Squashed commit of A/V changes from CodeAurora
eaa35b4 Merge "libstagefright: support for disabling buffer metadata" into cm-10.1
3da4463 libstagefright: support for disabling buffer metadata
c6cade7 Noise will be heard if audio sample rate not matched with audio track
0dcf5b3 Revert "frameworks/av: Add metadata mode changes to LPAPlayer"
ae57fbc frameworks/av: Add metadata mode changes to LPAPlayer
6915a05 camera: fixup htc params
77fa2ca [WIP]: camera: add parameters for htc cameras
6940b45 camera: Don't segfault if we get a NULL parameter
8589aa8 camera: Add a few missing legacy camera params.
ea33819 Add camera parameters for htc evo 3D. (1/2)
e411d62 libmedia: Add ICS AudioStreamType constructor
0bbd9e8 OMXCodec: Re-implement requires-flush-before-shutdown quirk
563e6d4 Revert "audioflinger: apply volume on direct track when track is active"
0a73ca4 Camera parameters for Samsung's qcom based legacy devices
ff2064e Camera: QCOM legacy definitions,HTC cam switch,NO_UPDATE_PREVIEW
203e28c libstagefright: Squashed audio fixes from CodeAurora
ba8b022 Silence error when DASH player isn't present
bcf0517 MediaScanner: Ignore dirs with .noscanandnomtp
a35c8f5 qcom-fm: audio: add support for FM feature
7200552 audio: Subsystem Restart changes
ab5138f libstagefright: Stop the logspam from LPAPlayer
9a814ad libstagefright: Fix incorrectness nPortIndex value for QueryCodec                 The query index is wrong, it will make a death loop in my ME722 when get resource thumbnail for MPEG4 video.
9be07ef libstagefright: Squashed commit of LPA/tunnel updates from CAF
1bf291a libstagefright: Check for duration > 0 to avoid DivideByZero crash
390e2b1 audioflinger: Fix to set correct volume in Tunnel playback
e4a52e7 libstagefright: Add support for frame-by-frame mode
63614c1 ACodec: Support for dynamic port reconfig
739845f libmediaplayerservice: Add new player for DASH
520ba65 audio: apply volume on DirectOutput streams
74f0b6d libstagefright: Adjustment for TunnelPlayer buffer size
125cfa7 Merge "fmradio: use caf naming" into cm-10.1
8194441 fmradio: use caf naming
001a7b8 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/av into 1.1
d852697 stagefright: Fix tunnel mode ifdefs
0320f8a Merge "Fix mako build." into cm-10.1
a5f28ce Fix mako build.
0db8a19 Revert "libstagefright: Convert mono to stereo for LPA clips"
12170a1 Squashed commit of updates from CodeAurora
4b47852 Camera: Enable QC Camera feature set.
69d8d46 FM Radio: Add support for FM Radio in Android
95dc7fa Video Encoder: Enable Ducati h264 encoder profile change
6d624da [3/3] libstagefright/videoeditor: Allow custom DOMX source instead of Google DOMX default
d7a251d libstagefright: Collection of fixes for TunnelPlayer
391bf29 frameworks/av : Playing AAC and MP3 clips using LPA.
8001424 camera: add cityid parameter and getInt64 stub for t0lte camera hal
21f546d Merge "Make an exception for MR0_AUDIO_BLOB in loadHwModule_l" into cm-10.1
6a2d777 Make an exception for MR0_AUDIO_BLOB in loadHwModule_l
c483bdb libmedia: implement samsungs isSeparatedStream, built audioparameter
e0df2e7 audioflinger: Allow mixed use of JB A2DP HALs and ICS policy
4c25e5c Fix the build on non-QCOM
deb5d8a Fix typo
9ae1649 camera: add power mode support
c21437d Merge "Fix log spam: Failed to open libwvm.so" into cm-10.1
c21b936 stagefright: add support for samsung proprietary omx
8143dbc Merge "exynos4:  Part of Netflix fix" into cm-10.1
ab11255 exynos4:  Part of Netflix fix
d54fa82 stagefright: OMXCodec: Re-enable OMX.TI.Video.encoder's quirks
2fa0f79 Squashed commit of updates from CodeAurora
00de490 Fix log spam: Failed to open libwvm.so
cf09539 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/av into aosp
9da4ae8 lpaplayer: Shush the verbose logging
d920337 camera: add ISO3200 and ISO6400
3a05365 Squashed commit of audio changes from CodeAurora
9734332 Fix potential NULL pointer deference in ToneGenerator destructor
5b3f5c5 libstagefright: Add support to seek to zero
90d6cf7 WifiDisplay: Add an HDCP toggle
b83e8c4 camera: Ignore CAF_RESTART callbacks
87dc005 Allow JB_MR0 Audio prebuilts to load
24fbad8 Merge "libmedia: add pre jb-4.2.1 signature for AudioSystem::getDeviceConnectionState" into mr1-staging
f0ff908 Logging to investigate a crash
33ce459 libstagefright: exynos4: set proper eColorFormat
bfd1c91 Camera: Qcom parameters partial rebase
4e53507 omx: exynos4: bring inline with jellybean
a479699 libmedia: add pre jb-4.2.1 signature for AudioSystem::getDeviceConnectionState
16be9b2 exynos4: libstragefright: add support for samsung colorformat/omx/mfc
47c1a5f Bug fix for the MediaPlayer::prepare() api.
5dea84c Fix log spam
b64def9 Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into jb-mr1.1-dev
e5aed03 Enable retransmission of UDP packets in case we want to use it
5131d12 [wfd] Support a low(er) power state by triggering PAUSE/RESUME.
79c56d3 Merge "Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display" into jb-mr1.1-dev
13e8a0e Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
0dbe5a9 Added optional intra macroblock refresh support for encoding
b7c8e91 Add support for HLS playlists of type 'event'.
41829f3 Merge "New VHQ resampler" into jb-mr1.1-dev
9bcb476 New VHQ resampler
001573b mediaserver: instantiate SecTVOutService for samsung tvout
dcab260 camera: add iso parameter
2eec3d3 camera: add parameters for samsung cameras
aa9e3e0 Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !null
aa01a15 CameraService: Add compatibility for OMAP ICS blobs
a6c026e Camera Service: Change max number of cameras to 3
4392662 libmedia: Add ICS audiotrack constructor
864a653 libmedia: Add ICS constructor for getOutput
a58dabe Add support for ICS audio blobs
d983364 Static AudioTrack plays twice initially
f093724 Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev
4471e47 Properly signal an error if codec configuration goes wrong.
0224bf1 Various improvements of wifi display code
78b012f Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
1c6833a Ignore SIGPIPE during write() to broken pipe
f5037ad merge in jb-mr1-release history after reset to jb-mr1-dev
9607696 Make video encoders' bitrate mode (constant, variable, ...) configurable
006ceac merge in jb-mr1-release history after reset to jb-mr1-dev
90a9205 Various tweaks to wfd
090e1b3 merge in jb-mr1-release history after reset to jb-mr1-dev
2295ce2 Increase bitrate now that other issues have been resolved.
c0d3ce2 merge in jb-mr1-release history after reset to jb-mr1-dev
e815552 Disable silence suppression (causes issues with dongles).
13ae899 merge in jb-mr1-release history after reset to jb-mr1-dev
b8d6efb Camera2: Don't hold locks while waiting to sync.
a183a3b merge in jb-mr1-release history after reset to jb-mr1-dev
ac1a450 Merge "Don't attempt to seek audio and video separately." into jb-mr1-dev
32f5c03 merge in jb-mr1-release history after reset to jb-mr1-dev
14744c0 Don't attempt to seek audio and video separately.
6ccc3c3 Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
43b7ac6 Camera2: Increase mode update timeout.
5f6f5b7 Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
b1eb1a0 stagefright: discard audio at start of capture
c4640c9 Increase allowed number of VHQ resamplers to 3
389572a merge in jb-mr1-release history after reset to jb-mr1-dev
e384d75 Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
0328ec0 WFD use of HDCP is now optional.
61ea117 Fix a typo that caused the high quality resampler to produce garbage
ca890f5 merge in jb-mr1-release history after reset to jb-mr1-dev
c3ed4a1 Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
9e760d6 Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
5127deb merge in jb-mr1-release history after reset to jb-mr1-dev
347f354 AAC DRC reference level for mobile is -16dB
3c9e53c Merge "Fix valgrind issues" into jb-mr1-dev
291f824 Remove active track when thread goes to standby
eba1b4d merge in jb-mr1-release history after reset to jb-mr1-dev
f1945f0 Camera2: Fix potential deadlock
ccd0843 Added some extra failure logging messages
a4fe9a1 Fix valgrind issues
7981764 merge in jb-mr1-release history after reset to jb-mr1-dev
a21e5de merge in jb-mr1-release history after reset to jb-mr1-dev
ecfbc95 Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
ac0cd56 Camera2: Improve quirks focusing behavior.
bbe11e4 Merge "Fix track estimation for presentation complete" into jb-mr1-dev
a045dca Fix track estimation for presentation complete
5471732 Camera2: Don't touch frame counter on output frames.
d6cc4a6 Camera2: When focus is already locked in CAF mode, do not trigger HAL.
1b59ac5 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
fd2dee0 merge in jb-mr1-release history after reset to jb-mr1-dev
b4a5526 Fix some missing checks against missing codecs
e21ee7c merge in jb-mr1-factory-release history after reset to jb-mr1-dev
100a889 merge in jb-mr1-release history after reset to jb-mr1-dev
a14be59 Camera2: Don't error out of startPreview when already recording.
7e2c0a1 Merge "Support querying active record sources" into jb-mr1-dev
907e565 Camera2: Don't let unlocks happen during recording.
a717665 merge in jb-mr1-release history after reset to jb-mr1-dev
55f6c9d Camera2: Do not set auto-white-balance regions from metering regions.
d708603 Support querying active record sources
c037920 Camera: Limit valid caller PIDs for camera clients.
4eca45e merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ed79d16 merge in jb-mr1-release history after reset to jb-mr1-dev
2b0db6a Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
73125af Merge "Switch audio mode based on dongle's capabilities" into jb-mr1-dev
da2c892 merge in jb-mr1-release history after reset to jb-mr1-dev
d243c04 Switch audio mode based on dongle's capabilities
9bd8a1d merge in jb-mr1-release history after reset to jb-mr1-dev
dca0ac2 Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
44f120f Camera: Clear Hardware device pointer when initialization fails
3d84d38 Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
a3ee047 Camera2: Fix uninitialized parameters.
d016cf5 Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
350d3b6 Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
5f0714e Camera2: Call onAutoFocus immediately for fixed-focus cameras
b2187fc merge in jb-mr1-release history after reset to jb-mr1-dev
2458d48 Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
1e6ccd5 Camera2: Move non-ZSL shutter sound firing to be later.
bac4a4a audio policy: deprecate ro.camera.sound.forced
036bc3e Camera2: Always disconnect in the client destructor
82edd54 Camera2: isSmoothZoomSupported should return FALSE
6f85460 Camera2: Set default flash mode to FLASH_OFF
4c9aeb2 Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
b8f0090 Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev
709bc10 Camera2: Fix Parameters#setZoom off by 1 validation error
e18c1cc Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
d5087f9 Camera2: On stopping preview, wait until captures are completed.
7d55da3 merge in jb-mr1-release history after reset to jb-mr1-dev
c882399 audioflinger/resampler: add build source for libaudio-resampler
16cd995 merge in jb-mr1-release history after reset to jb-mr1-dev
4d410ed Camera2: Fix off-by-one error in ZSL selection.
7d2a4aa Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
f6e09d2 Camera2: Unconditionally shut down streams on disconnect.
7373cbe Camera2: Fix metering regions to take into account the current zoom/crop region
ef33212 Camera2: Don't promote weak IBinder ptrs to strong ones
af3d288 Camera2: Change policy for calculating previewFpsRange from previewFps
becb0bc Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev
294d0ec Camera2: Don't promote weak IBinder ptrs to strong ones
38f1a2c merge in jb-mr1-release history after reset to jb-mr1-dev
c10ea77 Camera2: Fix deadlock while zooming during record
95069fe Camera2: Use the triggerAfWithAuto quirk
4865c52 Camera2: Synchronize mode changes and triggers
9942f62 Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev
1f915a8 Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev
ec77108 Camera2: Include JPEG settings in ZSL requests.
e7bd24a Optionally emit LPCM audio instead of using AAC in wifi display code
7ffab29 Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev
f66cc52 Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev
ac60205 Integrate improved coefficient sinc resampler: VHQ
8f0e263 merge in jb-mr1-release history after reset to jb-mr1-dev
d69fd4d Merge "Enable hdcp for WiFi display" into jb-mr1-dev
04273cb Camera2: Fix deadlock while zooming during record
d6cc864 Camera2: Properly update FPS range when FPS is set.
0c978a8 Drop video bitrate to 2.5mbps.
ab99f04 Better power savings with wifi display code.
0c19164 Increase polling frequency again temporarily to fix A/V issues
ce953ce Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev
260f267 Camera2: Properly update FPS range when FPS is set.
c206305 Camera2: Fix prematurely clearing stream request
16c0905 Enable hdcp for WiFi display
b3e97b3 Camera2: Fix trying to release HAL stream twice
ecf17e8 Camera2: Handle client processes dying by closing camera resources
22d58d3 Camera2: Don't change state when reconnect is called
9f9d7de Merge "Drop video bitrate to 2.5mbps." into jb-mr1-dev
1bac897 Merge "Camera2: Use ZSL format quirk." into jb-mr1-dev
9f71aed Drop video bitrate to 2.5mbps.
4401091 Merge "Better power savings with wifi display code." into jb-mr1-dev
575a536 Better power savings with wifi display code.
3a555c1 Merge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev
8d16bbc Increase polling frequency again temporarily to fix A/V issues
9e46cc0 merge in jb-mr1-release history after reset to jb-mr1-dev
e382ee2 Camera2: Use ZSL format quirk.
ee40d83 Merge "Camera2: Use scene mode override parameter" into jb-mr1-dev
2808b59 Merge "Bug 7170947 Configure AAC decoder for mobile DRC settings" into jb-mr1-dev
4213e9d Bug 7170947 Configure AAC decoder for mobile DRC settings
8a42dd8 Camera2: Use scene mode override parameter
47aa9c4 Merge "Enable silence detection and don't driver the audio encoder" into jb-mr1-dev
805b3ae Merge "Now back to 30fps, suspend updates if surface flinger didn't send us" into jb-mr1-dev
f5aa7aa Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
16461dc Merge "Increase converter polling interval." into jb-mr1-dev
f1b9504 Merge "Take advantage of the hardware encoder's ability to prepend SPS/PPS" into jb-mr1-dev
cf2604f Enable silence detection and don't driver the audio encoder
4a8b9a2 Now back to 30fps, suspend updates if surface flinger didn't send us
887070d More power savings: No need to keep a history of outgoing packets
0389cc0 Fix video continuity
21daec5 Increase converter polling interval.
c6920df Take advantage of the hardware encoder's ability to prepend SPS/PPS
ad9ffe6 merge in jb-mr1-release history after reset to jb-mr1-dev
bd71019 Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
ee17866 Use incremental updates sent by surface flinger
1c730d3 Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
1a0d167 Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
32ca2bf Perform an orderly shutdown if possible, force disconnect if necessary
27f706e Remove double negatives from SurfaceMediaSource
7352fca Make sure we still handle shutdown-related message even if we're
af5dd77 ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
0868dea Optionally have SurfaceMediaSource return absolute timestamps
0cb4771 Inform DisplayManager that we're running over a secure channel (HDCP)
a3fafcb [WVDRM] Fix for stuttering on low bandwidth
ad0d97c Perform an orderly shutdown if possible, force disconnect if necessary
0e1d716 Remove double negatives from SurfaceMediaSource
6360758 Make sure we still handle shutdown-related message even if we're
458923c merge in jb-mr1-release history after reset to jb-mr1-dev
087dd8e Disable audio watchdog
4769f0b Merge "Even cleaner shutdown." into jb-mr1-dev
7165491 Merge "bug 7253033 clean up before closing an output" into jb-mr1-dev
d13df24 Merge "Enable write side of MonoPipe to be shutdown" into jb-mr1-dev
2bfc6b4 bug 7253033 clean up before closing an output
a317c9d merge in jb-mr1-release history after reset to jb-mr1-dev
73bbd1f Camera2: Refactor preview/recording management to separate class.
0517e30 DO NOT MERGE: Remove experimental parameters for burst mode
7724581 Even cleaner shutdown.
003d9f7 Enable write side of MonoPipe to be shutdown
bbe96f0 Fix shutdown if HDCP was never instantiated.
23f7401 Merge "Camera2: Use new JPEG transport header" into jb-mr1-dev
3a0ef0d Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.
e646b2d Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev
24dfc95 Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
96fc6cc Various improvements to a cleaner shutdown of the wifi display connection.
a7c4c30 merge in jb-mr1-release history after reset to jb-mr1-dev
0fa1e76 Camera2: Use new JPEG transport header
d0cec0c Camera2: Only _some_ FPS values in the old API are scaled.
12d3e88 Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev
de799a7 wfd_presentation_url should not include the port number according to wfd specs
ecc8db5 Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
5cfd237 Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
ef7d379 Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
c9d7e4d Camera2: Fix FPS value scaling between HAL2 and API
f58cac4 Tune WFD audio bitrate (did some listening tests). Bug: 7241844
e399acc Prepend SPS/PPS manually before encryption in HDCP mode. This is
e3c7774 merge in jb-mr1-release history after reset to jb-mr1-dev
77449ad Camera2: Re-entering preview state on v2 Device
6d6a4d3 Merge changes Ia4414241,I34f5d36a into jb-mr1-dev
76b1116 audioflinger: use resample coefficients from audio-resampler library.
12bff5d audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
ee93c8c Tune iframe interval to 1sec. Bug: 7241844
72ff590 720p24 i-frames every 2 secs.
5895c5d Merge "Make sure we only release the HDCP module once shutdown has completed." into jb-mr1-dev
eb11600 Make sure we only release the HDCP module once shutdown has completed.
eb8a42b Camera2: Fix JPEG Transport Header offset
44b175c Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." into jb-mr1-dev
6283af5 Merge "Logic to include HDCP specific PES extra header data was backwards." into jb-mr1-dev
019aaba Logic to include HDCP specific PES extra header data was backwards.
df4ddeb Fix shutdown and eliminate those annoying "failed to post..." logs.
842c5d9 Revert "Don't wait for presentation complete if terminated"
49aa493 merge in jb-mr1-release history after reset to jb-mr1-dev
cc0f1cf Implement android.media.AudioManager.getProperty()
d9aa7b4 Merge "Better transport stream timestamp handling." into jb-mr1-dev
c910b7a Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-dev
28e17ed Better transport stream timestamp handling.
c7d9afd Camera2: Make sure to clean out reprocess streams on shutdown as well.
0659dba merge in jb-mr1-release history after reset to jb-mr1-dev
4bb8118 Camera2: Debug and logging fixes.
b6ba2fd audioflinger: improve record start and thread exit
92f655f Add some more logging, reduce startup delay to 1 sec.
4968246 merge in jb-mr1-release history after reset to jb-mr1-dev
2a865ad Tune video bitrate to 5 mbps.
9a2e4fa Merge "Camera2: Emit ShutterCallback/RawCallback events after takePicture" into jb-mr1-dev
aae1de9 Merge "Camera2: Fix cropRegion sometimes exceeding the sensor array size" into jb-mr1-dev
8d452f1 Merge "Check clock_gettime(CLOCK_MONOTONIC) for failure" into jb-mr1-dev
1b65ae9 Camera2: Emit ShutterCallback/RawCallback events after takePicture
018d228 Camera2: Fix cropRegion sometimes exceeding the sensor array size
80b3273 Check clock_gettime(CLOCK_MONOTONIC) for failure
c0c3b29 Merge "fix end of track presentation on suspended output" into jb-mr1-dev
5378702 Merge "Camera2: Truncate JPEG images" into jb-mr1-dev
ea4bbfd Attempt an orderly shutdown of the wifi display connection if possible.
a6b4c40 Camera2: Truncate JPEG images
4632354 merge in jb-mr1-release history after reset to jb-mr1-dev
1afc26d fix end of track presentation on suspended output
94a68ec Merge "Bug fix: MediaPlayer's deselectTrack() for subtitle." into jb-mr1-dev
a2161f8 merge in jb-mr1-release history after reset to jb-mr1-dev
df2bc29 Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-dev
6b367f2 Camera2: Don't use ZSL when flash is on force fire mode.
75dce94 Merge "Camera2: Emit FaceDetection events for all except repeating 0-face frames" into jb-mr1-dev
e7f256a Camera2: Emit FaceDetection events for all except repeating 0-face frames
207e185 Remove legacy code and APIs in wifi display related code.
9565d86 merge in jb-mr1-release history after reset to jb-mr1-dev
086f958 Tune video bitrate to 2.5 MBPS.
6cdbe66 Camera2: Clean up startup/shutdown sequences.
437aa4c Merge "Allow DRM client to pass the FD of an open file to the DRM server." into jb-mr1-dev
8a6f0b1 Merge "Code to support RTP retransmission according to rfc4585, rfc4588" into jb-mr1-dev
7504122 Merge "Camera2: Clean up startup/shutdown sequences." into jb-mr1-dev
4386b7c Merge "Camera2: Erase ZSL queue after each use." into jb-mr1-dev
98bb82d Camera2: Clean up startup/shutdown sequences.
efd9c63 Code to support RTP retransmission according to rfc4585, rfc4588
0abeaca Allow DRM client to pass the FD of an open file to the DRM server.
aa05a27 Merge "Camera2: State must be STOPPED before JPEG callback is fired." into jb-mr1-dev
768cf09 Camera2: Erase ZSL queue after each use.
2761d21 Merge "Instantiate HDCP module, add PES_private_data for encrypted streams." into jb-mr1-dev
b88516c Merge "HDCP module binderized" into jb-mr1-dev
fe580e5 Camera2: State must be STOPPED before JPEG callback is fired.
23580bb Bug fix: MediaPlayer's deselectTrack() for subtitle.
da1c5c1 Camera2: ZSL captures should also make some noise.
c553118 Camera2: Increase max timeout for the precapture sequence.
b8c7bd4 Instantiate HDCP module, add PES_private_data for encrypted streams.
efbb781 HDCP module binderized
6e81efd merge in jb-mr1-release history after reset to jb-mr1-dev
74e58c5 Merge "Camera2: Increase capture timeout." into jb-mr1-dev
1f266ef Camera2: Increase capture timeout.
2f93127 Camera2: Enable ZSL by default.
9c6ec82 Merge "Camera2: ZSL: Do regular capture if AE is not satisfied." into jb-mr1-dev
fe5054c Merge "Fix THD with max user EQ preset volume again" into jb-mr1-dev
97b38a8 Camera2: ZSL: Do regular capture if AE is not satisfied.
0d61a78 Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-dev
1c2b8d9 merge in jb-mr1-release history after reset to jb-mr1-dev
c5cd686 Fix THD with max user EQ preset volume again
663c2cd Camera2: Don't be bothered by lack of faces.
a9f8d04 Camera2: Filter out faces with 0 confidence.
d14de47 Camera2: Change face detect/scene mode priority.
c92bed3 Now we only support a single client connection
bd08e2f Support for RTP/RTCP traffic over TCP sockets in wifi display code.
874a461 Merge "Camera2: Don't play shutter sound when doing a video snapshot" into jb-mr1-dev
0856bed merge in jb-mr1-release history after reset to jb-mr1-dev
efb039e Camera2: Don't play shutter sound when doing a video snapshot
376074e Fixed a native crash due to deref of a NULL pointer
aaf9de4 merge in jb-mr1-release history after reset to jb-mr1-dev
b845c6b Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""" into jb-mr1-dev
beb1416 Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""
e44e90c Merge "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."" into jb-mr1-dev
f54b145 Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."
dcd76da Merge "Make a small correction in terms of GOP structure in the recorded video" into jb-mr1-dev
cb66d22 Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme." into jb-mr1-dev
08654f9 Make a small correction in terms of GOP structure in the recorded video
2637cb1 Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
830ed8b merge in jb-mr1-release history after reset to jb-mr1-dev
d8421c5 Merge "Support IDR requests in wifi display, MediaCodec and ACodec." into jb-mr1-dev
896adcd audioflinger: send priority request from a thread
496238c Support IDR requests in wifi display, MediaCodec and ACodec.
8a30166 Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.
ae254b0 Better video bandwidth utilization by not lying about the frame rate.
999e8ef Various improvements to cleanly shutdown a wfd session.
4d41238 Audio and video bitrate are now configurable through system properties
5960ae0 Use proper number of video buffers to be acquired simultaneously from
be29bbb Throttle SurfaceMediaSource.
4362f53 Handle audio HAL returning 0 bytes in record thread
6646608 Merge "Workaround for track recreation bug" into jb-mr1-dev
f4bca03 Merge "Don't deadlock on AudioRecord start when reads return 0" into jb-mr1-dev
dca3528 Better video bandwidth utilization by not lying about the frame rate.
a438123 Various improvements to cleanly shutdown a wfd session.
6701a44 Merge "Audio and video bitrate are now configurable through system properties" into jb-mr1-dev
d168b19 Merge "Use proper number of video buffers to be acquired simultaneously from" into jb-mr1-dev
44b59fd Audio and video bitrate are now configurable through system properties
5a832f8 Use proper number of video buffers to be acquired simultaneously from
00f4132 Throttle SurfaceMediaSource.
7f8e0e0 merge in jb-mr1-release history after reset to jb-mr1-dev
7343196 Workaround for track recreation bug
5276241 Don't deadlock on AudioRecord start when reads return 0
bdde5f8 Camera2: Fix ZSL bugs.
359cf1c am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
a923dd4 am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
1b0ae9e Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
e891a78 Merge "Various improvements to the wifi display implementation." into jb-mr1-dev
e195735 Various improvements to the wifi display implementation.
02f7a78 am fd07d616: am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
fd07d61 am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
fbe1cc9 Merge "Don't include <linux/socket.h> directly."
7bb813e merge in jb-mr1-release history after reset to jb-mr1-dev
e5167f8 Don't include <linux/socket.h> directly.
d067489 Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-dev
2552036 Merge "Camera2: Configure ZSL at the right time." into jb-mr1-dev
64d6c68 Merge "Add getError and setError to propagate error code from WVMMediaExtractor up to player." into jb-mr1-dev
6e4db89 Camera2: Use full pixel array for ZSL stream
b075252 Camera2: Configure ZSL at the right time.
b063cb6 Merge "Camera1: Fix enable shutter sound command error handling." into jb-mr1-dev
c5268e8 Camera1: Fix enable shutter sound command error handling.
831c713 Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev
8a74c9b Add getError and setError to propagate error code from WVMMediaExtractor up to player.
498a274 Merge "Communicate audio session ID to downmixer" into jb-mr1-dev
37171b9 am ed757e97: am 290ac693: Merge "Stop building the unused host libmtp static library."
ed757e9 am 290ac693: Merge "Stop building the unused host libmtp static library."
290ac69 Merge "Stop building the unused host libmtp static library."
e0e2e98 Stop building the unused host libmtp static library.
8a9e791 Merge "Limit maximum equalizer gain." into jb-mr1-dev
c690f5c merge in jb-mr1-release history after reset to jb-mr1-dev
fe3156e Communicate audio session ID to downmixer
ac19cac Merge "Camera2: Temporarily stop pre-allocation of recording stream." into jb-mr1-dev
ba5e650 Merge "Camera2: Clean up the right streams." into jb-mr1-dev
1b6c677 Limit maximum equalizer gain.
1747130 Merge "audio effects: no audio preprocessing by default" into jb-mr1-dev
199862e audio effects: no audio preprocessing by default
8fa80e3 Allow OMXCodec to specify an output color format for OMX decoder component
14fe42d Camera2: Temporarily stop pre-allocation of recording stream.
130c255 Camera2: Sanity check inputs better.
47512a7 Camera2: Clean up the right streams.
c61b2aa Camera: Add HDR scene mode constants.
6676584 Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev
e0f8517 am f755a506: am d81be6d6: Merge "aacenc: Mark some global arrays const"
1646a0f Enable audio streaming to a wifi display. Remove startup delay hack.
f755a50 am d81be6d6: Merge "aacenc: Mark some global arrays const"
d81be6d Merge "aacenc: Mark some global arrays const"
61c0cc6 Camera2: Use face priority scene mode when face detect is enabled.
4a02cc8 Camera2: Sanity check inputs better.
e242098 merge in jb-mr1-release history after reset to jb-mr1-dev
fd48021 am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
e7c992c am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
5abc91d Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
e8057dd Fix libmedia and libstagefright to get expat header files from the approved location.
6ce3d19 Merge "Add outlier statistics for fast mixer cycle times" into jb-mr1-dev
888f63b Fix buffer size issue for multichannel HE-AAC
85b7ec6 merge in jb-mr1-release history after reset to jb-mr1-dev
9538ab8 aacenc: Mark some global arrays const
ef49e2f Revert max buffers change.
b019250 Add a permission for controlling wifi display.
5e54e08 Merge "Fix headroom management in equalizer" into jb-mr1-dev
10894e5 Fix build
e538206 Camera2: Add a burst mode skeleton.
7ac7832 Merge "Less verbose logging, lots of references." into jb-mr1-dev
72f6aea Less verbose logging, lots of references.
f6c7a40 Fix headroom management in equalizer
525098d Merge "Make wfd code work with both old and new dongles." into jb-mr1-dev
7977e85 Make wfd code work with both old and new dongles.
8539664 Merge "audioflinger: changes for new audio devices enums" into jb-mr1-dev
1adbb8c Merge "Fix iTunSMPB parsing for AAC tracks encoded with Nero" into jb-mr1-dev
8c7d147 Fix iTunSMPB parsing for AAC tracks encoded with Nero
1ab212c Add outlier statistics for fast mixer cycle times
1c7ff02 Merge "Camera2: Increase zoom steps." into jb-mr1-dev
5a4f93e Camera2: Use the recordingHint parameter.
cf70d34 Camera2: Delete all streams and stop all threads during shutdown.
2d1ef13 Merge "Camera2: Play shutter and recording sounds." into jb-mr1-dev
f1c04f9 audioflinger: changes for new audio devices enums
261fd21 Merge "AudioRecord: Fix minimum frame count calculation." into jb-mr1-dev
609acc0 Camera2: Play shutter and recording sounds.
161fac8 Camera2: Increase zoom steps.
d06ab14 Merge "AudioFlinger: send audio source to audio effects" into jb-mr1-dev
2e5f22e Add a small hook to support gapless in AAH.
c56857b Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev
6f744d7 AudioRecord: Fix minimum frame count calculation.
96150cf Camera2: Move locked states out of AE/AWB mode
da6665c Camera2: Basic ZSL and precapture trigger support.
a39ad61 Fix calculations for an obscure combo of MPEG audio options.
49c74da Merge "Update remote display API." into jb-mr1-dev
d047ef6 merge in jb-mr1-release history after reset to jb-mr1-dev
e148910 Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev
3a6b97e Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev
74262b5 Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev
455d02e Update remote display API.
6638f3b Fix an issue where the "mFrameCount" field was accessed without its containing object
9c6cb7a Merge "Fragmented mp4 extractor" into jb-mr1-dev
5699712 Fragmented mp4 extractor
0b73d47 Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.
e104596 Implement remote display service stubs.
6c75ad2 Merge "Configure the SurfaceMediaSource to emit the same number of buffers" into jb-mr1-dev
f0807b3 merge in jb-mr1-release history after reset to jb-mr1-dev
06096f9 To make mimetype for WAV file consistent over SF.
5c5f8d9 To support .mxmf which is specified in Android CDD.
0d268a3 Add setVideoScalingMode support to NuPlayer
66e72bc Configure the SurfaceMediaSource to emit the same number of buffers
fbe9d81 Support for acting as a wifi display sink.
7323115 Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
dafd294 merge in jb-mr1-release history after reset to jb-mr1-dev
57b2dd1 AudioFlinger: send audio source to audio effects
3123803 Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev
cb1f88c Move fragmented mp4 parser to libstagefright
cd89e80 Merge "Added an additional virtual method IStreamSource::flags()." into jb-mr1-dev
892020e Merge "Special mode for ESQueue that allows for earlier dequeuing of access units" into jb-mr1-dev
87f2a55 Improvements to our MPEG2 Transport Stream parser
f56afa4 Special mode for ESQueue that allows for earlier dequeuing of access units
da7ff53 Added an additional virtual method IStreamSource::flags().
6135667 Merge "Add support for mpeg2 transport streams to the RTSP implementation." into jb-mr1-dev
092fe44 Camera: set vendor_ops on camera metadata.
6bcdca0 am 371e1217: (-s ours) am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
371e121 am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
8b15256 Merge "OMXCodec: enhance error handling of OMX IL client"
cfaeeec Add support for mpeg2 transport streams to the RTSP implementation.
9ed644a Merge "Documentation on pipes" into jb-mr1-dev
b3428f7 Merge "Update audio comments" into jb-mr1-dev
dc91c88 Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." into jb-mr1-dev
520c3c7 OMXCodec: enhance error handling of OMX IL client
64d7b68 Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev
b677701 Implement the source->sink(!) keep alive the wfd specs mandate...
c3ae93f Update audio comments
ba8da29 Documentation on pipes
c9936c7 Merge "Remove dead code" into jb-mr1-dev
7aa2559 Remove dead code
5dcc2c9 Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev
b9cba9b Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev
bcf09f8 Only run the wifi display RTSP server on demand, and only on the wifi direct
3d26e89 Don't hard code the number of buffers for SurfaceMediaSource
cba53fb audio effects: fix bug in sample rate control.
23466a9 Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev
5f00501 Merge changes I7bef5694,Id38e2a52 into jb-mr1-dev
86b1961 Merge "Prepare for transmitting audio through AudioSource." into jb-mr1-dev
082830f Prepare for transmitting audio through AudioSource.
546436a Merge "Transmit frames at a higher frame rate for smoother updates, increase" into jb-mr1-dev
682d559 Merge "Optionally log the transport stream transmitted to the sink." into jb-mr1-dev
2dd4bdd Move libnbaio out of AudioFlinger
e05a679 Transmit frames at a higher frame rate for smoother updates, increase
f128dc5 Camera2: Require 2 JPEG thumbnail resolutions.
d86a688 Camera2: Move preview callback processing to its own thread.
ea0d51b Camera2: Move still capture processing to separate thread.
6524b7e Merge "Camera2: Factor out FrameProcessor." into jb-mr1-dev
774df0d Optionally log the transport stream transmitted to the sink.
09f2ca6 merge in jb-mr1-release history after reset to jb-mr1-dev
2f9a441 Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev
2dff0f6 Fix wifi display shutdown deadlock.
d8ee4e5 Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
d7bee3a Initial checkin of support for acting as a wifi display source
f147b72 Merge "Preliminary support for HDCP as a binder service for wifi display support." into jb-mr1-dev
1b19c9d Preliminary support for HDCP as a binder service for wifi display support.
0a24726 am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
55fb847 am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
b7b8de8 am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
ac41875 am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
8836f8e am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
bf30787 am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
0924dd8 am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
3f9e843 am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
5b15adf Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
735d1b9 Merge "avcenc: Don't erase the InputBufferInfo before reading info from it"
2aa37a7 Merge "recordvideo: Add an option for choosing software encoders"
9ce7435 Merge "recordvideo: Sleep while waiting for the encoding to finish"
f547a36 avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
e1e1e78 merge in jb-mr1-release history after reset to jb-mr1-dev
e61f13d avcenc: Don't erase the InputBufferInfo before reading info from it
02d1845 MPEG2TSWriter: Read more immediately if an empty buffer is received
1301a43 recordvideo: Sleep while waiting for the encoding to finish
d4483f3 recordvideo: Add an option for choosing software encoders

   * frameworks/base
618b2bd SystemUI: CA translations
3615c2c Merge "frameworks_base: CA translations" into cm-10.1
abb985f Merge "Fix Home/Menu/Back keys' unlock" into cm-10.1
f80133a frameworks_base: CA translations
a8fc994 Merge "am: Allow more hidden apps on devices with lots of RAM" into cm-10.1
aba2ab2 am: Allow more hidden apps on devices with lots of RAM
2d6c9bb Fix Home/Menu/Back keys' unlock
af15391 SystemUI: Fix missing context var
a92c2e6 SystemUI: Add ethernet network icon
28ae2a3 SystemUI & core: fixed FI translations
d549b36 Revert "SystemUI & core: FI translations"
d727d4c SystemUI & core: FI translations
33e2166 Merge "frameworks_base: Update Japanese translation" into cm-10.1
d544f65 Merge "android_os_SELinux : Use empty array to instead of NULL to avoid the DevicePolicyManagerService cannot start when the SELinux is disabled." into cm-10.1
7c1389d frameworks_base: Update Japanese translation
68a1c87 frameworks/base: Simplified Chinese Translations
b9ad594 Merge "Core+SystemUI: DA translation" into cm-10.1
1f66b28 Core: Update German translation
f0e7966 Core+SystemUI: DA translation
9f31f37 Merge "Show advanced reboot if using an insecure lock screen" into cm-10.1
162845a Core: NL translation
199dd03 Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1
ea13915 Merge "Improve notification shade collapse code." into cm-10.1
246a27b Merge "Frameworks/base: Update italian translation" into cm-10.1
eff15e1 Enable Estonian language
93b24b8 Merge "Base-Core: CS translation" into cm-10.1
8999a1a Frameworks : FR translation
bca35e2 Merge "frameworks_base: ES translations" into cm-10.1
46d787c Merge "Core: HU translation" into cm-10.1
45bb3c3 Merge "core/SystemUI: EL translations" into cm-10.1
d348715 Frameworks/base: Update italian translation
a37ddac BT: Fix memory leak when BT on & off done many times
a7ff852 android_os_SELinux : Use empty array to instead of NULL to avoid the DevicePolicyManagerService cannot start when the SELinux is disabled.
0153e67 Base-Core: CS translation
4ff298a Fix hungarian keyboard layout
ba6f1b7 android_os_FileUtils_getVolumeUUID: Fix the incorrect logical for call blkid_get_tag_value.     There are two problems in here.   1. For the function blkid_get_tag_value third parameter is should be the device, not the mount pointer, in the MediaPrivader.attachVolume, it will pass the mount path to call this function.   2. The UUID for device is hex, so call atoi is not right. I think call strtol is better than atoi.
07c4f05 Fix RIL_UNSOL_CDMA_PRL_CHANGED constant typo (1/2)
c9df086 Add support for Samsung extended AGPS
3307cd4 Add tile dimensions into snapshot and use it for setting tile rect
232fce4 core/SystemUI: EL translations
e7b43b6 Show advanced reboot if using an insecure lock screen
ef641f0 frameworks_base: ES translations
f9655e3 Core: HU translation
aa18a86 Merge "Frameworks_base: PT-BR translations" into cm-10.1
6801be4 Frameworks_base: PT-BR translations
b235f9f Merge "Frameworks : move custom strings to cm_strings.xml" into cm-10.1
4b5a935 Signal strength: add more checks to signal strength,
3dbc6ca Telephony: Consider EVDO ecio zero value as valid.
e1e571b Frameworks : move custom strings to cm_strings.xml
ba124a9 Allow device admin policy to override policy boolean state.
7abdd88 Fix SELinux.java doc errors
18f5453 Restore support for labeling non-system apps based on their certificate.
526e481 Drop "SE Android" from strings.
21a5771 Replace SEAndroid with SELinux.
1c6f7a8 Add data validation on seinfo labels.
62d90c6 Follow AOSP behavior for seinfo assignment.
c22f6e0 Save off the seinfo value with packages.list.
1f7f153 Bring install-time code inline with AOSP.
7e09296 Move seinfo and install-time changes to inside PMS.
c6767eb Change DPMS code to accommodate enforce states on boot.
a5dfcb4 Update location of policy files
81a5623 Proper security labeling of multi-user data directories.
2a091b4 Implement Device Admin API for MMAC
b00a063 Apply MMAC changes from master.
36d685c Simplify check during admin removal for whether to cleanup SELinux
7adb00f Remove SELinux additions from public API
ae74c84 Add APIs to allow Device Admins to change SELinux settings
88aeb65 Save off the seinfo value with packages.list.
e87ce9f Added SELinux enforcing status and booleans keys to secure system settings.
e6a3372 Add seinfo parsing to PackageManagerService.
8bf2351 Make notification-shade-collapse-after-dismiss behaviour configurable.
c233a5b Improve notification shade collapse code.
6c33ad3 Always prevent wake on home keypress when kl config does not contain WAKE
6e84c45 systemui: Add CONNECTIVITY_INTERNAL permission
b11c6c0 Framework base: Update italian translation
6c5dccf Merge "Base: CS translation" into cm-10.1
f59f419 Merge "Core: Update Polish translation" into cm-10.1
af38925 Merge "SystemUI: Update Polish translation" into cm-10.1
d29bdbd Core: Update Polish translation
17ab11b SystemUI: Update Polish translation
d9eefe3 Merge "Fix occasionally flickering music control widget." into cm-10.1
605a6be Revert "Auto-close if you swipe away the last notification."
780caff Fix occasionally flickering music control widget.
e5fd713 Merge "Always call out to KeyguardHostView when something in our state changes." into cm-10.1
12a5f6e Merge "Frameworks-base : FR translation" into cm-10.1
6394ccf Merge "Core: NL translation" into cm-10.1
a6028fb Merge "Fixes for clang: PackageInfo is a class, not a struct. String16 is contained in the android namespace. Do not namespace prefix it within the android namespace. Explicitly specify which std classes are necessary to prevent ambiguous type errors. (map, set)" into cm-10.1
6c8de14 Always call out to KeyguardHostView when something in our state changes.
c9141ca Merge "Also backup profiles file via backup manager." into cm-10.1
d029fe6 Merge "Add lockscreen rotation as an optional rotation setting (1/2)" into cm-10.1
f1ceb67 New Event: ACTION_NEW_OUTGOING_SMS
4de54dc Add lockscreen rotation as an optional rotation setting (1/2)
c2ef581 Fixes for clang: PackageInfo is a class, not a struct. String16 is contained in the android namespace. Do not namespace prefix it within the android namespace. Explicitly specify which std classes are necessary to prevent ambiguous type errors. (map, set)
416f0d4 Also backup profiles file via backup manager.
34b32f4 Merge "Fix requery behaviour of MemoryCursor." into cm-10.1
33c5bc4 Merge "FileUtils: add method to get UUID of a volume" into cm-10.1
57a9957 Frameworks-base : FR translation
102cf84 Merge "Make contacts app aware of blacklist being disabled (1/3)" into cm-10.1
d1ba11c Base: CS translation
46e3973 Merge "core: SK translation" into cm-10.1
97a929e Merge "frameworks_base: ES translations" into cm-10.1
2cc15fe Core: NL translation
8074d2b core: SK translation
26cb240 Merge "Core & SystemUI: HU translation" into cm-10.1
4575a51 Merge "Update German translation." into cm-10.1
3e8f1b8 Merge "Core: RU translation" into cm-10.1
c5eaec1 libdrm: fix bad strncpy / snprintf calls
3d843d6 Add a delimiter between scheme and host
77b2f42 Ensure install-during-restore is like install-then-restore
1fe5904 Validate restored file paths against their nominal domain
aafc56b Notification cancellation fixes: Permission should only allow cancellation of other app notifications, not enqueueing. Fix checkapi breakage.
3918246 frameworks_base: ES translations
fc94a47 core: PT-BR update translations
e86b4e3 Update German translation.
1700689 Fix requery behaviour of MemoryCursor.
691c3e6 Core: RU translation
25f6727 Core & SystemUI: HU translation
ffda8dd Merge "Add permission that allows cancelling notifications from other apps." into cm-10.1
41bec7b Add permission that allows cancelling notifications from other apps.
b9bab7f SystemUI: NL translations
2ce68c4 Frameworks-base : FR translation
fea6b43 Merge "Base: CS translation" into cm-10.1
1706eae Merge "Core: RU translation" into cm-10.1
d416bd0 Merge "Frameworks: privacy guard fix UI freeze" into cm-10.1
a48d4ed Merge "Profile: Filter on NETWORK_STATE_CHANGED instead of SUPPLICANT_STATE_CHANGED" into cm-10.1
12a6a98 Merge "Don't enable GPS if the requesting app is blacklisted." into cm-10.1
c22d460 Frameworks: privacy guard fix UI freeze
c254a29 Profile: Filter on NETWORK_STATE_CHANGED instead of SUPPLICANT_STATE_CHANGED
71e0843 Framework: AF Translations
0f166de Don't enable GPS if the requesting app is blacklisted.
cca622e Allow multiple emulated storages at the same time.
37a9afb Ignore null stylus gesture settings
8db50fe Clean up unnecessary backslashes
3047fd1 update SystemUI's proguard.flags
0a72bf6 Merge "Core: HU translation" into cm-10.1
da59bc3 NotificationManager : Fix security exception
fd58bc1 Merge "Don't consider input restricted when the lockscreen is disabled by an app." into cm-10.1
fcf0fd6 Merge "Add option to hide music controls in lockscreen." into cm-10.1
4e3a324 Merge "Add an option to allow a (subtle) notification vibration during calls." into cm-10.1
38b7a77 Merge "core: NL translation" into cm-10.1
b0f227c Add an option to allow a (subtle) notification vibration during calls.
00cc470 Merge "When DPM is updated while lock screen is inhibited, don't unconditionally enable lock screen." into cm-10.1
e79d05a Merge "Delay closing the notification area after swiping a little closer." into cm-10.1
7e31317 Merge "Send out USER_PRESENT broadcast on screen on if lockscreen is disabled." into cm-10.1
8cadad1 Merge "Update German translation." into cm-10.1
5cea290 Update German translation.
5a96c12 Add option to hide music controls in lockscreen.
de0a96f Merge "Correctly release lockscreen lock on tile destroy." into cm-10.1
0622b71 Base: CS translation
5292a65 Don't consider input restricted when the lockscreen is disabled by an app.
b061fe5 Send out USER_PRESENT broadcast on screen on if lockscreen is disabled.
9c357b9 Core: RU translation
9e3fa9c Frameworks: privacy guard fix possible NPE
ab5d5e7 Merge "am: Fix the privacy guard notification" into cm-10.1
8f0e386 Delay closing the notification area after swiping a little closer.
b0463ae When DPM is updated while lock screen is inhibited, don't unconditionally enable lock screen.
0a18e03a Correctly release lockscreen lock on tile destroy.
0fa4b70 core: NL translation
4d01f92 Core: HU translation
ba7f179 Frameworks_base: PT-BR update translations
e49288d Add SMS Middleware layer.
f9a18fc am: Fix the privacy guard notification
9929e6b Merge "Frameworks/base : FR translations" into cm-10.1
5d62bbb Merge "frameworks_base: ES translations" into cm-10.1
2182b09 Merge "Keep on notification LED while dreaming." into cm-10.1
33ff74d Frameworks/base : FR translations
d0297fe Merge "Fix pie activation when enabling expanded desktop from QS tile." into cm-10.1
dc7c620 Merge "Base: CS translation" into cm-10.1
63cb78d Fix pie activation when enabling expanded desktop from QS tile.
f370e62 Keep on notification LED while dreaming.
d5bd846 frameworks_base: ES translations
2865a2e SystemUI: Update italian translation
8c18ca7 Framework base: Update italian translation
01bfda4 Base: CS translation
b077138 Merge "SystemUI: HU translation" into cm-10.1
1132c18 Merge "Core: HU translation" into cm-10.1
9ef82c7 Merge "Core: RU translations" into cm-10.1
aa52d86 SystemUI: HU translation
a845f4e Core: RU translations
af124f7 Merge "Add 2G/3G option to profile connections (1/2)" into cm-10.1
00539be QuickSettings: Camera tile
99332b1 Add 2G/3G option to profile connections (1/2)
69c5fce SystemUI: Don't try to update the navbar if it doesn't exist
496764c AssetRedirectionManager: Accept redirections only for whitelisted resource types
b14d536 Frameworks_base: PT-BR update translations
d602bbe Core: RU translation
dd9e208 frameworks_base_core: ES translations
5e13ee9 Make contacts app aware of blacklist being disabled (1/3)
4f65a6f Core: HU translation
1621c28 Use sticky broadcast to convey torch state (1/2).
3754b94 Merge "Profiles: Add a profile picker activity" into cm-10.1
a08b241 privacy guard: Use LocationBlacklist for location filtering
faf5569 Pie controls: Fix multi-user handling
60f0747 Profiles: Add a profile picker activity
ee0783a Merge "Navbar : Reverse order in landscape" into cm-10.1
189588e Navbar : Reverse order in landscape
cdd37b5 Add missing @hide annotations for Privacy Guard
2b30584 Merge "Make navigation bar ready for per-user configuration." into cm-10.1
163009b Merge "Fix multi-user behaviour for system UI settings (1/2)" into cm-10.1
05a0345 Merge "Profiles: Fix turning bluetooth on/off when its in intermediate state" into cm-10.1
80585f6 Profiles: Fix turning bluetooth on/off when its in intermediate state
e48fce6 framework: Privacy Guard
c2d2a69 Make navigation bar ready for per-user configuration.
a012186 Fix multi-user behaviour for system UI settings (1/2)
b429a08 Merge "[2/2] Add bluetooth triggers to profiles" into cm-10.1
54663c0 Ringtones: Fix ANDROID_LOOP=true for ArgoNavis and Perseus ringtones
14530a8 Fix DateUtils.formatElapsedTime, again
09abf58 WebSettings: Move CM tag to the end of the user-agent
12c158f QS: Don't assume observers are registered when dealing with changes
3a6696b [2/2] Add bluetooth triggers to profiles
7fcde1a Revert behavior of DateUtils.formatElapsedTime
79ee085 Merge "ThemeUtils: Retain the original package name in themed UI context" into cm-10.1
44eea56 ThemeUtils: Retain the original package name in themed UI context
d72e11d Derp fix.
63e13f9 Merge "core: zh-rTW translations" into cm-10.1
94d80e5 Merge "SystemUI: zh-rTW translations" into cm-10.1
f101be5 Merge "Hide navigation ring if no targets are configured." into cm-10.1
7acf668 Merge "Cleanup." into cm-10.1
7ad0cdc Hide navigation ring if no targets are configured.
10d83fd Close notification panel when swiping away the last clearable notification.
c8b337f Cleanup.
4d0af80 Merge "Check and fail early if requested wallpaper size exceeds maximum texture size." into cm-10.1
7311989 Merge "Lockscreen : Fix widgets disabled" into cm-10.1
fc5f644 Merge "Fix ringer mode being unneededly changed by setting ringer mode volume to 0." into cm-10.1
5402a30 AssetRedirectionService: Check for permissions before running dump()
4ff216e Merge "Fix dock battery tile display." into cm-10.1
fafa30d Fix dock battery tile display.
bdf172e Fix mobile data button in power widget.
a438fa6 SystemUI: zh-rTW translations
5f18cfa Lockscreen : Fix widgets disabled
3a1d327 core: zh-rTW translations
0d75ecd FileUtils: add method to get UUID of a volume
30f9b24 Merge "Don't assume any ringtone is present on external storage." into cm-10.1
a023b1f Don't assume any ringtone is present on external storage.
9422fde Check and fail early if requested wallpaper size exceeds maximum texture size.
78025ce QuickSettings : Battery initial status
e6d8bca Fix ringer mode being unneededly changed by setting ringer mode volume to 0.
44d22ba Merge "[1/2] Add triggers to change profile based on AP" into cm-10.1
9037ead [1/2] Add triggers to change profile based on AP
7a300d2 SystemUI: Add missing Af Translations
4bb487a Merge "core: EL translations" into cm-10.1
e1d2511 Merge "Fix NPE in NavigationBarView during bugreport" into cm-10.1
2a5ec08 Merge "frameworks_base: ES translations" into cm-10.1
ed0a242 Fix NPE in NavigationBarView during bugreport
2849e6f Merge "Fix a number of multi-user bugs." into cm-10.1
07bd774 Fix a number of multi-user bugs.
cc89831 Fix theme provider crashing for non-primary user.
c626fd7 frameworks_base: ES translations
c5c3303 [2/2] Permit home button wake to be configurable
f90658c Merge "framework: Update German translation" into cm-10.1
05bf463 framework: Update German translation
ae94696 Merge changes Ic9b16732,I8d1cb2e2 into cm-10.1
eae9890 Fixing crash in PhoneNumberUtils getNumberFromIntent
e656074 change "next" to "done" in minute IME option under 24-hour format
0cdd2dc Fix incorrect fragment animation used for hiding fragments
0f5cbf4 Merge "Reduce number of binder calls by saving nav bar state" into cm-10.1
558a3c6 frameworks/base: Simplified Chinese Translations
b7353e2 Reduce number of binder calls by saving nav bar state
686a4e8 Finally fix incorrect flipping to quick settings.
ecf9a98 NotificationManagerService: fix typo on led off time variable
be47cb7 Lockscreen : Use correct filter for background
6a47444 Merge "Check themes of current user, not user 0." into cm-10.1
a63ea71 Check themes of current user, not user 0.
4a9b579 Merge "Fix the flipping animation sometimes being played when pulling the quick settings with two fingers." into cm-10.1
1e803ed Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" into cm-10.1
45b6edf Detect whether overflow button should be shown based on menu key state
d9ff148 core: EL translations
f6685c5 Fix the flipping animation sometimes being played when pulling the quick settings with two fingers.
4ed6fd0 Merge "Pie controls: Catching activation corner cases" into cm-10.1
d7b4e94 Merge "Pie controls: Fix flickering nav bar in full screen" into cm-10.1
3901893 Merge "NavRing : Fix FC on rotate" into cm-10.1
f1ecfb7 Merge "Lockscreen : Add custom background overlay" into cm-10.1
9e3c604 Merge "Allow hardware overflow key to be show by default." into cm-10.1
4e88ae9 Pie controls: Catching activation corner cases
b9938df Pie controls: Fix flickering nav bar in full screen
c818f1b NavRing : Fix FC on rotate
37ec53f Merge "Pie controls: Fix event handling on chained input filters" into cm-10.1
e74de81 Pie controls: Fix event handling on chained input filters
72a641c Merge "Framework: Add support to enable/disable Electron Beam (1/2)" into cm-10.1
51dddfa SystemUI: NL translation
6a7adfd Core: Update italian translation
b20d07c Frameworks : FR translation
0da288f Add missing ACTION_MEDIA_UNMOUNTED intent
14cc811 Telephony: Add DCHSPAP to getTcpBufferSizesPropName
fa583e1 Lockscreen : Add custom background overlay
b9fe80f Framework: Add support to enable/disable Electron Beam (1/2)
1fa8ead Merge "Bye, bye Talk. Welcome Hangouts (1/2)" into cm-10.1
f2754ec Merge "profiles: Don't broadcast before boot completed" into cm-10.1
d4a07e7 Merge "frameworks_base : translation" into cm-10.1
e976624 profiles: Don't broadcast before boot completed
9e3c83a Bye, bye Talk. Welcome Hangouts (1/2)
2fe360b Merge "Fix MAP SDP record generation [2/3]." into cm-10.1
8120e44 SystemUI: TR translations
7b2eb26 core: TR translations
c81a3f3 Fix MAP SDP record generation [2/3].
8e5ff06 Allow hardware overflow key to be show by default.
d62ebbd Merge "SystemUI: ES translations" into cm-10.1
aa72cf1 Profiles : Allow nfc override (1/2)
1969a61 SystemUI: ES translations
37f9075 Merge "profiles: Broadcast profile updates" into cm-10.1
4c90669 Merge "Pie controls: Tweaking UX for pie service (1/2)" into cm-10.1
e620008 Merge "Reduce observers in SystemUI: StatusBarIconView" into cm-10.1
831de7f Merge "Improve auto-brightness handling" into cm-10.1
913557b Merge "Make character picker for QWERTY keyboards use HOLO theme" into cm-10.1
c80a1af frameworks_base : translation
8d7d189 profiles: Broadcast profile updates
ad017af AudioService: Remove STREAM_NOTIFICATION from ringer mode streams
eb2eaa5 Improve auto-brightness handling
b167370 core: NL translations
5073dc5 frameworks_base: SK Translations
31342f1 Reduce observers in SystemUI: StatusBarIconView
fa46b51 Pie controls: Tweaking UX for pie service (1/2)
a6ae221 TelephonyManager: hide NETWORK_TYPE_DCHSPAP
ecd66c1 Frameworks & SystemUI - additional DC-HSPAP support
13da52a Merge "Fix layout of MultiWaveView and GlowPadView." into cm-10.1
73e2c7a Merge "Remove opaque check in GLRenderer when preparing dirty region." into cm-10.1
3c6c126 Merge "Frameworks : FR translation" into cm-10.1
83a611a Merge "Pie Controls: Fix sound effects." into cm-10.1
e54123c Merge "Pie Controls: Fix snap points position." into cm-10.1
9e1aef7 Pie Controls: Fix sound effects.
25f7f2e Pie Controls: Fix snap points position.
e29d7f0 Merge "SystemUI: Clean up old H+ drawables causing issues on manta" into cm-10.1
4641ba2 Merge "Allow applications to show the navigation bar in expanded desktop mode." into cm-10.1
b361aa8 Frameworks : FR translation
d38bcc3 Merge "Fix up notification LED behaviour" into cm-10.1
00dc95f Remove opaque check in GLRenderer when preparing dirty region.
656d1a7 Allow applications to show the navigation bar in expanded desktop mode.
49b819d Merge "NavigationBar : Only inflate once" into cm-10.1
99ca887 SystemUI: Clean up old H+ drawables causing issues on manta
0043015 Merge changes I352f1980,I6a4a4635 into cm-10.1
ab9f90c Merge "Don't include flags in configuration change if their value hasn't changed." into cm-10.1
75c82dc Fix up notification LED behaviour
d4bb3bc Pie controls: A new way of activation
9f11bd1 Pie controls: Introducing a pie delivery service
1431fd8 Don't include flags in configuration change if their value hasn't changed.
e155cb4 NavigationBar : Only inflate once
cdd9897 Frameworks: Fix do not show snappoints if triggermask disables edge
488b6fe Fix layout of MultiWaveView and GlowPadView.
a66f8ca Framworks: disable observer and receiver if PIE is disabled
5e3a10e Merge "Replication test, OHAI GITHUB" into cm-10.1
9314863 Replication test, OHAI GITHUB
df0391b Merge "Frameworks: take  mPieScale into account to calculate estimated PIE width" into cm-10.1
b5beaa5 Frameworks: take  mPieScale into account to calculate estimated PIE width
e1cf365 Merge "Send out a configuration change when screen size changes due to expanded desktop." into cm-10.1
1b2ddd2 Make character picker for QWERTY keyboards use HOLO theme
9483d87 Send out a configuration change when screen size changes due to expanded desktop.
a33a12b Merge "SystemUI: Update brightness dialog, on updateResources()" into cm-10.1
342ef8d PowerMenu : Profile entry fix
b411b98 Framework: HU translation fix
4ee6683 audio: Add overlay to fix analog docks.
4384dfc Merge "added contact lockscreen icon" into cm-10.1
b3b1110 FrameworkBase: Add missing AF translations
ebc6e09 Merge "Option to use volume keys to control media volume anytime (2/2)" into cm-10.1
aa1d684 Option to use volume keys to control media volume anytime (2/2)
0d08baa Duplicate Media cleanup
ffff58b SystemUI: Update brightness dialog, on updateResources()
08410bd Frameworks_base: refactor translations
e1e339e aapt: allow toggling "errors instead of warnings"
923546d Merge "aapt: add check for untranslatable "string-array"s" into cm-10.1
c8f8aa0 input: added support for multiple keyevents
5e6c92e Keep keyboard lit until the screen is dimmed
38c685c aapt: add check for untranslatable "string-array"s
a1810ef power: Add panel auto-brightness configuration
93df8a7 camera: Add support for sending raw commands
26caff3 Merge "SystemUI: Norwegian translation" into cm-10.1
297af25 Merge "DeviceKeyHandler: Increase handler priority" into cm-10.1
7f372ba SystemUI: Norwegian translation
2b7a378 core: Norwegian translation
b5f3264 Email force close when pressing back key after selecting characters
95f6c14 DeviceKeyHandler: Increase handler priority
9975780 Fix SystemUI memory leaks on theme changes.
c926976 framework-res/SystemUI: CS translation
5703842 FIX Null Pointer Exception on dialog cancel
a88aa4c Merge "aapt: localizations: be more aggressive" into cm-10.1
dad2f2f SystemUI: Fix aapt warnings
1426ccd Can not mark the same content of browser page after copy
84a1ff4 Fix NPE when pasting non-text from Clipboard
daf104a Audio continue to played even if paused manually
50f2c48 aapt: localizations: be more aggressive
6429061 Frameworks: Refactor AF translations
8e456b5 Merge "Allow creating custom dialogs in DialogPreference." into cm-10.1
731942e Merge "SystemUI+Core Danish translation: latest merges and transition to cm_ format" into cm-10.1
cc192b0 Merge "Core: RU translation" into cm-10.1
7ae205b Merge "Frameworks/SystemUI: Reorganize Greek translations" into cm-10.1
d16258b Allow creating custom dialogs in DialogPreference.
d024408 Fix Watchdog HeartbeatHandler to run on correct thread
ea054bc Merge "Frameworks : Fr translation" into cm-10.1
b7c2fdf SystemUI+Core Danish translation: latest merges and transition to cm_ format
15a5272 KeyEvent: update comment
b4a1bcc Merge "QuickSettings: UserTile: Open full contact page" into cm-10.1
8bc2bbe Frameworks/SystemUI: Reorganize Greek translations
9a57cdc Merge "framework-res + SystemUI: Simplified Chinese Translations" into cm-10.1
28367d0 Frameworks : Fr translation
6f66205 Frameworks_Base: CS translations
6286df7 Core: RU translation
033cd75 QuickSettings: UserTile: Open full contact page
ffeb56c frameworks_base: Fix extra-translations
2b052f4 Merge "Base: PT-BR update translations" into cm-10.1
4b60b68 Merge "Core: Update Polish translation" into cm-10.1
ebf0493 Merge "frameworks_base: ES translations" into cm-10.1
20c3be8 Core: Update Polish translation
a8846cc Adding translatable false tag
f1b8317 Merge "Framework and SystemUI: Refactor CM Additions resources" into cm-10.1
ee3f864 Merge "Don't start keyguard in an attempt to exit it." into cm-10.1
d29998a Merge "Don't let apps disable the SIM PIN entry screen." into cm-10.1
0fa4f8e frameworks_base: ES translations
0b1ee39 Merge "frameworks: ES translations" into cm-10.1
578e90c Merge "Frameworks : fr translation" into cm-10.1
0427cfb Framework and SystemUI: Refactor CM Additions resources
6e2799a Base: PT-BR update translations
3881d52 framework-res + SystemUI: Simplified Chinese Translations
03a5758 Frameworks: Reorganize Hungarian translations
41fdb67 frameworks: ES translations
1922856 [1/2] Power connect/disconnect notification support
d3361b7 QS/PW: Check for mobile data instead of telephony permissions (1/2)
358654f Don't start keyguard in an attempt to exit it.
2b6b9c9 Don't let apps disable the SIM PIN entry screen.
de19822 QuickSettings: cleanup Removed unnecessary references to QuickSettingsContainerView, LayoutInflater Tile layout is set by constructor
da1b461 Merge "PT-BR: Update translation" into cm-10.1
9ab3e99 SystemUI: fix memory leaks
b82a3b5 Externalize symbol picker options to resources
ff3f767 PowerMenu : Improve keyguard filtered actions
69f41906 QwertyKeyListener: Add support for www and .com key
8a207d7 Allow USB notification to show when primary SD allows UMS and MTP
a954774 wifi: Fix StringIndexOutOfBoundsException for incorrectly encoded SSIDs
d8dc80a Correct executable bit for source files
ea45df8 Add UsbDebuggingManager and UsbDebuggingActivity to LegacyUsbManager
9f94d8d Wifi: Get the list of supported channels
99e2985 Fix Photosphere/Camera FCs
b8a5fe7 Merge "Adapt navigation bar's long press behaviour for pie controls" into cm-10.1
741f514 Frameworks : fr translation
41cb63a Adapt navigation bar's long press behaviour for pie controls
44e5f6c keyboard: adding functional alt/shift lights
651d219 Remove unnecessary updateSurfaceScreenOn call.
67d5784 PT-BR: Update translation
16f0e74 Merge "Frameworks : add french translation" into cm-10.1
4294121 Merge "keyguard: enable magnetic target if no custom targets defined" into cm-10.1
80d67ca Merge "Stylus gestures features (1/2)" into cm-10.1
43c1a40 Merge "SystemUI: NL translations" into cm-10.1
d8ddc09 Stylus gestures features (1/2)
f78df28 keyguard: enable magnetic target if no custom targets defined
b5e8b8c Translation - Separating AOSP and CM strings
d53e351 Merge "Improving pie control's user interaction" into cm-10.1
289362e Fix potential deadlock between LockScreen and WindowManagerService
22dfc9d Merge "Fix DateUtils.formatElapsedTime." into cm-10.1
bda39ca Fix DateUtils.formatElapsedTime.
4fdb77f Merge "mdpi drawables for Navigation Bar Quick Launch Shortcuts" into cm-10.1
cc33b53 Frameworks : add french translation
f599775 Merge "Frameworks : reorganize and add french translation" into cm-10.1
c43b7d2 Revert "Remove opaque check in GLRenderer when preparing dirty region."
34f3b1d SystemUI: NL translations
8a3cb1a Update Russian Translation: Core
ea0d10a Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
9b9c509 Merge "es_ES: Add spanish translations" into cm-10.1
43bca24 Merge "SystemUI: Update Polish translation" into cm-10.1
91f4fda Merge "PT-BR: Update translation" into cm-10.1
fd52595 SystemUI: Update italian translation
f52c48e Frameworks : reorganize and add french translation
e025153 Improving pie control's user interaction
30f3cb6 mdpi drawables for Navigation Bar Quick Launch Shortcuts
bbdd39c Merge "Added hungarian translation" into cm-10.1
c422280 hwui: This code should only be enabled with QCOM_BSP
4475f86 Added hungarian translation
d3b01e3 SystemUI: Update Polish translation
cdf65bc Update Russian Translation-SystemUI-CM10.1
ddac6a4 es_ES: Add spanish translations
4ee83a1 PT-BR: Update translation
b345f69 Merge "SystemUI: Update German translation" into cm-10.1
9aa22ad Merge "Fix race condition in backlight adjustment." into cm-10.1
d2393ef SystemUI: Add Expanded desktop tile to QuickSettings (2/2)
b88dd21 Merge "Profile: respect DPM when overriding screen lock (1/2)" into cm-10.1
29b548a Merge "LockPatternUtils: isSecure: respect profile settings" into cm-10.1
8a96d5d QS: Add dock battery tile (1/2)
9e331a9 Profile: respect DPM when overriding screen lock (1/2)
ccab0c0 LockPatternUtils: isSecure: respect profile settings
5393aa5 Fix race condition in backlight adjustment.
727392b SystemUI: Update German translation
2e939f9 Merge "SettingsProvider: Initialize defaults for CM features" into cm-10.1
94ba14c SystemUI: Fix build warnings
a1ff2e0 SettingsProvider: Initialize defaults for CM features
2f9b1f0 Merge "Merge Navigation Bar and Pie Controls button config (1/2)" into cm-10.1
675432c Merge "Update systemUI ukrainian translation" into cm-10.1
075f088 Merge "Afrikaans translations: Added missing items" into cm-10.1
9a52b3b Tighten enforcement of file modes.
313336e Remove opaque check in GLRenderer when preparing dirty region.
2b7d9ad Afrikaans translations: Added missing items
1c601ac Merge Navigation Bar and Pie Controls button config (1/2)
6a33b50 Merge "LockscreenTargets : Dismiss on target select" into cm-10.1
068ffb8 Merge "Fix pie controls being disabled by launcher gestures." into cm-10.1
f4a1118 Fix pie controls being disabled by launcher gestures.
cb28b3a Update systemUI ukrainian translation
71dba0f Merge "PT-BR: Update translation" into cm-10.1
5d6a0cb Merge "Framework_base: Update italian traslation" into cm-10.1
3ecb630 Merge "SystemUI: Update italian translation" into cm-10.1
63bd9c2 Merge "SystemUI: Danish for pie controls" into cm-10.1
a55a223 Merge "SystemUI: Update Polish translation" into cm-10.1
c9d1d30 Merge "Added hungarian translation for pie control" into cm-10.1
7cd2a58 Merge "es_ES: Add spanish translations" into cm-10.1
9f617a0 Revert "am: Allow more hidden apps on devices with lots of RAM"
54ced88 PT-BR: Update translation
7bc5b5f Merge "Power Menu: Update the Expanded Desktop drawable" into cm-10.1
1d73b97 LockscreenTargets : Dismiss on target select
4575a35 es_ES: Add spanish translations
7ef3b90 Power Menu: Update the Expanded Desktop drawable
719327f Fix divisions by zero on boot.
c0ea33a Merge "FlingTracker can divide by zero and hang StatusBar in an infinite loop" into cm-10.1
dad194e IME : Fix sym key regression
76a5f9e SystemUI: Update italian translation
0c0df39 Framework_base: Update italian traslation
32d8e6a SystemUI: Danish for pie controls
f263996 SystemUI: Update Polish translation
a2e0cc0 FlingTracker can divide by zero and hang StatusBar in an infinite loop
432f477 Added hungarian translation for pie control
f603da9 Navring: Fix shortcut for uninstalled app
da062dc Add pie control optimizations for Phone UI.
9422b3f Bringing basic pie controls to CyanogenMod. (1/2)
13fa94e Added support for multiple navigation key bars
544bf6c Merge "Fix up expanded desktop behaviour." into cm-10.1
03a4201 am: Allow more hidden apps on devices with lots of RAM
f1d4a07 Wifi: Add IBSS supported method
d464e60 Wifi: Enable Ad-Hoc (IBSS) network configuration
21b8824 Prevent Sym key from showing the IME picker
0cf5d28 Lockscreen: Fix mdpi layout issues
09db149 Add keymapping for select BT headsets
548acc0 Revert "makefile changes for gcm javadocs"
bf9ac81 [HTML5] Implementation of WebSockets (framework).
6e0d2a6 Fix resource leak: When call MediaMetadataRetriever.setDataSource or getFrameAtTime should ensure call release in finally to avoid resource leak                    Patch set 2: Remove unnecessary white spaces
667cdc8 Fix up expanded desktop behaviour.
7d0a8e3 Swap volume buttons when the screen is rotated (1/2)
a3c73d7 SystemUI: Danish strings, latest merges
7ec0167 Merge "SystemUI: Simplified Chinese Translations" into cm-10.1
d84ec99 Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
4baf37a PT-BR: Update translations
9e228e3 Update Russian Translation-SystemUI-CM10.1
e89dffd Merge "PT-BR: Update translation" into cm-10.1
8913b5f Merge "SystemUI: Updated Polish translation" into cm-10.1
7efb4db PT-BR: Update translation
db9868e SystemUI: Simplified Chinese Translations
9fae4cd SystemUI: Updated Polish translation
b3a6d38 Merge "Core: Updated Polish translation" into cm-10.1
ea92862 Merge "ServiceState: add support for DCHSPAP" into cm-10.1
b00b1d0 Merge "AudioService: Restore volumes after boot and when a headset is plugged" into cm-10.1
0fa8995 Core: Updated Polish translation
23e043a ServiceState: add support for DCHSPAP
9e558b8 Reflect current state of torch in navigation ring button.
23fb4d3 Merge "es_ES: Update spanish translations" into cm-10.1
1bc9680 Merge "frameworks/base: Dutch translations" into cm-10.1
7e3a292 Merge "Add power-off menu Uk translation" into cm-10.1
8406488 es_ES: Update spanish translations
48c1ded Merge "Japanese: Update Japanese translation." into cm-10.1
d405a3b frameworks/base: Dutch translations
2e9f438 Merge "Added hungarian translation for Volume Tile" into cm-10.1
f319721 Merge "Frameworks Base : add french translation" into cm-10.1
bf20361 Merge "Framework base: Update italian translation" into cm-10.1
6ddb417 Merge "SystemUI: Update italian translation" into cm-10.1
b5de849 Merge "Framework: Add italian translation for input methods" into cm-10.1
9740ffa Added hungarian translation for Volume Tile
d0fadf5 Merge "Added Volume Tile to Quicksettings" into cm-10.1
d2b7a0e Added Volume Tile to Quicksettings
c1419e8 AudioService: Restore volumes after boot and when a headset is plugged
5fdfe0c Merge "Frameworks/SystemUI: Update Greek translations" into cm-10.1
ef44d82 SystemUi: Navigation bar Quick launch shortcuts (2 of 2)
5cfa305 added contact lockscreen icon
10fb742 Performance increase in thumbnail handling
af7c328 Add power-off menu Uk translation
a18377f PT-BR: Fix translations
aeb668a Merge "PT-BR: Update Translations" into cm-10.1
3a381f4 Framework base: Update italian translation
729b7da Frameworks/SystemUI: Update Greek translations
ababe58 Merge "FM Radio: avoid deadlock when disabling RDS" into cm-10.1
e1e7b78 SystemUI: Update italian translation
258db13 Framework: Add italian translation for input methods
732e158 Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
3f4b15f Merge "Added hungarian translation for quick_settings_lte" into cm-10.1
f87d645 Merge "frameworks: updated finnish translations" into cm-10.1
45a13a4 Revert "Remove dock home support."
d5c23fe Merge "Remove log noise" into cm-10.1
0c5de26 Japanese: Update Japanese translation.
44c99a0 implement 1% battery on select devices
ad72add FM Radio: avoid deadlock when disabling RDS
31eabf1 Added hungarian translation for quick_settings_lte
2fc3d54 LockscreenPattern : missing public @hide
065c87e Vectorize bitmap operations on A15 too
3083c3c core/jni/android/graphics: Cache copy of pre-scaled Bitmaps
c9b0de8 Merge "LockscreenPattern : Toggle dots/error pattern visibility (1/2)" into cm-10.1
b584579 QuickSettings: Honors config_show_cmIMESwitcher setting (1/2)
a60086e Remove log noise
976bc18 SystemUI: Fix QuickSetting IME tile
fb64bdf Merge "Revert "LockscreenTargets : Dismiss on target select"" into cm-10.1
ab8be5f Revert "LockscreenTargets : Dismiss on target select"
1c7049e Merge "Add Afrikaans translation" into cm-10.1
0029250 Add Afrikaans translation
0648a05 BrightnessTile : Cleanup controller references
3d07783 Update Russian Translation-SystemUI-CM10.1
8bbd689 Framework: Fix Brightness Tile
0222710 Frameworks Base : add french translation
a473459 PT-BR: Update Translations
949758a LockscreenPattern : Toggle dots/error pattern visibility (1/2)
b6739b5 QuickSettings: Add LTE Tile (1 of 2)
775d25e SystemUI : QuickSettings Cleanup
fd373b7 Merge "Have DashClock hide lockscreen clock" into cm-10.1
5f23473 Merge "FM Radio: do not try to change thread priority" into cm-10.1
a085d53 Have DashClock hide lockscreen clock
8a73bce Framework: AOSP Fix - starting window memory leak
8dc6fca fixed inconsistant define values with android_nfc.h
c891984 SystemUI: Fix dock battery icons for phablet UI
a2e2076 frameworks/base: vectorize Bitmap operations
320793c GC triggering performance optimizations
e8e4993 Services: Adding HSPAP info in Android
da6ef20 FM Radio: do not try to change thread priority
12e306c Merge "Profiles: add PROFILES_STATE_CHANGED_ACTION broadcast intent" into cm-10.1
29fdb24 Merge "Bugfix : Quick pulldown sometimes flips when it should not" into cm-10.1
2c49d18 Profiles: add PROFILES_STATE_CHANGED_ACTION broadcast intent
b26f3f6 SystemUI: Avoid "phantom" status bar collapsing
c5e8dca Bugfix : Quick pulldown sometimes flips when it should not
d513261 Remove duplicate if statement
0f616cf Merge "frameworks: Dutch translations" into cm-10.1
5a43151 Merge "Framework: Show the Advanced reboot menu only for the primary user" into cm-10.1
1248bdc Merge "Make sure we're using an up-to-date disable state when we're reloaded." into cm-10.1
a847362 Framework: Show the Advanced reboot menu only for the primary user
4522a5a Merge "SystemUI: Update italian translation" into cm-10.1
6e9e438 Merge "Frameworks/SystemUI: Update Portuguese translations" into cm-10.1
aa196b8 Frameworks/SystemUI: Update Portuguese translations
b7c32f3 Make sure we're using an up-to-date disable state when we're reloaded.
26ca1d0 Framework: Fix build
eb01bcf SystemUI: Update italian translation
dbc6907 Fix reboot window texts
410fda5 Merge "SystemUI: Update German translations" into cm-10.1
62fc905 Merge "LockscreenTargets : Dismiss on target select" into cm-10.1
ffa10e9 Merge "frameworks: Update translations" into cm-10.1
63a267e frameworks: Dutch translations
e7b9539 LockscreenTargets : Dismiss on target select
4287437 frameworks: updated finnish translations
f19fbbd Feature : Volume adjust sound preference 1/2
c89cb6a Merge "Framework: Add Advanced reboot (2 of 2)" into cm-10.1
7961a0f Fix the build
d7f9557 Framework: Add Advanced reboot (2 of 2)
97df394 SystemUI: Update German translations
dbd53d5 CidBean: Display CyanogenMod version
a0fa128 SystemUI: Correct 'Cid'
bbce62b frameworks: Update translations
e25016e Merge "bootanimation: performance/speedup enhancements (squashed from CM10)" into cm-10.1
85b355f Fix Quiet Hours not muting notification sounds
e583f27 Merge "frameworks: Indonesian translations" into cm-10.1
df09f05 bootanimation: performance/speedup enhancements (squashed from CM10)
26e5f50 Merge "Keyguard: Reduce font size of clock in status keyguard (sw720dp) (portrait)" into cm-10.1
e14f2ba Added hungarian translation and remove unnecessary line breaks
0588df9 Chinese: Update translations
71cd6b8 Czech: small cosmetic change to make it perfect, changed WiFi to Wi-Fi, added Quiet hours and some new translation
c8a29f4 frameworks: Indonesian translations
7c371b5 Merge "SystemUI: allow update Mobile Network Type tile display" into cm-10.1
f93092c Keyguard: Reduce font size of clock in status keyguard (sw720dp) (portrait)
59b6a7d Merge "Lockscreen Targets: Icon Revamp" into cm-10.1
ba3b708 Merge "Make system layout fill the window properly on expanded desktop mode" into cm-10.1
641b886 policy: always use hardware acceleration for keyguard
745ec71 Lockscreen Targets: Icon Revamp
cf55b00 Make system layout fill the window properly on expanded desktop mode
640a0d3 Add method to PowerManager that allows querying the lowest possible brightness.
f6f6b1d Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_frameworks_base into mr1.1-staging
4815d6e Merge commit 'android-4.2.2_r1' into mr1.1-staging
ad49bca Add back backlight brightness curve adjustment.
8e88ebe Merge "es_ES: Added spanish translations" into cm-10.1
eaa7d18 Make capitalization of relative date strings consistent for German locale.
da7db16 es_ES: Added spanish translations
031c227 Option to show status bar in expanded desktop mode (2/2)
e8b4b3b Keyboard light: Fix the physical keyboard not light when it's visiable.
c83dd11 Merge "Added hungarian translation for quick settings tile" into cm-10.1
44f2f8d FM Radio: Add support for FM Radio in Android
5036c4a Added hungarian translation for quick settings tile
c26fe2a Merge "InputDevices: Fix compiler warnings" into cm-10.1
1d7be50 Allowed translations for off quiethours tile
b7ebfd3 InputDevices: Fix compiler warnings
16127b8 Merge "SystemUI: Update italian translation" into cm-10.1
b045a1d Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
763ef60 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
d58f841 Merge "es_ES: Added spanish translations" into cm-10.1
12705e3 Merge "SystemUI: Add dock battery icon styles" into cm-10.1
f2d89ef am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
64ab8fd Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
0fcd19a Update Russian Translation-SystemUI-CM10.1
0ea731f SystemUI: allow update Mobile Network Type tile display
ddbadd0 Revert GPS changes for now until issues are resolved.
4323fc5 Merge "QuickSettings: Better Mobile network tile disabled overlay handling" into cm-10.1
e0d4f8a QuickSettings: Better Mobile network tile disabled overlay handling
4925d67 SystemUI: Make the HSPA+ drawables more consistent with the HSPA drawables
da9a3f5 Quick Settings: Add visual indicator of ON/OFF Setting of Mobile Data tile
9da9a7c am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
e60b602 Merge "makefile changes for gcm javadocs" into jb-mr1-dev
34c8804 Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
b68702e am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
0e66f16 Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev
87cfad7 Doc change: Scroller Javadoc Bug # 7966653
042159d SystemUI: Add dock battery icon styles
ef4196d am 89fafaea: Doc update: clean up
0474ed4 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
89fafae Doc update: clean up
eeb1116 QuietHours Tile (1/2)
5f9922d makefile changes for gcm javadocs
43f415a Merge "Framework: Make Safe headset volume user configurable (1 of 2)" into cm-10.1
84c6741 GPS fixes
af694ad Framework:  Fix security exception
c8ec72e Framework: Make Safe headset volume user configurable (1 of 2)
f97e4f3 Merge "Framework: Fix multi-user support in AudioService" into cm-10.1
8a9da10 Framework: Enable multi-user support for Notification light
ce5a063 Merge "Framework: Enable multi-user support for Quiet Hours" into cm-10.1
805d2e2 am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
177c046 Grant qcom_oncrpc group to system_server
00f4908 Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
6697861 Squashed commit of GPS changes from CodeAurora
bd0fd29 Fix re-enabled state of up after action view collapse
07cf971 Fix re-enabled state of up after action view collapse
5e9be5b am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
d6e0c14 Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
5068cfe SystemUI: Update italian translation
b47fa16 docs: fix renderscript links that currently require redirect
640d570 am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
afd51f1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b26cab9 es_ES: Added spanish translations
1247fbd docs: Removed the -e runner subcommand option. Bug: 7562330
b23a35a am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
ba84a04 Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
f6f5cf4 docs: update javadocs for gms and gcm
5dcf7ab Merge "SystemUI: Dutch translations" into cm-10.1
de0cfdc Restored Fused Location app name
54212ef PackageManager: Restrict system packages to protected storage
f8a9566 Merge "Keyguard: Fix for home wake/unlock sometimes waking and unlocking during the same keypress." into cm-10.1
83359e8 am 5439e0c2: docs: followup update for dashboard; add platform pie
ca9e9533 SystemUI: Remove the dark pixel artifacts from the back arrow drawable
5439e0c docs: followup update for dashboard; add platform pie
641f74a am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev
dde4eed Merge "docs: update dashboard platform data for feb" into jb-mr1-dev
d799ffc docs: update dashboard platform data for feb
8dee1ae Merge "frameworks: base: systemui: modify hdpi & xhdpi drawables for battery_min" into cm-10.1
67389e0 Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
98ffd11 am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
2623157 Doc change: add redirects file (yaml) for use in devsite docs builds.
62f3303 Fix regression in expanded action view up
6534357 SystemUI: Dutch translations
3448639 Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
b694509 Added missing hungarian translations
84bdc4c Framework: Fix multi-user support in AudioService
db77aa1 Framework: Enable multi-user support for Quiet Hours
0c80e38 Merge "Navbar : Fix left over glow" into cm-10.1
2e561b2 Keyguard: Fix for home wake/unlock sometimes waking and unlocking during the same keypress.
9fe28b9 Merge "Czech: fixed translation, added new strings" into cm-10.1
93f4145 Merge "PT-BR: Update translations" into cm-10.1
c238c18 Merge "Android framework: Hebrew translation update" into cm-10.1
64169e1 Merge "frameworks_base: Simplified Chinese Translations" into cm-10.1
2a8b926 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3d57823 am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
8a72b6e Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
8b62c40 am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
bf1d230 Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
3424794 am e63dfe5a: docs: fix broken links
120f7eb am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
e63dfe5 docs: fix broken links
e929e66 Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
ee44f3b Navbar : Fix left over glow
af7b4a4 Lockscreen Targets : Make multi-user compatible
b4c6c1b Doc change: Remove proto scheme from src urls (fix mixed content warning).
d224289 am e55d5e86: docs: change "android developer console" to "developer console"
6c9d637 am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
9fd4893 am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
65fd981 am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
01084b9 am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
1e7e110 am 4b7161cb: docs: switch devsite doc build to use templates-sdk
5c37151 am e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
68d0f32 am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
f8a9c50 am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
d6e176c am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
3ef2c02 am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
daf487f am df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
40c7b7a docs: delete orphaned images (the obvious ones)
32e8892e Update Russian Translation-SystemUI-CM10.1
1bd6ff6 Fix coding style.
c7f62ee @hide new setting and move it to appropriate place.
ba9734b Merge "framework: Update German translation" into cm-10.1
0ae78e1 framework: Update German translation
7ef69d4 Notification sound-to-vibration conversion toggle
81cf219 PT-BR: Update translations
29c4724 Android framework: Hebrew translation update
679d1a9 Merge "SistemUI: updated romanian translation" into cm-10.1
00ca1d7 Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
62730e1 Merge "Prevent audio players starting on startup." into cm-10.1
7fddb00 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
70dd514 SystemUI: highlight quick settings and notification clear buttons
2297d1e Merge "Fix WiFi test:" into jb-mr1.1-dev
f2991ad Fix WiFi test:
6b5877c Merge "SystemUI QuickSettings: Allow more off-status localizations" into cm-10.1
e55d5e8 docs: change "android developer console" to "developer console"
2f52b27 framework: Custom lock screen background [1/2]
f216ded Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
483d785 docs: clarify usage for adb am component option
7bac361 Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
a62dbfd Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
c0dc033 frameworks_base: Simplified Chinese Translations
90560e7 SystemUI QuickSettings: Allow more off-status localizations
750229c framework: Make string translateable
f9f2220 Merge "Keyguard: remove duplicated code" into cm-10.1
2aa47b3 Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
9cab5c0 Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
3b4b067 Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
f04207a Doc change: remove duplicate image directory (use /sdk/images instead).
4b7161c docs: switch devsite doc build to use templates-sdk
e75cd4b docs: add hdf bool for deviste, used to change aspects of the templates
f17e84f Keyguard: remove duplicated code
48f9f83 Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
7b32d32 Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
289ad99 Add build rule for ds (devsite) online docs.
2c1669c Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
10550e5 Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
376e707 Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
7467a0f docs: update adb tool page with am and pm reference
320186b Merge "Keyguard: Reduce font size of clock in status keyguard (sw720dp)" into cm-10.1
ec0d7a7 Update Russian Translation-SystemUI-CM10.1
37dc71c Merge "Fix code formatting issues." into cm-10.1
b971905 Prevent audio players starting on startup.
e77b6ef Fix code formatting issues.
94ca7dd Merge "SystemUI: New Danish strings" into cm-10.1
3ca26f6 Merge "PT-BR: Update translations" into cm-10.1
a0bfbc7 Notification : Fix app info long-press
68dca93 Keyguard: Reduce font size of clock in status keyguard (sw720dp)
2ceeca1 Merge "Update Russian Translation-CID head-CM10.1" into cm-10.1
d4e0fb0 Merge "SystemUI: Update pt-PT language." into cm-10.1
4885549 frameworks/base - add missing translations
6d81c10 Merge "frameworks: Dutch translations (2) [cm-10.1]" into cm-10.1
ad669d1 Merge "Added hungarian translations" into cm-10.1
698ee9b Merge "Fix profile's xml" into cm-10.1
4227d43 Add option for switching between UMS and MTP/PTP mode. (1/2)
bf756e0 PowerManagerService: Implement setButtonBrightnessOverrideFromWindowManager method
a788c2a Add a long-click target (display settings) to the brightness tile
e4f513c SystemUI: always use transparent notification shade
c4b3810 AudioService: allow volume control on analog dock
7031e3f Status Bar: Fade CM widgets on Low Profile mode
b75eace Re-implement magnetic targets
21b9406 Fix for ambiguous and broken disk formatting dialog
026d93b frameworks/base: Added English UK keyboard layout for physical keyboards
af0d73e [2/3] mediaeditor: Allow custom DOMX source instead of Google DOMX default
fee3fc5 Merge "Framework: Fix button label toasts when layout is RTL" into cm-10.1
11ee182 Changed profile selection to single-tap action
39bd94a SystemUI: Update pt-PT language.
4b3c17a Merge "Camera: add additional ISO modes (2/2)" into cm-10.1
54cfab9 Camera: add additional ISO modes (2/2)
175934c PT-BR: Update translations
83d8ada frameworks: Dutch translations (2) [cm-10.1]
774bfd8 SystemUI: Fix dock battery visual glitch
d34a6b1 frameworks: base: systemui: modify hdpi & xhdpi drawables for battery_min
df9fa4c Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
ab0d96c frameworks: base: systemui: remove textSize from dock_battery_text
f65858e Czech: fixed translation, added new strings
034d07e Cleanup dock battery support
899f5c2 Merge "frameworks: add dock battery drawables for HDPI devices" into cm-10.1
6dc4228 Merge "Show dock battery level if available" into cm-10.1
33ef00e frameworks: add dock battery drawables for HDPI devices
a68c70f Show dock battery level if available
8f05dd7 SistemUI: updated romanian translation
4c26c22 Update Russian Translation-CID head-CM10.1
1121c2d Added German string for discharging information on lockscreen when enabled
0faace5 Added hungarian translations
dbb1f9b DeviceKeyHandle: The device should consume only known keys
78675d7 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
c246950 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
5a32ec3 Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
27cba38 Touch action bar title text: you will go to space today!
d28f30a Prevent simultaneous interaction with action bar and content
4b662bd Merge "Dispatch keys to a device specific key handler" into cm-10.1
862f89d Dispatch keys to a device specific key handler
d4dcdc2 Merge "Added hungarian translation for USB Tether" into cm-10.1
cd9db1c Merge "Lockscreen: longpress on expand challenge handle" into cm-10.1
668ec5e Merge "Wi-Fi: Pass default country code to driver" into cm-10.1
ad4e119 Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
056ce7d Wi-Fi: Pass default country code to driver
596532d Properly initialize recognition service if the recognizer component changed.
682e9d9 Quick Settings: Fix flip-to-settings animation
7585d18 Merge "PT-BR: Update translation" into cm-10.1
1af816f Lockscreen: longpress on expand challenge handle
b41c9ed SystemUI: New Danish strings
5f28047 Update Russian Translation-SystemUI-CM10.1
788c20d es_ES: SystemUI: Fit spanish translations in tiles
7340a77 Merge "Clean up, simplify and fix AlarmTile class and logic" into cm-10.1
a7821df Merge "QuickSettings: Allow custom off-status strings for translates" into cm-10.1
54639e2 Clean up, simplify and fix AlarmTile class and logic
3578a79 Framework: Fix button label toasts when layout is RTL
6990237 frameworks/base: Fix to avoid crash when the tab is not set from app
612dfaa [webkit] Postpone sending scroll message to webcore thread
323c99c [webkit]Change the thread priority
bcc8f73 [webkit] Runtime enablement of WebGL
5588b4f Merge "framework: Update German translation" into cm-10.1
6d938c8 framework: Update German translation
ae5bc3d QuickSettings: Allow custom off-status strings for translates
a2d00cd Highlight the clear button in the recents view when clicked
6dac4ed SystemUI: show date on 2 lines in status bar
92f2bde Merge "Bluetooth MAP (Message Access Profile) Upstream Changes (3/3)" into cm-10.1
3b4b4c8 Merge "Monitor device storage directly in /data/data" into cm-10.1
8f96cee Merge "installd: Delete cache properly for devices using datadata partition" into cm-10.1
85fadaa Mms auto-retrieval (1/3): framework
71e9a89 TelephonyProperties: Alpha ID fix for OPEN_CHANNEL and other p-commands (1/2)
47461ba Allow purging of asset bitmaps
c689d18 extend PreferenceActivity for title text on a single pane mode
8d43185 Audioservice: fix A2dp support on Samsung's Audio Policy HAL.
fd9a957 frameworks/base: support devices with SoftAp that don't require firmware reload
22337ec PT-BR: Update translation
4efe071 docs: update auth doc to mention multiple scopes bug 7644251
125a812 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
0cf97d3 Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev
a239b93 am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
548e17d Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
b1630ca frameworks: base: add storage_sd_dock_card string
fb80c9e docs: Add PageTransformer to animations training class
ee3a1d5 am 9b6687bb: Fix code snippet
9b6687b Fix code snippet
4bfdaf9 Add support for external dock batteries
79d59f0 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
6b65605 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4a0f95c am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
3987f6c Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
ceabe5b Merge "telephony: set additional audioparameters for incall audio (1/2)" into cm-10.1
3332aa9 am d7ec742c: docs: Minor typos
dbd6f4f Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
65de405 Merge "PT-BR: Added missing translations" into cm-10.1
2e63305 Merge "Android Framework: Hebrew translation updates" into cm-10.1
d9736d5 Monitor device storage directly in /data/data
4166513 Doc change: Fix urls to work properly with https.
d7ec742 docs: Minor typos
a021fe8 Allow setting a per-device default configuration for STATUS_BAR_BATTERY
ceddf9f am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
3c3995f Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
39ea055 am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
335da36 Merge "docs: Another fix for external 42607" into jb-mr1-dev
0aa6b9f Fix profile's xml
5b61ad2 docs: put new devbytes playlist on the develop landing
9ac31a7 am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
ec171f3 docs: add download ZIPs for chet's devbyte samples
dd52dfe am de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev
de3b69e Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev
c75d3f5 Fix the single crunch command to return the right error code.
3eeaf8a telephony: set additional audioparameters for incall audio (1/2)
4aea83b docs: Another fix for external 42607
9af5cf2 am 20d47ca8: Doc change: add developer video to carousel and spotlight pages.
20d47ca Doc change: add developer video to carousel and spotlight pages.
1279895 am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev
d1a1801 Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev
a178d67 Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
026f919 am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
0834269 Merge "docs: Fix a bunch of issues" into jb-mr1-dev
1357617 am 07ee7d17: docs: Hide Arabic and Hebrew badges due to translation problems
07ee7d1 docs: Hide Arabic and Hebrew badges due to translation problems
24369cd Wi-Fi: Ping the driver for wifi-only devices
1a551b1 am 6f680f52: Displaying Bitmaps Efficiently Training - Change memory calculation
056a269 Merge "Revert "Patch Set 1/2: Add an "Automatically Connect" option for WiFi networks"" into cm-10.1
813729f Revert "Patch Set 1/2: Add an "Automatically Connect" option for WiFi networks"
d6ad208 Merge "A tiny optimalization" into cm-10.1
0d053dc Android Framework: Hebrew translation updates
b39d3c8 Update Russian Translation-SystemUI-CM10.1
323916b Added hungarian translation for USB Tether
955f332 es_ES: Added spanish translations
7ed189e docs: Fix a bunch of issues
6f680f5 Displaying Bitmaps Efficiently Training - Change memory calculation
7b7a7d7 A tiny optimalization
7b2ccf7 Add Quick Settings USB Tether tile (2 of 2)
5327322 Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
fe2792a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b5e4835 Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
3b97159 Improve heuristics for detecting wireless chargers.
3032a18 Merge "SystemUI: Danish strings" into cm-10.1
ec7ffa1 am 0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
493a768 Merge "Lockscreen : Hide clock for Chronus/DeskClock" into cm-10.1
d0423a4 Lockscreen : Hide clock for Chronus/DeskClock
0e7f769 installd: Delete cache properly for devices using datadata partition
9d08143 Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
e62fa82 Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
ff2abfb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
0bb4dad Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
d29f2d2 Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev
748856b Fix lock screen timeouts
1f0e270 Merge "Navbar : Padding fix" into cm-10.1
f4d8b45 Bluetooth MAP (Message Access Profile) Upstream Changes (3/3)
5f00913 Merge "bugfix: allow recent apps dialog to work with menu long-press" into cm-10.1
dbca8c8 PT-BR: Added missing translations
19c7d49 Patch Set 1/2: Add an "Automatically Connect" option for WiFi networks
25505f9 am cdf5106a: docs: a few doc bugs
cdf5106 docs: a few doc bugs
4dca863 Make action bar title a valid touch target for up when relevant
f1a7df3 Merge "PowerWidget: Soundbutton bugfix" into cm-10.1
7bcea4a am d149242a: docs: correct the url path to badge images and updated pr-br badge
d149242 docs: correct the url path to badge images and updated pr-br badge
45feb51 Merge "QuickSettings : Filter tiles from default" into cm-10.1
311f039 Navbar : Padding fix
1bfeb20 PowerWidget: Soundbutton bugfix
66adf0d am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
8124b60 Merge "Launch music player on headset connect" into cm-10.1
7ed4912 am 13ef4e43: docs: update GP badges with localized badges. includes AI files for all badges in available languages
70af3cd Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
13ef4e4 docs: update GP badges with localized badges. includes AI files for all badges in available languages
6aad995 docs: resolve bugs from external tracker
6bbe7b7 Quick Settings: Swipe to switch
710e2c8 Merge "GLSurfaceView: add property to default to RGB565" into cm-10.1
de52bdc QuickSettings : Fix regression
daf9b7d am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev
3f72bf3 Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev
d8fab51 QuickSettings : Filter tiles from default
ba5fd35 am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
7b4e597 Merge "Adding camera scene mode stress test." into jb-mr1-dev
b203975 am e30d31c4: docs: misc bugs from external tracker
e30d31c docs: misc bugs from external tracker
3a5c8b5 Merge "Added hungarian translation for NavigationBar settings" into cm-10.1
19bd8ab Added hungarian translation for NavigationBar settings
a42c01c QuickSettings : Cleanup
d0bfd56 GLSurfaceView: add property to default to RGB565
0fd25ff GpsQuickTile : Set label correctly
6c82341 Launch music player on headset connect
4b1a55a Merge "LockScreen: Add option to start widgets maximized" into cm-10.1
c0d0bfd LockScreen: Add option to start widgets maximized
15b9bec Merge "Update Russian Translation-NavBar Customization-SystemUI [2/2]-CM10.1" into cm-10.1
869d5b3 Update Russian Translation-NavBar Customization-SystemUI [2/2]-CM10.1
8ce7c15 PT-BR: Added missing translations
9842923 SystemUI: Danish strings
aa2a2a7 es_ES: Added spanish translations
c85a415 SystemUI: Dutch translations
8b4861c Merge "NavigationBar : Customization" into cm-10.1
4dd4c62 Merge "ActionBar: Compute required items prior to optional items" into cm-10.1
241b139 bugfix: allow recent apps dialog to work with menu long-press
bb1fdc6 NavigationBar : Customization
018d070 GlobalActions: Fix possible race condition when showing dialog.
3827d42 Revert "Revert "Japanese: update translation.""
95848d6 Merge "Revert "Japanese: update translation."" into cm-10.1
e58d551 Revert "Japanese: update translation."
8c14ad9 Merge "Correcting hungarian translation" into cm-10.1
b0e3f9a Merge "Update korean translation" into cm-10.1
98f8971 Merge "Japanese: update translation." into cm-10.1
93a4ab2 am 8f70a7c4: move the nsdchat sample to proper download directory
8f70a7c move the nsdchat sample to proper download directory
4bc407e am 47e8d20d: move network usage sample zip
47e8d20 move network usage sample zip
921c8a5 am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
4e483ed Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
f8daf19 docs: misc bug fixes. including important versioning fixes for first app class
928d263 am 2b13a475: Doc update: fixed manifest typo in Network zip
2b13a47 Doc update: fixed manifest typo in Network zip
c8f3a41 Correcting hungarian translation
7edf807 am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
197d0a6 Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
9c6cec7 docs: update sony driver link and name bug: 6566732
e478fb4 am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
6b79e95 Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
d84d5cc docs: update gms and gcm javadocs with new TOC
159ebef Add config_hasRemovableLid
8c5ef19 Adds ability to answer call with hardware HOME button (preparation to winter time)
3512a8b Merge "Fix HTC headset handling." into cm-10.1
bbe1f17 Fix HTC headset handling.
38a642e am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
3e2479d Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
188315c docs: fix broken links and add new sitemap text file
89e6655 Merge "Framework/SystemUI: Update Greek translations" into cm-10.1
ef7a25a Merge "QuickSettings: Fix Swedish translations" into cm-10.1
d56e4ec am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
ed2a05b Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
e06b083 Doc change: minor fixes to support lib lesson.
768be6d SystemUI: Dutch translations
ca6a5ee Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
90c0548 am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
9fe82f1 Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev
b318318 docs: dashboard update for 1/3/13
afa4d8b am 22d7cf23: Add single crunch command to aapt. do not merge.
1270dc5 QuickSettings: Fix Swedish translations
0d6f8fe GlobalActions: Fix dialog dismissal
5297d48 input: Add option to toggle pointer icon when using stylus
289b640 Merge "Disable touch while using the stylus (Galaxy Note)" into cm-10.1
6164353 Merge "Screenshot : Pass current user" into cm-10.1
bac8666 Adding camera scene mode stress test.
5d47c80 Merge "Fixed aapt warnings" into cm-10.1
22d7cf2 Add single crunch command to aapt. do not merge.
6dba2d1 Framework/SystemUI: Update Greek translations
f8d58c8 PowerWidget: fix airplane mode toggle
00e332c Merge "PT-BR: Added missing translations" into cm-10.1
a76937e Screenshot : Pass current user
87eb920 Merge "frameworks/base: Dutch translations" into cm-10.1
8195d71 Merge "Quick Settings: Actually update resources, when asked" into cm-10.1
e88d7ec Merge "Framwork: Add support for variable size pattern lockscreen (Part 1/2)" into cm-10.1
9f1827b Framwork: Add support for variable size pattern lockscreen (Part 1/2)
828c80a Quick Settings: Actually update resources, when asked
7d167c1 QuickSettingsController.java: remove unneeded casts
216de0f frameworks/base: Dutch translations
6e7ad8a Merge "Increase lock screen widget limit from 5 to 9" into cm-10.1
a9dc9fb Use standard formula for calculating hwrotation
8b34983 Increase lock screen widget limit from 5 to 9
bea3f86 Disable touch while using the stylus (Galaxy Note)
7a3709b Merge "framework: Update German quick settings translation" into cm-10.1
b447821 Merge "Properly handle changes in phone audio focus." into cm-10.1
01ae5f6 Properly handle changes in phone audio focus.
6de4ca6 Add CPU boosting hooks
14aadb0 power: Add CPU boosting interface
b8a7e0f Update korean translation
a17c796 Add config_speed_up_audio_on_mt_calls option
72f607f framework: Update German quick settings translation
259ec99 Added hungarian translations
3cad9a7 Japanese: update translation.
0644dac base: fix constant conflict
400c665 PT-BR: Added missing translations
36f9f64 telephony: hide needsOldRilFeature
15895f30 Fixed aapt warnings
dba8a2a Possible leak in android_emoji_EmojiFactory_newInstance
d263591 Merge "values-iw: uderp" into cm-10.1
b581b82 values-iw: uderp
d765071 Merge "Framework: Fix GSM signal strength" into cm-10.1
84f678e Merge "SystemUI + framework-res: Simplified Chinese Translations" into cm-10.1
2552c8c Framework: Fix GSM signal strength
2a2485b SystemUI + framework-res: Simplified Chinese Translations
b9f8e16 Update Russian Translation-SystemUI-CM10.1
95a2ec8 Android Framework: Hebrew translation
a1cfaf1 LegacyUSB: Squashed commit with updates for 4.2
2dd13f2 ActionBar: Compute required items prior to optional items
a6519ca fix screen off animation for devices with abnormal hardware orientation
f2c3122 simplify and improve BOARD_USE_LEGACY_TOUCHSCREEN
038d2ec Legacy touchscreen: Fix B key issue
95c24a2 Process the BTN_MOUSE event
375e26c Allow compatibility with 'old' Touchscreens (Linux < 3.1)
15113bd camera: add power mode support
2082886 services: Fix tethering (softap) startup.
de3f375 Japanese : add missing translation.
6cf20a7 CDMA RIL: add SVDO support (1/2)
fe35964 CellInfoLte - Turn off debug
d4e44f4 Squashed commit of audio changes from CodeAurora
7086f42 Framework: Add Screen timeout Quick Settings Tile (2 of 2)
c582cc9 Framework: Cleanup Quick Settings Sound tiles
91b05dc Merge "SistemUI: updated romanian translation" into cm-10.1
15de978 Merge "f/b: fixed typo and updated romanian translation" into cm-10.1
ab9f5de es_ES: Added missing translations
de1a929 NfcTile: rename setState/updateTileState to setTileState. Submitting on behalf of dvtonder.
55d3847 Merge "Quick Settings:  Make Lock screen drawables consistent" into cm-10.1
fd4cce7 Merge "pt-rPT: Fix too long on/off text for setting toggle. In Portugal the international ON/OFF is prefered, and the previous values made the toggle way to large." into cm-10.1
7b1b76a Framework: Add NFC Tile to Quick Settings (2 of 2)
da2b9ae pt-rPT: Fix too long on/off text for setting toggle. In Portugal the international ON/OFF is prefered, and the previous values made the toggle way to large.
481102e am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev
0dae634 Merge "docs: add class on keyboards" into jb-mr1-dev
cee5267 am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
c8a6f8a docs: add class on keyboards
dc2c1a0 docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
ceb464b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
ec6d084 am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev
5b03460 Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev
50ed9b2 Quick Settings: Cleanup Torch tile (2 of 2)
efe5243 SistemUI: updated romanian translation
f74df09 Quick Settings:  Make Lock screen drawables consistent
c3fa25b Merge "Framework: Add Quick Settings Sync tile (2 of 2)" into cm-10.1
0b346bc Framework: Add Quick Settings Sync tile (2 of 2)
e3cc549 Quick Settings: Add 'OFF' text to GPS tile when off
3810bf6 QuickSettings : Cleanup receivers/observers
aa1add7 wifi: Set the mode at native layer
fa8af94 Memory leak due to bad destroy sequence
518edbf cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
345f7fc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
362f5c4 Merge "Quick Settings: Add Network mode tile (part 1 of 2)" into cm-10.1
b6607db Quick Settings: Add Network mode tile (part 1 of 2)
e487e53 am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
0402b65 Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev
60b54a9 Quick Settings Pulldown: Left or Right side option (1/2)
0f08867 Doc change: point developer landing page featured content to blog post.
226e973 am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
76f7774 am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
8afb3ba Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
f6e5512 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
30a842e f/b: fixed typo and updated romanian translation
a232fa3 am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev
0f0d9b3 Merge "Doc change: update develop landing page." into jb-mr1-dev
eecb674 Lockscreen VolCtrls : Don't raise volume on skipTrack
18ac557 am db49d317: Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
db49d31 Merge "Doc change: add mention of localized promo graphics." into jb-mr1-dev
2d6ed40 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
71fc6b8 am 84303f5c: Update the JNI spec link, and remove a dead link.
84303f5 Update the JNI spec link, and remove a dead link.
89523cf am 4c59230a: am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads
4c59230 am d4289c6e: am c84b3603: am 8dd6275e: Android Training: Multiple Threads
d4289c6 am c84b3603: am 8dd6275e: Android Training: Multiple Threads
c84b360 am 8dd6275e: Android Training: Multiple Threads
8dd6275 Android Training: Multiple Threads
d7d4be0 Merge "SystemUI: Request CHANGE_NETWORK_MODE permission" into cm-10.1
f66653d Merge "SystemUI: Use Settings.Global.getInt to read global settings" into cm-10.1
08641ec Framework: Bring Long press back kill app toast back
311ed73 Merge "wifi: Allow Settings to retrieve country code" into cm-10.1
f2cfa22 Merge "Camera: add ISO mode support" into cm-10.1
f62c6f9 Merge "Added hungarian translation (Done)" into cm-10.1
398ae34 Added hungarian translation (Done)
32b8120 Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
533ee9f SystemUI: Request CHANGE_NETWORK_MODE permission
a534cbd SystemUI: Use Settings.Global.getInt to read global settings
c580011 es_ES: Added CM translations
41f5488 framework: fix reference leak in activiy manager
fd5bc5b Merge "Italian translation for frameworks/base (Update)" into cm-10.1
7f37726 Merge "frameworks: updated finnish translations" into cm-10.1
0cd0875 frameworks: updated finnish translations
7f50ead Italian translation for frameworks/base (Update)
e824a0c Merge "Frameworks: German translation forward port CM10 ==> CM10.1" into cm-10.1
7a0d81f Frameworks: German translation forward port CM10 ==> CM10.1
ba8afc5 Merge "frameworks_base: Danish translation" into cm-10.1
f98c9a3 frameworks_base: Danish translation
fbf03e1 Merge "Fix FindBugs issues" into cm-10.1
0fc6191 Fix FindBugs issues
9d75c3a Merge "frameworks/base: romanian translations ported from CM10 SystemUI: updated romanian translation" into cm-10.1
28ec902 frameworks/base: romanian translations ported from CM10 SystemUI: updated romanian translation
23a0d0f Merge "Add support for HW Rotation Lock" into cm-10.1
d6ec2b2 Merge "Update Russian Translation-CM10.1" into cm-10.1
984ce59 Merge "PT-BR: Added missing translations + Merge from CM10" into cm-10.1
78782aa Update Russian Translation-CM10.1
9987133 PT-BR: Added missing translations + Merge from CM10
d8f4be7 Add support for HW Rotation Lock
875005a Merge "SystemUI: fix delay in applying am/pm setting for notification clock" into cm-10.1
9e40def SystemUI: fix delay in applying am/pm setting for notification clock
84c2f46 Merge "QuickSettings: Added ProfileTile (2/2)" into cm-10.1
c97a9de merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
858eb00 am 34bdf0ab: docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
d2a21d7 Merge "Fade recents thumbnail to transparent earlier." into jb-mr1.1-dev
1c20cfa docs: NDK r8d Release Notes
66e97da docs: SDK r21.0.1 Release Notes
3be73ab Fade recents thumbnail to transparent earlier.
34bdf0a docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696 Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
ff42694 Doc change: add mention of localized promo graphics.
5e6c05a Doc change: update develop landing page.
dfb46ce am 90172e0f: Merge "docs: App Template Tool documentation" into jb-mr1-dev
90172e0 Merge "docs: App Template Tool documentation" into jb-mr1-dev
5042b05 am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
e7c3fba Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev
8ee2a70 change onEnd() to withEndAction() in javadocs
025ec88 docs: App Template Tool documentation
05e5e4a Framework: Fix Profiles Insecure lock screen not working (take 2)
da013c4 am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev
f347e84 Merge "docs: remove developer survery link" into jb-mr1-dev
ec558d5 docs: remove developer survery link
dd2ed93 Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev
4664782 am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev
f93a294 Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev
f028264 Merge "Toast: fix force close if called from system service" into cm-10.1
bf3f2a7 Update Russian Translation-CM10.1
4b30007 QuickSettings: Added ProfileTile (2/2)
aacae76 Framework: Call Ring mode what Google calls it, not Silent mode (2 of 2)
e34357d wifi: Allow Settings to retrieve country code
24a86e7 ActivityTrigger:  New class to invoke when activity starts/resumes
2dfb68a Toast: fix force close if called from system service
6bad2f2 Handle "CODE_ALREADY_PRESENT" message from Settings app
f9cd515 Fix airplane mode
780d0e0 QuickSettings : Dismiss notification panel upon toggle
385ad47 Merge "Status bar brightness control from CM10 (1/2)" into cm-10.1
b4c4c05 Status bar brightness control from CM10 (1/2)
752d387 QuickSettings : Auto-rotate toggle fixes
b99fc61 Merge ""Clear all" button on recent apps" into cm-10.1
7ba230e "Clear all" button on recent apps
0d23e88 Camera: add ISO mode support
9efa2de Merge "Port Russian Translation from CM10 to CM10.1-SystemUI [WIP]" into cm-10.1
1537a89 Italian translation for frameworks/base
2886c6a Merge "Japanese: initial japanese translation port from CM10" into cm-10.1
5fb79cb Merge "Danish Translation Correction" into cm-10.1
1835811 Merge "Add Colemak keyboard layout" into cm-10.1
10220ec Port wimax support changes from CM9.
4f1cbd7 Merge "Add Dock USB Audio Support for Samsung Car / Desk Docks 1 of 2." into cm-10.1
f3933ea Merge "Quick Settings : Fix Sound tile" into cm-10.1
167df8d Quick Settings : Fix Sound tile
38c11fd Merge "Fix profile broadcast" into cm-10.1
7cd403e Smooth Spinners: Makes the loading "spinner" animation smoother in non-holo apps
797f1b1 Fix profile broadcast
64079ba Merge "DefaultContainerService: implement additional methods" into cm-10.1
9c85590 Fix home/menu unlock with long press hardware key
72e4485 Framework: Add option to always show battery status on lockscreen (1/2)
0318971 QuickSettings : Wifi-AP Tile
04df05b Port "Option to control cursor in text fields using volume keys (1/2)"
f050150 Merge "Port "Framework Track Control : Switch from broadcast to audio service"" into cm-10.1
7357ea8 Merge "4.2 Transition: Notification Header datetime click" into cm-10.1
9eb5b7a Merge "framework: Allow specifying max wallpaper width" into cm-10.1
809a720 4.2 Transition: Notification Header datetime click
8326b25 Merge "QuickSettings: Add light grey QS drawables for use in Settings" into cm-10.1
9ccd3fb Danish Translation Correction
7402258 Add Colemak keyboard layout
9302a3b framework: Allow specifying max wallpaper width
1d87ee2 QuickSettings: Add light grey QS drawables for use in Settings
0ed40a9 QuickSettings : Add longpress for Torch Tile
8d5af9f QuickSettings : Add torch tile
5f86de8 QuickSettings : Dismiss keyguard upon ActivityLaunch
b70b69c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
292bed2 docs: update gms auth docs for bug 7737187
435c037 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
3b16e13 am 3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev
3a494ad Merge "docs: add cursorloader class to side nav" into jb-mr1-dev
dc167dc am 9b7cb6f0: docs: Fixing broken IABv3 internal links
8ac7880 docs: add cursorloader class to side nav
0c2f090 Import translations. DO NOT MERGE
9b7cb6f docs: Fixing broken IABv3 internal links
6b922cc Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev
f5df689 Fix NPE inside DreamManagerService.
205fb10 Port Russian Translation from CM10 to CM10.1-SystemUI [WIP]
f426325 Port "Framework Track Control : Switch from broadcast to audio service"
6797a3e SystemUI: Pull down QS if x > 70% width
1458632 Revert "SystemUI: Open Quick Settings panel if there are no active notifications"
0e3849a Receive a user dictionary callback from Settings application
0f567fb Japanese: initial japanese translation port from CM10
2fc4182 am 3252eb96: am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background
3252eb9 am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background
cad9660 am 7eef172e: am ba34f097: Android Training: Loading Data in the Background
7eef172 am ba34f097: Android Training: Loading Data in the Background
ba34f09 Android Training: Loading Data in the Background
35ef45a am 28cb6150: am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service
28cb615 am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service
7096a17 am 718c7484: am f0f5efbe: Android Training: Run in a Background Service
718c748 am f0f5efbe: Android Training: Run in a Background Service
d8ba12c Framework: Quick Settings customization (Part 2 of 2) WIP!
a347169 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f0f5efb Android Training: Run in a Background Service
9de88da Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
54091f8 am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
538c8d0 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev
700f9ea am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
82703ea Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev
f83ab33 am 095d6947: docs: explain that layout height/width must be used to override include layouts
095d694 docs: explain that layout height/width must be used to override include layouts
15776a2 docs: SDK r21.0.1 Release Notes
045563c docs: NDK r8d Release Notes
5b576d0 DefaultContainerService: implement additional methods
c90b234 QuickSettings: New icons better matching stock
b38c33c Add Dock USB Audio Support for Samsung Car / Desk Docks 1 of 2.
978d1e5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
0e7cfa1 Merge "Framework: Remove orphaned Theme related code" into mr1-staging
3860981 Merge "GlowPadView : Re-enable magneticTargets" into mr1-staging
3509935 Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
9a14734 Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev
90e4146 Import translations. DO NOT MERGE
2d43fab Don't update global table when upgrading secondary users' database.
597fc33 Merge "Profiles: Airplanmode Settings with Checkbox (1/2)" into mr1-staging
93fa319 Merge "framework: fix screenshot and rotation animation for devices with abnormal hw rotation" into mr1-staging
3e65d1e android.policy: Fix launching home when waking the device with the home button again
8d037a2 GlowPadView : Re-enable magneticTargets
e2a2d16 SystemUI: Tweak number of notifications detection method
1b9117f Merge "LockScreen: allow long-press actions from hardware keys (1/2)" into mr1-staging
0031e6c SystemUI: Open Quick Settings panel if there are no active notifications
d33ef85 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2735795 Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev
eaae7d9 Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
3f96d0e If freeCache deletes APK, give out of space error
84e2756 Play a tone when wireless charging begins.
5def50d Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev
5766eda LockScreen: allow long-press actions from hardware keys (1/2)
d39a0d8 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2034070 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b055725 Hardware key custom rebinding (1/2)
32b424f Add config_speed_up_audio_on_mt_calls option
f84e114 Merge "keyguard: fix layout for 320dp devices" into mr1-staging
bbdb062 Fallback to default dream if the current dream is removed.
7406c32 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
8642f40 am 9d7578c7: docs: Edit fixes for IABv3 docs.
9d7578c docs: Edit fixes for IABv3 docs.
0aa2c7f Profiles: Airplanmode Settings with Checkbox (1/2)
ca4d4f7 Import translations. DO NOT MERGE
6c356cc core and telephony: Additional HSPAP support
0d66650 SystemUI: HSPA+ Support
9266b8e WebSettings: Add ro.cm.version to default user agent.
0561b72 CidBean : Changes to toggle between CID and Jellybean
47050d3 am 768dba6d: docs: Merged commits for final release of IABv3 docs.
9220e47 keyguard: fix layout for 320dp devices
768dba6 docs: Merged commits for final release of IABv3 docs.
7536aa5 Forward port CM Screen Security settings (Part 2 of 2)
bc7a150 Framework: Remove orphaned Theme related code
ea84c3c Framework : Lockscreen - Customizable shortcuts
8339e08 Merge "migrate vibrator to silent mode settings (1/2)" into mr1-staging
6cb6a6a Merge "Samsung STK support" into mr1-staging
32810a3 migrate vibrator to silent mode settings (1/2)
36698b4 Merge "Framework: Use the proper context when creating Bug report dialog" into mr1-staging
1105841 Merge "SystemUI: Forward port Statusbar Clock and Date actions" into mr1-staging
8d6125c SystemUI: Forward port Statusbar Clock and Date actions
fe1649f Framework: Forward port ADB over network (Part 2 of 2)
3d2aa61 Framework: Use the proper context when creating Bug report dialog
eb6cde7 PowerWidget: Re-enable LTE button.
1dde8f0 Merge "Modified Quicksettings to act just like Power Widget. Fixed Power Widget Sleep toggle with the help of Danesh M and David van Tonder" into mr1-staging
5e6afa5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
203f69f Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
0e4cc87 gps: Add support for Qualcomm GPS hardware
ef489fe Import translations. DO NOT MERGE
4abf3f9 Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
c355b83 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2b89f73 Enforce camera shutter sound for Korea.
91bb077 Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev
37a2163 Enable Turkish language encoding for Turkish SIM cards.
9df1aa5 Audioservice: Fix Theme engine support
6010430 Modified Quicksettings to act just like Power Widget. Fixed Power Widget Sleep toggle with the help of Danesh M and David van Tonder
bc305e5 Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
29cfce7 Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev
ff06719 Making sure to clear state related to views that are being recycled (issue 7650538)
b97dcaa merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
683028c Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev
a5e26a6 Samsung STK support
ea28c5a add bools to overlay for Samsung CDMA SMS decoding hacks
1ca3fa0 fix airplane mode in profiles
42e5df3 Merge "Allow mounting of multiple volumes via mass storage (framework part)" into mr1-staging
04e0597 Merge "PackageManager: fix app lib migration for device with /datadata" into mr1-staging
b3b2922 Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev
9819a61 Merge "Fix password field focus in keyguard" into jb-mr1.1-dev
0db59a8 Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
0f3af41 Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev
42df15e Fix password field focus in keyguard
3757e23 Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev
4df8270 Make it clear that non-optional MediaFormat keys are required
7b08557 Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev
ab3a5d9 am 40f7a513: docs: remove minsdkversion for clarity
40f7a51 docs: remove minsdkversion for clarity
ddd75cb Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev
07efb03 Merge "Defer process mode upon draw" into jb-mr1.1-dev
5959bf2 DO NOT MERGE Adjust update interval when expiring location requests.
16fb747 Telephony: Add getLteOnGsmMode() method (1/2)
c1988b6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
54ae2f3 Fix NPE when showing Toast from system process.
6c58b15 Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev
8aa9ae6 Fix longstanding nonsense in javadocs.
84add94 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9de0ed4 Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
1cb5ad4 am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev
147b01b Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev
b973b3a Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
174af19 am 3bb56f02: docs: add link to developer survey on main landing pages
3bb56f0 docs: add link to developer survey on main landing pages
4e46d0f Fix bug #7649607 Hebrew text is cut off in Settings
dd549bc Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev
315557b am 78d17441: docs: fix broken link on maps page
78d1744 docs: fix broken link on maps page
3341bde am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev
fc677af Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev
8a1074d am 7550a393: docs: fix AI download links
7fcb5dc Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
487f8e9 Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
7550a39 docs: fix AI download links
fff0fb8 am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
ce8e7ee Fix baseline alignment of notification times.
82e1d97 update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
94022e8 Make 3rd party lockscreen widgets work on secondary users
cc91d6b docs: update webview guide with javascript interface info
e886adb DO NOT MERGE Protect against NPE in FusionEngine.java.
82a7680 Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev
3b08bb9 am f9861221: docs: delete gps overview page
9efa222 Defer process mode upon draw
f986122 docs: delete gps overview page
e0fa1b3 DO NOT MERGE Notify provider when disposing last UpdateRecord
a7acb4b Merge "Fix for bug 7467609 Bad rendering of Telugu text" into jb-mr1.1-dev
652d8fc Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev
4eab3d8 Merge "more app launch test tweaks" into jb-mr1.1-dev
22ab700 am beb08896: docs: add backup service to gp docs
13f7734 more app launch test tweaks
7f3994e Pin electron beam surface to natural orientation.
ca83e1d Merge "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" into jb-mr1.1-dev
ab815a7 Fix for bug 7467609 Bad rendering of Telugu text
beb0889 docs: add backup service to gp docs
49ed5da Merge "Reorder tone mark and nikhahit in DroidSansThai.ttf" into jb-mr1.1-dev
526fa0e PRIORITY_MIN notifications should be truly ambient.
33669f3 Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev
80a90ef Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev
006f567 Kill dreams that do not create a timely service connection.
b6b4f17 Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
d8cb8fa Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
af5ddbf Change getName and getAddress permission to BLUETOOTH
aa9c5b6 Revised language for notification ringtone picker.
9f2532b Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev
ac555b9 framework: fix screenshot and rotation animation for devices with abnormal hw rotation
c70ebda Prevent scanning during DHCP process
81f8b7c Fix an issue on installing 3rd-party IME by a non-primary user
8ef5660 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
d8567b6 am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
47ae0b9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
147f956 Fix ring volume issue by addressing focus regression in keyguard.
9b35cd5 AudioService: Don't adjust volume when vol-downing to vibrate or silent
2cba4f1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
e0a676a Merge "Fix issue #7649590: Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev
cd6ffc8 am a06c2941: docs: revisions to GPS Setup page w/ note about emulator
a06c294 docs: revisions to GPS Setup page w/ note about emulator
844884d Merge "Fix remote views cache to avoid lockscreen widget crosstalk" into jb-mr1.1-dev
bb4ca52 Fix issue #7649590: Background windows sometimes not being hidden for secondary users
ac2e6dd Fix remote views cache to avoid lockscreen widget crosstalk
ae5b07c am 2db56dda: Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
4d1d030 am e38980a7: Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
2db56dd Merge "docs: udpate for google service landing page and capitalize GPS in titles" into jb-mr1-dev
03c172e docs: udpate for google service landing page and capitalize GPS in titles
413a208 am 555c93b2: docs: refresh gms and gcm javadocs
e38980a Merge "docs: update dashboard for 12/1, plus misc fixes" into jb-mr1-dev
555c93b docs: refresh gms and gcm javadocs
40973c5 Merge "BT is still on after enable flight mode, and reboot the DUT" into jb-mr1.1-dev
401202b BT is still on after enable flight mode, and reboot the DUT
ed3fba6 Merge "Avoid null mobile interfaces." into jb-mr1.1-dev
aaaa156 docs: update dashboard for 12/1, plus misc fixes
4fd38e8 Merge "Clean up debug messages" into jb-mr1.1-dev
fdc0d92 Merge "app launch test fixes and improvements" into jb-mr1.1-dev
f874880 Merge "Show alarm tile for the current user." into jb-mr1.1-dev
ed4cedc Import translations. DO NOT MERGE
a4e15c1 Import translations. DO NOT MERGE
0f92a80 Show alarm tile for the current user.
f688ee5 Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev
025b43c Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev
22eee87 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
16cf643 am fbcb624b: Merge "docs: update reference links and misc revisions" into jb-mr1-dev
fbcb624 Merge "docs: update reference links and misc revisions" into jb-mr1-dev
b86695d am b00e37de: docs: update location/maps doc with info for maps api
b00e37d docs: update location/maps doc with info for maps api
92e0b07 am d81751fa: Merge "docs: add javadocs for gcm" into jb-mr1-dev
d81751f Merge "docs: add javadocs for gcm" into jb-mr1-dev
223ef52 am 1a9e7a61: docs: add sdk manager launch info for eclipse
245b5e0 Port "Bind VolUp+VolDown to toggle the ringer"
1a9e7a6 docs: add sdk manager launch info for eclipse
4779ffa docs: add javadocs for gcm
fda0b50 am c7fe9fd4: Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev
c7fe9fd Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev
e36276ad docs: update reference links and misc revisions
587504a Doc change: remove old version of gcm javadoc and misc files.
3616634 am f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev
f3dda72 Merge "Doc change: updating lib links" into jb-mr1-dev
12de574 am 80aab876: move Setup link for play services
62cf1eb Merge "Remove power widget background" into mr1-staging
a24553f Underp the Underp public API... again
8c72508 Remove power widget background
726e77e Underp public API... again
d3cd41e Framework: Forward port Battery light support and fixes
5fda2d4 Framework: Forward port the ability to enable/disable keyguard with Profiles
58e2ba8 Framework: Forward port Fixes
3493cec Framework: Forward port Fix Profiles Insecure lock screen not working
c28a062 app launch test fixes and improvements
360f50e Power menu: allow enabling user switcher
96ec273 PackageManager: fix app lib migration for device with /datadata
b755c27 Doc change: updating lib links
1566144 Camera : Powerkey shutter (1/2)
80aab87 move Setup link for play services
76277df am 5f7b668c: misc changes for landing pages
5f7b668 misc changes for landing pages
6a328af Avoid null mobile interfaces.
c566b43 Fix crosstalk between users for widgets hosted in lockscreen
20b76b9 am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
1e761de Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
ed3d92a am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
404eeee Merge "docs: gcm navtree" into jb-mr1-dev
2123523 docs: gcm navtree
3a19502 am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
51f5bca Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
4673244 Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev
ce46384 Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
27dcf44 am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
037b794 Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
4e58eca docs: Fixed typo in android tool syntax.
77f3541 Add logging to try and track down bug 7643792
672b3ad docs: update javadocs with gcm @value stuff
7b1aa77 Include child windows when looking for insertion point.
f408bf8 Reorder tone mark and nikhahit in DroidSansThai.ttf
e431e6a Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev
2b84b81 Add logging to try and track down bug 7643792
0a40f2d am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev
23b4e5b Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev
d589421 Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
cb5f9db Fix bug #7651552 resetRtlProperties() is called way too often
5ea914f am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
759c100 Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
9f6cb87 Fix some typos and missing @param in android.os.Bundle
b67ab7c am 648de548: Merge "docs: gms fixes" into jb-mr1-dev
648de54 Merge "docs: gms fixes" into jb-mr1-dev
4015c3f Merge "Only show camera widget to setup users." into jb-mr1.1-dev
076324ae Fix rounding error when drawing panel handles.
924fc3e Merge "Add constant for Daydream settings." into jb-mr1.1-dev
0ce57a9 Change the text color of timer in MediaController
861c55f am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
1c92ce1 am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
0e7adaf am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
718fb9f Fix sample code issues
6f7654d Reduce false swipe-closed gestures in status bar panels.
2dd93e2 Merge "docs: add correct toc for google reference" into jb-mr1-dev
01b88d3 docs: add correct toc for google reference
24963e1 Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
438a3b3 Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
b1a01ab Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
675814d Merge "Maybe fix issue #7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
849f518 am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
6643ea8 resolved conflicts for merge of 011132a7 to jb-mr1-dev
011132a am b8da0376: Secure a handful of framework broadcasts
0a6620e Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
7311742 am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
580aa57 Merge "docs: gms and gcm javadocs" into jb-mr1-dev
3cddba2 am b74844cd: docs: revise doc titles
b74844c docs: revise doc titles
c50ed03 Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
c3eb57b Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
386165a Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
371f340 Only show camera widget to setup users.
3c4b4f7 docs: gms and gcm javadocs
6465381 docs: gms fixes
f67ca80 Revert "docs: gms javadocs"
a4f67a8 am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
49be1ef Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
2b286bb Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
a1b3b99 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2c2b232 am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2138e5c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d77982e Clean up debug messages
48e794d am 9748abb6: docs: add maps v2 announcement
9748abb docs: add maps v2 announcement
aae329e Merge "Don't apply transformation fudge when not rotating." into jb-mr1.1-dev
4b16969 Don't apply transformation fudge when not rotating.
05274f3 AudioService: improve initial safe volume delay
ebec231 Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev
6c5406a Maybe fix issue #7596986: Frequent runtime restarts; IAE at...
e1a867f Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev
818b2f3 Merge "Fixing issue where you can still click on a widget on a side page. (Bug 7568412)" into jb-mr1.1-dev
a8d63ec Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev
6eb7652  BluetoothManagerService call should allow SYSTEM_UID
4d78abf Always report user switched after unfreezing screen.
5915f61 am 830b23b7: docs: gms javadocs
64208d2 am aae17137: docs: update gms toc and landing pages
830b23b docs: gms javadocs
b36ed85 trigger kernel blocked stack trace on system server watchdog
a8ef3b0 Suppress quick settings if setup has not been completed.
fff5614 Disable adding keyguard widgets until setup is done
aae1713 docs: update gms toc and landing pages
b8da037 Secure a handful of framework broadcasts
8f1371a am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev
64e4ed8 Merge "docs: fix bug 7628699" into jb-mr1-dev
06598be Saving and restoring current page when rotating in lockscreen. (Bug 7568412)
1b86d75 Remove unused IExtendedNetworkService
05db19b Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev
5df1d87 trigger kernel blocked stack trace on system server watchdog
c08cd02 Add constant for Daydream settings.
fe0e1e4 Only show "charging" if the battery is really charging.
38e8470 Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev
7ac8bbd Fix issue #7585876: When changing the font settings, the movie...
bf79e38 Merge "Remove GB alert drawable from reboot menu" into mr1-staging
143d73d Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev
958343c Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev
5ce71b7 Remove GB alert drawable from reboot menu
bf0e87a am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev
77ea05d Merge "docs: update landing page for Google Services" into jb-mr1-dev
61885a6 docs: update landing page for Google Services
154e2d7 Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev
8f3e6d5 Fix multiuser bug in StatusBarManagerService.
f269a6f Merge "Framework: Use holo alert drawables" into mr1-staging
7023b3b Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev
de4fd60 Improve tethering notification icons
1c613b1 Framework: Use holo alert drawables
5f958e9 am 67b38c44: Cache resource ID lookups in aapt
8385c5a Allow the NFC process to call Bluetooth APIs.
24d966a Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev
6abe146 Import translations. DO NOT MERGE
eeac626 Import translations. DO NOT MERGE
16c5d1d Port "Fix display of mobile status bar icon when using airplane mode"
43b23c6 Flush the clock format when the locale changes.
9341e67 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
ce479d8 Fix for navbar back/home appearing in keyguard (multiuser).
0a4f639 Merge "Make "SD Card removed" notification dismissible if the removed SD Card is not the primary storage" into mr1-staging
217fe28 Merge "Cache resource ID lookups in aapt" into mr1-staging
9dd9e0c Fix math errors causing black screen. DO NOT MERGE
652678a timeout support for accept() and added check for signal size
a97412e Framework: Restore Keyguard-obsolete to AOSP state
cdc6d5c Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev
66cedab Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev
10479a2 Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
738b190 Merge "Import assets from UX" into jb-mr1.1-dev
3832849 Framework: Forward port Power widget fixes and fix disabling
2c41c4a Fix build.
20b9cd2 Import assets from UX
7232b0a Fix time-related ScaleGestureDetector methods
860d0cd Merge "Cleaner initial boot." into jb-mr1.1-dev
2435f98 Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
13579ed Cleaner initial boot.
035352b Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev
5a36e06 Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
13705ed Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
47918ae Secure a handful of framework broadcasts
d9e5af3 Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
b4d5a9e Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
6681be2 WFD: Fallback to PIN mode if PBC is not supported
67b38c4 Cache resource ID lookups in aapt
71175f7 Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
68e0da7 Merge "Quiet down a lot of logging." into jb-mr1.1-dev
d15321b Use the same interrupt/resume logic for all functor calls
ceafd15 am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
37f00af am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
23cc5d9 Merge "docs: revisions to gps landing pages" into jb-mr1-dev
f4d4461 Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
6f6facc Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev
e3f7c45 Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
b878ddb Fix bug #7621927 Radio button/TextView drawable regression in 4.2
f3a39f2 Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
b0d2673 docs: revisions to gps landing pages
5c0f3e5 Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev
1cf2ca8 Clean up behavior of type arguments for MediaRouter#getSelectedRoute
7538ff0 am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev
076a602 docs: fix bug 7628699
35473e6 Merge "docs: update dreamservice description" into jb-mr1-dev
f0afad0 Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev
b085023 Merge changes I93c102f9,Ie28b6bab into mr1-staging
af75378 Port "Add resource to disable the CM Phone IME selector method"
c7f55f5 Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev
17cbe6c Merge "framework: port "fix notification icons not animating till ticker is updated"" into mr1-staging
d20108d Cache resource ID lookups in aapt
7e37473 Merge commit 'android-4.2.1_r1' into mr1-staging
a3caca7 @hide API change from themes
40e9f29 Quiet down a lot of logging.
bf0e106 Merge "Cleanups in Notification.java." into jb-mr1.1-dev
54525d8 Merge "Clean up the Builder test." into jb-mr1.1-dev
5bff551 Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev
db3817d Framework: Forward port Long press back to kill app
1f30163 am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
58d55b0 am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
d60ea46 am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
a880436 am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
b7863a3 Merge "Doc update: new Notify User AU class" into jb-dev-docs
9e1abcd frameworks/base: Support for LTE network modes
4ffba37 Do not set the network mode differently for LTE+CDMA
0aae000 Doc update: new Notify User AU class
e3a94e9 am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev
d29457e Merge "docs: add new GMS landing and reference" into jb-mr1-dev
cf62cbc  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
bdc9c83 New timings for default & fallback notification vibration.
9e98927 Merge "Retain configuration change info and sync access." into jb-mr1.1-dev
6519ca0 docs: add new GMS landing and reference
b544af3 am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
5f8c2df Merge "Doc change: fix typo in jb docs." into jb-mr1-dev
1d95cb6 Doc change: fix typo in jb docs.
585c07e Stop caching stream duration, it might change (increase) dynamically.
f426ace Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev
d3203ed merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
09a526f Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev
4df6c62 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
18a4aa8 am c8d2abd8: Import translations. DO NOT MERGE
e855214 Retain configuration change info and sync access.
47a8e86 Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev
d27c81f Import translations. DO NOT MERGE
c8d2abd Import translations. DO NOT MERGE
bb53dad Remove overzealous mutate() sanity check in LayerDrawable
6ead941 Fix infinite recursive loop DO NOT MERGE
8b33f82 Port "Option to hide Adb notification icon (2/2)"
ba4ac51 Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev
8103890 Improve debugging for issue #7586414: AlarmManager wakelocks held
80e9222 framework: port "fix notification icons not animating till ticker is updated"
3dffb8c clarify Geofence.createCircle() param ranges
6f3b20c Reconcile with jb-mr1-release - do not merge
544ca85 Configurable 0, 90, 180 and 270 degree rotation
1af0841 Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev
b205431 input: Fix workaround for broken hardware keyboard support
1abc2dd Forward port Status Bar interface
02c6fca Cannot move edit text cursor to first position using character granularity.
f75dcfe Allow mounting of multiple volumes via mass storage (framework part)
930029f Make "SD Card removed" notification dismissible if the removed SD Card is not the primary storage
ee52a8d Framework: Switch to the new 4.2 handling of public symbols
de0bf8b am abb4a700: Update the content shell command\'s usage instructions.
1272e0e Fixing issue where you can still click on a widget on a side page. (Bug 7568412)
416d7cb Merge "implement noise suppression for phone calls (1/2)" into mr1-staging
7be52cb Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev
2b847c3 Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
ab972a6 Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev
e57922c Fix bug: swiped apps in Recents come back on rotate
791f877 Logging to help find the cause of widget crash in clock widget.
f7614fc Removing unecessary additional lock metadata from QuickSettings user tile.
cf21493 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9a0fbd4 Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev
4752e7d Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
7f2a989 Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev
53d9659 Merge "Allow long-press on Wifi and Bluetooth tiles to toggle." into jb-mr1.1-dev
d7794df merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
a004ff8 Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev
abb4a70 Update the content shell command's usage instructions.
18bbcf7 Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev
ce180c1 Merge "Cleanup: add PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev
a722789 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
01dfc66 am f7f1c6a7: Import translations. DO NOT MERGE
0c04639 telephony: SignalStrengh: Don't calculate a LTE snr if the srq is invalid
80092c5 Merge "Utilize CID as ADB notification icon" into mr1-staging
ab6fe4e Framework: Cleanup public.xml layout for CM additions
0c33012 Framework: Remove CyanogenMod Weather and Calendar support
6871395 implement noise suppression for phone calls (1/2)
31865f7 input: Add workaround for broken hardware keyboard support
f88d569 Framework: Forward port Expanded desktop capability
e9e4e81 Framework: Forward port Power menu config
b256939 Silence continuous warnings about lack of kernel tracing support
ad3c941 Squashed commit of the theme engine support.
7d114fb Merge "android.policy: Fix launching home when waking the device with the home button" into mr1-staging
14169ca android.policy: Fix launching home when waking the device with the home button
f7c3d7b Utilize CID as ADB notification icon
f64ee92 QuickSettings : Fix alarm intent
c5d9dc8 TEMPORARY: Reintroduce button-backlight (and respective inactivity timeout)
bbe3cbe Import translations. DO NOT MERGE
f7f1c6a Import translations. DO NOT MERGE
09592c6 Forward port Volume panel style and Linked volumes
f9eca9e Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2817d68 am 0edbc0eb: Import translations. DO NOT MERGE
2b0501b Fix a couple issues with page / outline alphas (issue 7488857)
545043e Fix reboot loop caused by keyguard appwidget cleanup
6edb6db Ignore invalid combination of PowerManager flags.
d894c8c Fix bug where icon animation is sometimes skipped
8136807 Use correct alpha value when a color is not set on a GradientDrawable.
007c64f Merge "Added app launch test." into jb-mr1.1-dev
5ae717b card emulation patch port to JB
0e5fdcf Ported: Bluetooth Message Access Profile (MAP) from CM9
3f64ede Merge "Fix IME down caret in keyguard nav bar bug." into jb-mr1.1-dev
458f43b Import translations. DO NOT MERGE
0edbc0e Import translations. DO NOT MERGE
9f8af65 Cleanup: add PointF.toString()/equals()/hashcode()
fa9b396 Copy missing state in DrawableContainer
f58e5b6 Added app launch test.
c7dd664 Merge "Fix audio focus evaluation order for display update" into jb-mr1.1-dev
4dd3fb3 Fix audio focus evaluation order for display update
d39a1f8 Framework: Add the ability to enable/disable use of Profiles
7310642 Framework: Add Power Widget (Phone)
3849b2b DexOpt anything on /system in /cache/dalvik-cache
0b636d0 Framework: Port CM9 features to CM10
dc3d76f Merge "Refactor the lockscreen camera widget, removing the bitmap." into jb-mr1.1-dev
15db00e Merge "DEFAULT_VIBRATE must always use the default vibe pattern" into jb-mr1.1-dev
4d931ac Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev
d85b8d5 Switched to another method for launching apps.
89ac38b Merge "Add missing variable copies in Path copy constructor" into jb-mr1.1-dev
bc7b6fc Fix IME down caret in keyguard nav bar bug.
4a7a9b9 DEFAULT_VIBRATE must always use the default vibe pattern
a711d1e am 55340e51: am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
1586168 am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev
272247a am aaec7269: (-s ours) Notification vibration improvements: [DO NOT MERGE]
8d03305 Hide current soft input when a background user gains window focus.
55340e5 am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
7112cd4 am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
2f9947e am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
ddf10d4 Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
a3a4913 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b361b30 Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
cc2e849 Notification vibration improvements: [DO NOT MERGE]
e9812ba Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev
7018cfd Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
8415ee2 Add support for ICS camera blobs
dc55ecd Add an option to change the device hostname (1/2).
3f4e833 Add framework definition to include Torch
c8ae471 samsung: add support for tvout and yamahaplayer services
d9c36b0 Wifi: Allow configuration of the P2P ifname
4464943 servicemanager: Allow tegra audio to register as a service
aaec726 Notification vibration improvements: [DO NOT MERGE]
5cca51e Remove references to removed notifications.
df42aaf Remove duplicate notifications
214b4de Audio: Organize, include only newer ringtones
17c08c9 Sounds: remove misplaced/duplicate file
bc94b4c AudioPackage5 contains duplicated bad-case filenames
5eb83aa Ignoring FUL unlock signal if user changed fixes b/7572354
b0f895b Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev
0552c5d Refactor the lockscreen camera widget, removing the bitmap.
6c9a1a1 docs: update dreamservice description
02053d1 Merge "Show mobile data RSSI for devices that support it." into jb-mr1.1-dev
0d3eb5f am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev
ce4f5e5 Refresh the status bar clock format on user switch.
721b370 Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev
ff59413 cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo
5052805 Show mobile data RSSI for devices that support it.
2656abe Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
e007c0e am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
50a8911 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
bd7ff05 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
7e5fc45 am 9d45abd4: Import translations. DO NOT MERGE
3a3a84e Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
1f33e64 Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev
fa0853e Add missing variable copies in Path copy constructor
7b0c877 Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
75b5cfb Delete appWidgetId when removing lockscreen widgets
32f0742 Only wipe device if primary user (for failed password attempts)
05163aa Fix keyguard pin/simpin/simpuk RTL-ization
f3cd8e5 Import translations. DO NOT MERGE
af673f8 Import translations. DO NOT MERGE
a9c0bb4 Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev
116133a Import translations. DO NOT MERGE
9d45abd Import translations. DO NOT MERGE
a22aae3 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
acddb72 Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev
159cdd9 am 33e499ea: docs: move articles into group directory
6738eee Cleanups in Notification.java.
ab51002 Allow long-press on Wifi and Bluetooth tiles to toggle.
33e499e docs: move articles into group directory
15451bd Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
ef48662 grant shell user EXPAND_STATUS_BAR permission
e3ac532 am fa1320e6: docs: revise getting started intro
fa1320e docs: revise getting started intro
4c7a5d6 am 4e2e9bae: docs: update checksums/sizes for new adt bundles
4e2e9ba docs: update checksums/sizes for new adt bundles
4f78450 am d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
d4ff824 Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
49ba8eb docs: update sdk install to handle both 32 and 64-bit bundles
6189888 Merge "Making sure launcher doesn't show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
3fcc6b2 Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
bc96250 Make sure that the owner user is marked initialized.
b02eb4b Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev
a1a2f96 Pushing state persistence to a background thread
674a131 Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev
f5377a7 Merge "Useful annotations for code documentation." into jb-mr1.1-dev
7420ab6 Merge "Utility to format human-friendly durations." into jb-mr1.1-dev
a319d65 Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
445767c Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev
f6ba84b Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
1f4c9d3 am 7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
7425bf8 Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
9886540 docs: fix ndk tos layout for small screens
988571a am bce26803: docs: fix broken youtube playlists
bce2680 docs: fix broken youtube playlists
47972ce am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
480ac7f am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
596d0e3 am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
f53c5f3 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
d1ae272 Merge "Doc Update: Fixing images" into jb-dev-docs
ecc2bcb Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
3893925 am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c3b6ee6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
8264bd8 am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
aaf3fbc Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
36c7d31 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
020d652 Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev
83b2596 Merge "Notification vibration improvements:" into jb-mr1.1-dev
8701bb9 Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
0622ed7 am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev
0034bea resolved conflicts for merge of 783e115b to jb-mr1-dev
783e115 resolved conflicts for merge of e907a390 to jb-dev-plus-aosp
1019a9c Doc Update: Fixing images
91cd7a7 Doc Update: Removed "no guaranteed delivery" line.
7d529cd Fix Javadoc for View layoutDirection / textDirection / textAlignment
681ae7f Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
e907a39 am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
22cc276 implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
335cbfa am e3be79be: Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
e3be79b Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
bb0cbae Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode
ca22aee am 8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
8680f8f Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
226fe97 docs: add warning for adt bundle on 32-bit os
0be607c Avoid runtime restart after vold reconnects.
205ec5a Clean up the Builder test.
d4d2de2 Do not vibe when the default notification sound is Silent.
75819a9 Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev
f4ad019 am 73b1f68e: Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev
73b1f68 Merge "docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348" into jb-mr1-dev
8fcab20 docs: Updated uiautomator API docs to reflect correct API level. bug: 7538348
edbb380 Notification vibration improvements:
3d4f229 docs: Added note on MIPS system image additions
8aa3db4 am 6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev
6ed4801 Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev
5ca045e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2a45c15 docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
e3ade13 Import translations. DO NOT MERGE
dd0ffba Import translations. DO NOT MERGE
0a26a6c Import translations. DO NOT MERGE
2303f42 Import translations. DO NOT MERGE
99a86d0 Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
53f6e8a Utility to format human-friendly durations.
61ecb02 Resolve LocationManager + ActivityManager conflict
4e22ad3 Settings shows it is connected to A2DP, though the device is not actually connected
faa38a0 am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
4422596 am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
ce37f1d am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
4979a0b am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
5f32d33 Merge "Notification.java javadoc: addAction" into jb-dev-docs
e05d4de am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev
9b70346 Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev
3bdf4b6 docs: Update platform version page with 4.2 release
17a3f23 am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev
f20b146 Merge "docs: add ndk tos wall" into jb-mr1-dev
66e642b docs: add ndk tos wall
9d82d32 Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev
c1d5db7 Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev
c10914c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
ed41bc2 am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev
c178ebe7 Merge "Doc change: update image for landing page." into jb-mr1-dev
b5e15ca Doc change: update image for landing page.
a9e6089 am bd2b5313: Merge "docs: edits" into jb-mr1-dev
bd2b531 Merge "docs: edits" into jb-mr1-dev
ca211c7 docs: edits
9885af0 am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
9508e31 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2c37f7b Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev
03fb569 am 574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev
574c2cb Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev
5617b06 docs: add templated tabs for jb highlights
98fc49a am 64b12118: Doc change: edits and landing page.
64b1211 Doc change: edits and landing page.
56411cc am b4d28dbf: Merge "Doc change: image optimizations for docs." into jb-mr1-dev
b4d28db Merge "Doc change: image optimizations for docs." into jb-mr1-dev
4cddf7f am 5878e2b3: Merge "docs: fix bug with unknown anchors" into jb-mr1-dev
f8dbf37 am 2c7e6cb7: Merge "docs: add tabs to JB highlights" into jb-mr1-dev
8ae77b6 am 23492df7: Doc change: resize some assets for highlights.
6293aff am e320ac7a: Merge "Doc change: edits to highlights files." into jb-mr1-dev
5878e2b Merge "docs: fix bug with unknown anchors" into jb-mr1-dev
3a535a4 docs: fix bug with unknown anchors
5ac04f3 Doc change: image optimizations for docs.
2c7e6cb Merge "docs: add tabs to JB highlights" into jb-mr1-dev
0d881cb docs: add tabs to JB highlights
23492df Doc change: resize some assets for highlights.
e320ac7 Merge "Doc change: edits to highlights files." into jb-mr1-dev
8fe0360 Doc change: edits to highlights files.
46ba786 am 65bd44fe: Merge "docs: add jb mr1 api overview" into jb-mr1-dev
65bd44f Merge "docs: add jb mr1 api overview" into jb-mr1-dev
5765525 docs: add jb mr1 api overview
88b831a am c17faf82: Merge "Doc change: Add Android 4.2 platform highlights." into jb-mr1-dev
c17faf8 Merge "Doc change: Add Android 4.2 platform highlights." into jb-mr1-dev
c542215 Doc change: Add Android 4.2 platform highlights.
0fe6feb am b03ce7eb: Merge "docs: add fs to rs" into jb-mr1-dev
b03ce7e Merge "docs: add fs to rs" into jb-mr1-dev
3419e07 docs: add fs to rs
d60c7a9 am 19a346ae: Merge "Doc change. Add diff report for API level 17." into jb-mr1-dev
19a346a Merge "Doc change. Add diff report for API level 17." into jb-mr1-dev
c946918 Doc change. Add diff report for API level 17.
28034d4 am ee5c84c4: am 0693ffa9: am ddf5efdf: am 52bfaaf7: docs: Android SDK Tools r21 Release Notes
ee5c84c am 0693ffa9: am ddf5efdf: am 52bfaaf7: docs: Android SDK Tools r21 Release Notes
0693ffa am ddf5efdf: am 52bfaaf7: docs: Android SDK Tools r21 Release Notes
ddf5efd am 52bfaaf7: docs: Android SDK Tools r21 Release Notes
52bfaaf docs: Android SDK Tools r21 Release Notes
0d456c5 am 625c1083: Merge "docs: Support Library r11 Release Notes" into jb-mr1-dev
625c108 Merge "docs: Support Library r11 Release Notes" into jb-mr1-dev
89f5cd7 Merge "Fix "keyguard unresponsive" bug" into jb-mr1.1-dev
359c78a am f887b563: Merge "Doc update: Appwidgets MR1 lockscreen support." into jb-mr1-dev
f887b56 Merge "Doc update: Appwidgets MR1 lockscreen support." into jb-mr1-dev
b70d528 am f2bc6819: am ef651ee6: am b590b0b3: am 6453dfb7: update Download and installation guides for ADT Bundle
f2bc681 am ef651ee6: am b590b0b3: am 6453dfb7: update Download and installation guides for ADT Bundle
ef651ee am b590b0b3: am 6453dfb7: update Download and installation guides for ADT Bundle
b590b0b am 6453dfb7: update Download and installation guides for ADT Bundle
6453dfb update Download and installation guides for ADT Bundle
c120b6e Fix "keyguard unresponsive" bug
1292f1e docs: Support Library r11 Release Notes
af9ebaf am 7b2483f8: docs: Fixed formatting in this file.
7b2483f docs: Fixed formatting in this file.
30452fb am 422b1959: am 76b1be8b: am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs
422b195 am 76b1be8b: am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs
01774bd am fabcff5c: Merge "docs: Added new docs for uiautomator testing framework." into jb-mr1-dev
76b1be8 am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs
fabcff5 Merge "docs: Added new docs for uiautomator testing framework." into jb-mr1-dev
39cc8f8 am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs
4233c93 Merge "Doc Update: param name change" into jb-dev-docs
2128ec9 Doc Update: param name change
a2b4367 am 95d5be9e: am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
207559a am fbaa232c: am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
95d5be9 am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
fbaa232 am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
0edd4d0 am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
dddb1e5 am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
5acc379 Fix bug #7457897 Error icons are not shown in credit card entry form
180200c am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
1c350fa am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
aac29f1 Merge "docs: NDK r8c Release Notes" into jb-dev-docs
cee5dab Merge "docs: JOBB tool help page" into jb-dev-docs
94b3f8e docs: Added new docs for uiautomator testing framework.
dac1813 Add xxhdpi version of default activity icon
7407c94 Watch for leaked ParcelFileDescriptors.
8b2c3a1 Useful annotations for code documentation.
0349ae9 am b9a2a040: Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev
b9a2a04 Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev
3012b39 am e83f3072: am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
51e99cf am b50e7e0f: am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
e83f307 am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
b50e7e0 am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
c1291f7 am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev
67ba5d1 docs: 7 tap instructions for dev options
282e9fc Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev
bc0edec Merge "Increase readability of connectivity event log." into jb-mr1.1-dev
c5b47cf resolved conflicts for merge of 7f9a0535 to jb-mr1-dev
f6f47e9 Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
fadf669 Import translations. DO NOT MERGE
725a2ff Reconcile with jb-mr1-release - do not merge
7259d88 am 4c0fc03b: When in vibrate mode, all notifications will vibrate.
4c0fc03 When in vibrate mode, all notifications will vibrate.
9a7debe When in vibrate mode, all notifications will vibrate.
4f017e7 Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev
e72e2b7 am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev
71789e1 When in vibrate mode, all notifications will vibrate.
85abb08 Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev
002618b docs: update Tools landing page with info for developer options
9d6d890 Reduce verbosity of service event logging.
ad08e6d Merge "Emit event log message when switching users." into jb-mr1.1-dev
5624af2 merge in jb-mr1-release history after reset to jb-mr1-dev
2528b50 Increase readability of connectivity event log.
df2670f am ba52aff4: Import translations. DO NOT MERGE
798de53 Merge "Reduce emulator logspam" into jb-mr1.1-dev
86597df Emit event log message when switching users.
ba52aff Import translations. DO NOT MERGE
43d8451 Disable navbar searchlight if search assist not available.
18f9518 Reconcile with jb-mr1-release - do not merge
d861590 Synchronize access to Locked methods. DO NOT MERGE
913f13e merge in jb-mr1-release history after reset to jb-mr1-dev
325be8a Reduce emulator logspam
c1ae43a am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev
b82b3b5 am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev
f69320a Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev
3e9cba4 Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev
7edb7a5 Doc update: Appwidgets MR1 lockscreen support.
c276e82 Deferring size callbacks until boot completed (issue 7469267)
8b73fc1 am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
2b4bc30 Merge "DO NOT MERGE Control access to tts objects" into jb-dev
71a408b Reconcile with jb-mr1-release - do not merge
b61fba5 merge in jb-mr1-release history after reset to jb-mr1-dev
40f8211 Preventing more than five widgets from being added in the carousel (issue 7502935)
63bc6c1 am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
a46a74f Merge "Remove extraneous logs." into jb-mr1-dev
7ff3011 Remove extraneous logs.
82b18e8 am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev
f080dc0 am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
38883bd am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
f6b6462 am 14adfe42: Address comments from merged "Fix remaining jank in sec..."
baee9ed am 7a73344b: Minimal fix for stuck google now.
271add4 am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
4767479 am eb963f04: Enforce max number of 5 lockscreen widgets
38515e9 am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
6c7d2c2 am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
2c29dea am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
2cfb937 am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
f3eaabb am a9fa92e8: Keyguard - force showing the status bar
e0dd7c4 am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.
640cf0a am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
1882596 am 70c2f873: Synchronizing bouncer duration with page scaling duration.
3a54aae am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
318d87f am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
868edfd am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
062e01c am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.
e9c881c am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
1323fe3 am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
75298e3 am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
f3add31 am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
0e767b2 am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
27ed0c2 am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
efacf14 am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
4bd4b78 am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
0e53854 am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
b193877 am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
090c790 am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev
9477f8d am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
0fcb5cd am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
30717b6 Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev
7317686 Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev
7599394 Reconcile with jb-mr1-release - do not merge
9de5901 Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev
b499b1f Don't crash if no ECA.
7d59cf9 Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
e1a8eee allow pattern linear layout to manage message_area.
4eada64 Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
bfb8a7b am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
0214f2b AudioService: undock audio glitch - DO NOT MERGE
6ed3fca Only show the bouncer for the assistant if secure.
cd3231f audio service fix dock after crash - DO NOT MERGE
14adfe4 Address comments from merged "Fix remaining jank in sec..."
7a73344 Minimal fix for stuck google now.
899e6c7 Merge "Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
eb963f0 Enforce max number of 5 lockscreen widgets
bac6d4b Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
c8ed8d3 Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
e1a473b Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
9e0a250 Don't show ECA in landscape mode on phones.
6be441c Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
08c83ef Adding user activity when the challenge is slid down
4eeb4f6 Add mechanism to kick keyguard to show the assistant
5dd8b00 Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
a9fa92e Keyguard - force showing the status bar
efbfa68 add bouncer frame to glowpad.
2cacda5 Disable interactive mode for full-screen security views in keyguard.
1e0f6fa Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
70c2f87 Synchronizing bouncer duration with page scaling duration.
44dc141 Clean up some flashy jank (issue 7454766)
838195d Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
9eacab8 am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
3fe2cb4 Merge "Don't cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
cf2b7a2 Compress lockscreen's account login fallback to fit.
e7e210c Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
2635750 Adding workaround to fix issue where the bouncer animation had the wrong pivot.
1e29e49 Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
3fbbbb6 Fiddle with keyguard glowpad layouts
ae0161e Merge "Don't handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
71b7d89 Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
74da109 Support Wifi display devices that rename themselves.
d8e2fdf Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
14c8933 am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
d9da50b am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
c0cbe8a am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
74c5d53 am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
e4e6c97 am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
7086987 am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE
d955088 am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
b579714 am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
4d0e5e0 am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f837e41 New asset for assist affordance on lockscreen.
eec4fe2 Use stable layouts for keyguard/SlidingChallengeLayout
8bbafed Don't handle click events on the emergency button in bouncer mode
3c9297c Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
016b862 merge in jb-mr1-release history after reset to jb-mr1-dev
5c53388 Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
4181e8a Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
c065a5d Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
65b59f5 am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
1af587b am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
4623c0d docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
85c4281 Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
5da893c Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
5ec00e9 Don't cancel any notifications that are meant for all users, if no package is specified.
d51700b Fixing up overscroll asset / sizing
1f6cf5f Merge "Re-use existing thread" into jb-mr1.1-dev
cd1f309 Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
f6ab5f9 Add one more check for detecting crashes while inflating multiuser widget
4096288 Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
edc74ab Implement fallback clock in keyguard
7ce0c13 Slide unlock cannot get accessibility focus.
fd8c388 Merge "Fix bug where newly added widget wasn't always shown" into jb-mr1-lockscreen-dev
3e66286 Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
f988bdf Fixing up glowpad scaling issues (issue 7494378)
1413889 Fix bug where newly added widget wasn't always shown
c717d11 Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
de974f6 am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
eb3aa44 am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
972dd43 Merge "Final icon for notifications panel" into jb-mr1-dev
eeb6255 Fix keyguard measurement bugs
eb6cbc2 am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
4abe2d3 am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
ad84f7f Merge "disable geofences for secondary users" into jb-mr1-dev
8e3bf41 Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
d2dec00 add logging to enableUserSelectorIfNecessary.
1ce8043 Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
02253f4 merge in jb-mr1-release history after reset to jb-mr1-dev
cd3d75f Re-use existing thread
b524f4b Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
8d40d04 Notification.java javadoc: addAction
2d09880 am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
7b5a927 am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
afc5210 Merge "Fix docs to refer to the correct class." into jb-mr1-dev
91f080c add some defensive code to enableUserSelectorIfNecessary.
62e2374 am 32226b73: (-s ours) Import translations. DO NOT MERGE
0d29833 am 32226b73: Import translations. DO NOT MERGE
32226b7 Import translations. DO NOT MERGE
d44c434 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
8f837a6 Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
4eb36cf Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
db60b67 am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b97aade am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
fc958f1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6398510 Reconcile with jb-mr1-release - do not merge
2d6a1b7 Import translations. DO NOT MERGE
66453ff am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
506fd3b Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
ffe0cb4 Avoid recycling recently removed user IDs.
fcd7ad4 am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev
5246b8a merge in jb-mr1-release history after reset to jb-mr1-dev
59d73ab Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774" into jb-mr1-dev
081e6b7 am 0fc1b5ec: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
dac8d6d am a40ec75e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
6f562e9 am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
b38b3ed am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
53d8196 am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
9885568 am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
3dcb362 am 34c4fe52: Fix remaining jank in secure add-widget transition.
c703793 am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
96c3f7e am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
3c0a353 am 9799714f: Keyguard layout tweaking/reworking
f74cac4 am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
52bf955 am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev
16a3f4c am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev
1aad5be am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
1cbb449 am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
6285533 am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
259e312 am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
96f6491 am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
f83ace0 am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
de565f3 am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
b000c36 am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
888322a am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
43ecd19 am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.
fe7e94a am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
2f4be24 am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
441d340 am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
a7af020 am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
22559dc am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
950f947 am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
98f95b3 am f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev
8768278 Fix docs to refer to the correct class.
a8540f2 Reconcile with jb-mr1-release - do not merge
0fc1b5e am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
a93f94d am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
512950a Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
a40ec75 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
1b80345 Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
8dbf3b8 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
cf9ee4c Merge "Don't pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
6b4ab7f Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
2750167 Centering FUL fixes b/7480608
a042ac9 Don't pop the IME for passwors at ScreenOn on tablets.
f55769f Low battery dialog should use UserHandle.CURRENT.
34c4fe5 Fix remaining jank in secure add-widget transition.
8b117c8 Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
cabcc59 Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
192d6d4 Allowing rotation while adding lockscreen widgets
1361758 Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
e41dd0f Giving glow pad the brains to scale itself dynamically (issue 7449554)
9799714 Keyguard layout tweaking/reworking
a976860 Attempt to fix NegativeArraySizeException crash in keyguard
9edc48e Merge "Updated assets." into jb-mr1-lockscreen-dev
fa61fc8 Updated assets.
9d0d796 Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev
42164ef Merge "Ensuring bindAppWidget isn't called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev
efb3ffb Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
835579e Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
76017ca Removing sticky widgets in lockscreen
0928e01 Fix emergency call area updates.
80d1781 merge in jb-mr1-release history after reset to jb-mr1-dev
7ccb280 am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
ad9f594 am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
5fff5f0 Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
567a291 Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
a76f7db Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
ee8fab8 am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
bc69698 am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
872965b Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
5111726 Handle DevicePolicyManagement and safe mode when inflating widgets
1c2e494 Use a consistent policy for filtering wake keys.
7b9b41c am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
475255b am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
1b3b254 Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
e980adf am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
688d98f am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
4a1b6e4 Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
d1cc187 Dismiss error icon on setError(null) [regression] Bug #7442935
7f9a053 am 856e24d8: am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
856e24d am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
511d534 Stop supplicant and dhcp before start
7136544 Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
9d34f9d Keyguard - MultiPaneChallengeLayout measurement/layout changes
a90a18d Make partially visible widget pages not important for accessibility.
8d80325 am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
446ffe0 am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
5fcca70 Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
bbe5caf Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
6cf53bb Using screen dimensions to calculate the expanded PagedView dimensions.
e6299d5 Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
da8f622 animating challenge closed should close the challenge.
f5525b9 Import translations. DO NOT MERGE
7e28e06 Import translations. DO NOT MERGE
088fb91 Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
e5f4562 Import translations. DO NOT MERGE
2d9fae2 Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
7741e620 Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
f345680 Reconcile with jb-mr1-release - do not merge
207d548 Show the assist ring on center-button longpress on lockscreen.
0e1608c Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
d6f8960 Making sure the sticky widget logic works with music
f0de33b merge in jb-mr1-release history after reset to jb-mr1-dev
717797d am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
5eac4d8 am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
9f79d0d Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
f763b71 Merge "Authenticate correct user's account when pattern fails multiple times." into jb-mr1-dev
b93031e am 65cbcbea: Remove add widget transition jank (insecure).
8aa6236 am ae73c690: Fix regression in camera transition.
3eaa876 am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
be2ca79 am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
8eb3048 am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
e97c6fa am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
f154c9b am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
a8e1d11 am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
6d47e9f am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660)
d811f27 am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
4e8a47e am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev
0ca353f am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
58bbc5f am 5da6430f: Optimize keyguard/IME interactions
cc2a14a am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
f7e47a0 Merge "specify start value: Drawables don't have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev
03ad0c0 make challengeShowing sticky across bounce.
50bf545 specify start value: Drawables don't have getAlpha(). also, some clean up.
55e7bdc Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
b1df8bc Final icon for notifications panel
85a08f1 Attempted fix for issue 7469415
cade004 Removing callbacks in onDetachedFromWindow, fixes b/7465673
56e675b disable geofences for secondary users
a72b3aa Add Coin graphic to premium-sms dialog.
fa2dbd6 Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
4cd0a50 Fires geofence if the device is already in the geofence area.
65cbcbe Remove add widget transition jank (insecure).
ae73c69 Fix regression in camera transition.
b9a870b docs: Minor Nexus 10 fix in Device Art Generator
af73b9e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
08924d0 Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
7dfc588 Workaround for layout bug in SIM PIN/PUK views
87d0366 Fix NPE caused by applications that try to hide keyguard while it's not showing
bfec0a8 Add isSafeModeEnabled() API to WindowManagerService
0a75b94 Supporting EXTRA_APPWIDGET_OPTIONS correctly
469f621 merge in jb-mr1-release history after reset to jb-mr1-dev
2c7bc26 Authenticate correct user's account when pattern fails multiple times.
bb8abae am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
624ea44 am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
0f4d5df Merge "View's visibility to the user not checking predecessor alpha." into jb-mr1-dev
c87f198 Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
06da337 am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
6c64208 Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
48275d2 Adding bouncer animation on PagedView. (Bug 7459660)
9ff6d4f Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
5a2c5f0 Keyguard sanity checks for when layout is not yet complete
79e0f87 Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev
6f72b1c Fix small widgets not showing up on tablet (issue 7471516)
af0d09b am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
00b5ed8 Merge commit 'b3f87c24ee86227e22b2db9b04f3d94519f230f9' into jb-mr1-dev
5da6430 Optimize keyguard/IME interactions
a9cfe67 Add programmatic access to setters in TextClock Bug #7478328
ff91b17 am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
db426cc am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
72bba58 TextView not respecting "speak passwords" setting when adding before text to events.
046671a am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
fbcfb5d am 50c2275c: Android Training: CursorLoader
50c2275 Android Training: CursorLoader
b3f87c2 Merge "bouncer: hide more text and frame less." into jb-mr1-lockscreen-dev
7c6863b am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
44c4bba Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
9cc531c docs: fix markup error bug: 7456071
de2c319 am 737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev
737a20f Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev
1cab31a Camera: Document new video snapshot picture size behavior.
025fb93 Clearing connected message in stop fixes 7401152
c0ae9e6 bouncer: hide more text and frame less.
d812e7a am fca8d258: Merge "Remove power menu user switcher" into jb-mr1-dev
fca8d25 Merge "Remove power menu user switcher" into jb-mr1-dev
57f928f Recover from badly behaving 3rd party secure cameras.
0889837 Show bouncer mode for Slide mode in keyguard if widget isn't expanded
9f225d7 Merge "Making challenge come back if within the same gesture you return to the original page (issue 7422999)" into jb-mr1-lockscreen-dev
8a6db8a am 8cf1ea90: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
746a7ab Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
8cf1ea9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
8caabad Making challenge come back if within the same gesture you return to the original page (issue 7422999)
7f6bb6e Ensure edge swiping is enforced immediately upon showing keyguard (issue 7453156)
2522880 Fix issue 7468224, make sure to size pages if page changes
180cfd5 If a default keyguard layout isn't specified, fallback to the default layout
6275b3f Use better signal for camera launch.
37d84ae Render camera widget on a background thread.
f70239a Fully block user interactions when transitioning to camera.
47eb0c1 am 2ea9bae7: Fix issue #7457380: IME leaves a mark after user switching
934d083 Fixing up overscroll / hints on tablet
5d47a8d Cleaning up the overscroll effect
db1c5d5 Updating UI to new design, widget shouldn't expand until page settles (issue 7467435)
7cefef7 Merge "Making screen hints just side page outlines, as per new design (issue 7467968)" into jb-mr1-lockscreen-dev
45adaa7 Making screen hints just side page outlines, as per new design (issue 7467968)
2ea9bae Fix issue #7457380: IME leaves a mark after user switching
fe43e2b Merge "Attempt to fix MENU key issue." into jb-mr1-lockscreen-dev
90264e1 merge in jb-mr1-release history after reset to jb-mr1-dev
aa200e2 Merge "Clean up separator string in keyguard view" into jb-mr1-lockscreen-dev
e93d1b4 Clean up separator string in keyguard view
5569abc am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into jb-mr1-dev
75931e0 Attempt to fix MENU key issue.
841ce67 Merge commit '81af21e67cd842d16d4b45e8a2d1ec56ff8d764f' into jb-mr1-dev
11f19f1 View's visibility to the user not checking predecessor alpha.
81e7736 Merge "Update DevicePolicyManager documentation with new keyguard flags" into jb-mr1-lockscreen-dev
f74d0c3 Merge "Polish user selector accessibility." into jb-mr1-lockscreen-dev
383df1e am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
1c74365 Merge "Sanity check network stats coming from disk." into jb-mr1-dev
912133a Remove power menu user switcher
b0a579f Sanity check network stats coming from disk.
ff105ea Merge "Fix pages disappearing (issue 7456885)" into jb-mr1-lockscreen-dev
3520774 Update DevicePolicyManager documentation with new keyguard flags
fc9c4cd Polish user selector accessibility.
e7b3ed2 am e96e0a1a: Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
196cde9 Fix pages disappearing (issue 7456885)
e96e0a1 Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
35e0186 am 685cc8c7: Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev
685cc8c Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev
78bc990 am 8ae0420e: Merge "Fix issue #7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev
8ae0420 Merge "Fix issue #7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev
369cf0c am d9134e7a: Merge "Revert partial RTL\'ization of Editor.setError()" into jb-mr1-dev
d9134e7 Merge "Revert partial RTL'ization of Editor.setError()" into jb-mr1-dev
3d96f94 am 0600ab78: am b14c9900: am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
0600ab7 am b14c9900: am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
b14c990 am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
9812973 Fix issue #7343200: Fails to show wallpaper in the background for...
a295ba4 Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
81af21e Merge "hide the correct text, and more text, on bounce" into jb-mr1-lockscreen-dev
052999f hide the correct text, and more text, on bounce
a96cd63 Merge "Improve PIN key layouts." into jb-mr1-lockscreen-dev
80bc85a Improve PIN key layouts.
ecbd68b Resolve USER_ALL when inflating notification views.
807c1a9 Merge "Obscure speech for PIN password keys when no headset plugged in." into jb-mr1-lockscreen-dev
0cbbc57 Obscure speech for PIN password keys when no headset plugged in.
b8e58bb am 28e8f76c: Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
28e8f76 Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
f3b9ec8 Initial changes to allow dropping on delete target to remove widget.
febea58 Merge "hide multiuser selector when IME is up." into jb-mr1-lockscreen-dev
5f69f38 hide multiuser selector when IME is up.
75defb6 Decrement number of updates in LocationRequest
cc5c168 am 37238e5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
37238e5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1ec4646 Block swipe up gesture if challenge non-interactive.
79417e8 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
78a8f12 Properly disable challenge handle.
a9b4682 Disable disable back if using an alternate back icon.
bb5c941 Disable security handle when swiping into camera widget.
e506ae1 Import translations. DO NOT MERGE
dd8ac78 Merge "Fix small issue with previous CL" into jb-mr1-lockscreen-dev
d7ad778 Import translations. DO NOT MERGE
86006bb Fix small issue with previous CL
5809c25 Import translations. DO NOT MERGE
b185262 Import translations. DO NOT MERGE
2df294e Merge "Widget size policy, size callbacks" into jb-mr1-lockscreen-dev
90d0db3 Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
d6fe75a am 98b930ce: Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
98b930c Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
4ddcd57 Widget size policy, size callbacks
e732421 Merge "Only suppressing FUL on boot if selected fixes b/7338965" into jb-mr1-lockscreen-dev
aaf9b11 Don't show security method until we actually return from the camera
52070c1 Merge "PUK support." into jb-mr1-lockscreen-dev
d6c4884 Fix whitespace problem and sync with prototype.
23d7a6e PUK support.
261b18a Fix build.
f58f1b9 Revert partial RTL'ization of Editor.setError()
b30ddd9 Merge "SIM PIN support." into jb-mr1-lockscreen-dev
53149e6 SIM PIN support.
4b22662 merge in jb-mr1-release history after reset to jb-mr1-dev
9de90c1 Merge "Use clock's widget as the default keyguard widget" into jb-mr1-lockscreen-dev
67a871d Use clock's widget as the default keyguard widget
324545d Merge "Add configurable em-dash separator for all concatenated keyguard strings" into jb-mr1-lockscreen-dev
e9be140 Add configurable em-dash separator for all concatenated keyguard strings
b1260af Merge "Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)" into jb-mr1-lockscreen-dev
10d29e1 am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev
ebbf5ee Merge changes Ib3133583,I0262172d into jb-mr1-lockscreen-dev
39912f7 Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev
e72855e Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
a94c319 Cannot click on partially visible views in touch exploration.
2681faa docs: explain implicit permissions applied by sdk versions bug: 7453055
d259263 am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
62831a7 Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
ed7a026 am 30fd78e2: am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
30fd78e am a47776c9: am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
a47776c am 2cff3eea: am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
2cff3ee am f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
f19804b Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
82c292e am 7ab7f538: Hide new location APIs and undeprecate old ones
7ab7f53 Hide new location APIs and undeprecate old ones
f3e08f3 am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
872e3d3 am b9372de0: Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev
74474e7 new dashboard stats for 11/1, platform version only
465c375 Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
f19cce1 Merge "Revert "Pushing state persistence to a background thread"" into jb-mr1-lockscreen-dev
b9372de Merge "More debugging for issue #7343200 Fails to show wallpaper in the..." into jb-mr1-dev
b6f8337 Revert "Pushing state persistence to a background thread"
64e5919 am 1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
529e744 More debugging for issue #7343200 Fails to show wallpaper in the...
6917cec Merge "Pushing state persistence to a background thread" into jb-mr1-lockscreen-dev
1e70197 Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
039206a Pushing state persistence to a background thread
dc08142 Merge "Keyguard - fix overzealous sliding security view" into jb-mr1-lockscreen-dev
9c2c77f Keyguard - fix overzealous sliding security view
7f0458e am 7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev
7e1a45d Merge "Fix accessibility API injection." into jb-mr1-dev
87bb019 am a84c9639: Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev
a84c963 Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev
893634a am f9e7b618: am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
992ceef Fix accessibility API injection.
f9e7b61 am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
93a9a0a am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
b2eeb1e DO NOT MERGE Control access to tts objects
0fc15da am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
677c1e1 Merge "docs: google market -> google play" into jb-dev-docs
7dcacd5 Change android.permission.SERIAL_PORT to signature|system.
601dbad am 1f177cb8: am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide
1f177cb am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide
e639d67 am d2e16346: am ac294abb: Revision to Notifications API guide
779b774 fix NLP for COARSE applications, build FLP with SDK
d2e1634 am ac294abb: Revision to Notifications API guide
1dd84d5 Merge "Keyguard sliding challenge - fix overeager touch interception" into jb-mr1-lockscreen-dev
c238af5 Keyguard sliding challenge - fix overeager touch interception
998a504 Merge "Showing message when max attempts are hit in face unlock fixes b/7306168" into jb-mr1-lockscreen-dev
d4a3e5d Only suppressing FUL on boot if selected fixes b/7338965
16d9092 Show "wrong password" on password screen, not "wrong PIN"
6a64ac5 Restore incorrect-PIN lockouts.
ac294ab Revision to Notifications API guide
0945282 am 0de49148: Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev
0de4914 Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev
8f7e1be Merge "Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b." into jb-mr1-lockscreen-dev
0f87a72 Addressing comments in 74bdd21629681528dbe7f3ea363d99c8514e026b.
1625e87 Showing message when max attempts are hit in face unlock fixes b/7306168
1e44e96 am 56a3ce03: Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev
56a3ce0 Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev
9767597 Merge "Stripping dead API related to keyguard widgets" into jb-mr1-lockscreen-dev
7fae521 Avoid tesselation path when useCenter is set
757d0d8 Merge "Keyguard tablet/portrait fix for HUGE security views" into jb-mr1-lockscreen-dev
40daf33 am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
998d03b Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
5ee6ba6 Keyguard tablet/portrait fix for HUGE security views
277b352 docs: update description for location permissions bug: 6996667
22d17c9 docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
22ad682 Merge "Cancel camera launch on screen off." into jb-mr1-lockscreen-dev
dbe24b7 Cancel camera launch on screen off.
89c359c am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
62e9c05 Merge "Show the keyboard less aggressively." into jb-mr1-lockscreen-dev
8761e14 docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
6e36f10 Fix launcher flash during secure camera transition.
d31c322 Fix for BluetoothAdapter.getAddress() when BT is off on some devices
080471e Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev
d0fb412 am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev
c86e8df Merge "Fix WiFi stress test" into jb-mr1-dev
5d2404d Updating isShowing during onResume()
3d1728c A new clock widget to create lock screen appwidgets
9986b2d Merge "Suppressing FUL after going to backup fixes b/7449820" into jb-mr1-lockscreen-dev
667b5d5 Suppressing FUL after going to backup fixes b/7449820
45942ca Addressing comments for change c4842c11932ea4f60fe7ae09b0a59660207e1587
074b8b7 Eliminate potential reentrance from unregisterInputChannel.
11952e7 Merge "Adding a button for expanding the clock screen challenge." into jb-mr1-lockscreen-dev
b6ce66e merge in jb-mr1-release history after reset to jb-mr1-dev
74bdd21 Adding a button for expanding the clock screen challenge.
a6314da Merge "FUL being unsuppressed when screen turns off fixes b/7453702" into jb-mr1-lockscreen-dev
c4842c1 Accessibility support for the lockscreen  - phone.
8f697d8 Stripping dead API related to keyguard widgets
c8dc8eb Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
b2a2096 Fix WiFi stress test
078f591 FUL being unsuppressed when screen turns off fixes b/7453702
077105b Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
fa668cc Fix some drag behavior bugs in keyguard
fc753c0 Use new keyguard appwidget picker
4f721f1 am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
fe28ff0 Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
409c89c am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
c1c53e5 Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
688d038 am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
4bce83e am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
13d02d0 am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
47f52d7 am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6697c68 am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
c01d104 Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
9e3a900 Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
2a2734f Revert "Removed symbol causing compile breakage."
83e9187 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
1fefef1 Revert "Import translations. DO NOT MERGE"
d5d11af Fix for regression in WindowManager orientation changes
a68aa4e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
dd73325 Merge "Removed symbol causing compile breakage." into jb-mr1-dev
cdb8088 Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
d8a5792 Removed symbol causing compile breakage.
0e06223 am 6bd881bd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6bd881b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
51cfc54 Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev
562afa9 Accessibility of the lock screen - strings
39824f68 Fix for bug 7400445 regression in background drawable
7f5bade am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
03f7ebf Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
170c8d9 Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev
03633d2 Remove extra KeyguardViewStateManager construction
f778bfd Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev
c345146 Update bouncer behavior on tablets.
5b03984 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev
8029f74 Revert "Import translations. DO NOT MERGE"
e8b0c0e Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
02dfd64 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
b95bc68 Fix ordering bug
1b33342 am 86e1b966: Fix ordering bug
86e1b96 Fix ordering bug
e74fcc0 Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
cdf8b48 Fix keyguard bugs
3c416df Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
536f067 Fix crash on boot
162fc8e Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
22ae05d Re-enable transition animation between face unlock and backup
e0ec5d4 Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
82b517b Fix potential null pointer exeption in keyguard
02a5988 merge in jb-mr1-release history after reset to jb-mr1-dev
ad0cead Import translations. DO NOT MERGE
7fc99e8 Import translations. DO NOT MERGE
30a3eea Import translations. DO NOT MERGE
a7cd483 Import translations. DO NOT MERGE
c8018eb Fix dream/keyguard infinite layout loop.
8ea7cbe Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
0b6e2a4 Lockscreen accessibility - strings.
4a85b9f am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
0bd6f96 Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
1f92878 am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
d2f616f am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
5c12bc5 Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev
7277d5d QS uses nickname for multiuser and profile name for singleuser.
a371e53 Merge "Fix content alpha" into jb-mr1-lockscreen-dev
20329dc Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
2e6a65c am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev
77007ac am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev
27f752e Merge "WindowManager shouldn't layout non-visible windows" into jb-mr1-dev
ab8635d Fix content alpha
a07d047 Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev
a0a230a Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev
d76b320 Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev
54d181d Removed makeInvisible() function
7ff5535 Merge "Making the reordering play nice with the 3D widget carousel" into jb-mr1-lockscreen-dev
0a12d86 am 05728277: am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
c7c972d Fixing view accessibility classification for recents.
70009e4 Making the reordering play nice with the 3D widget carousel
c7375af Fix keypad accessibility.
0572827 am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
c6df397 am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
a76f1df am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
c8f7c5e Merge "Fill in logic in WidgetPager to ignore music when reordering." into jb-mr1-lockscreen-dev
c725556 Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs
bd0bf15 Merge "Implement correct music widget positioning in keyguard" into jb-mr1-lockscreen-dev
e31d80b Doc change: fix broken link in publishing steps TOC.
a56395d am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
7710199 Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
9cceae9 WindowManager shouldn't layout non-visible windows
2c7ebea Relax permission requirements for posting notifications across users
ddbf138 Fixed misplacement of cancel(X) button for Face Unlock
e0566da Fill in logic in WidgetPager to ignore music when reordering.
aac4d9f QS uses nickname for multiuser and profile name for singleuser.
33384ed Merge "Attempt to fix bug on devices where multi-user support is disabled." into jb-mr1-lockscreen-dev
26e6c2e Attempt to fix bug on devices where multi-user support is disabled.
bdca3c0 Implement correct music widget positioning in keyguard
0ca9723 Merge "FUL uses square aspect ratio for all layouts fixes b/7426399" into jb-mr1-lockscreen-dev
fba4d4a Show the keyboard less aggressively.
1863738 am ac14efce: (-s ours) Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
54f1ce1 am 8756c60c: (-s ours) Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev
ac14efc Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev
8756c60 Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev
ef65310 Merge "Moving persistence calls to background." into jb-mr1-lockscreen-dev
b1e7695 Merge "Render camera widget correctly after shell restart." into jb-mr1-lockscreen-dev
0c29371 Don't clean up wallpaper map entry when stopping a user.
6249804 Merge "Impose a height & width downward on challenge views." into jb-mr1-lockscreen-dev
ad09bcc Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
7377982 Render camera widget correctly after shell restart.
f8f5966 Moving persistence calls to background.
68d257d FUL uses square aspect ratio for all layouts fixes b/7426399
be7a294 DO NOT MERGE clarify Geofence.createCircle() param ranges
4050da7 Merge "Addressing a couple comments on previous CL" into jb-mr1-lockscreen-dev
5be14de Addressing a couple comments on previous CL
8a26bf5 Impose a height & width downward on challenge views.
70aa528 Fixing some regressions in tablet reordering/deleting.
34c7ed0 DO NOT MERGE suggest LocationRequest rather than Criteria
8f22514 am 44251a70: Merge "Work on issue #7343200: Fails to show wallpaper in the background..." into jb-mr1-dev
44251a7 Merge "Work on issue #7343200: Fails to show wallpaper in the background..." into jb-mr1-dev
ed1eca0 am 13a6df91: Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
13a6df9 Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
53af017 am 825a094e: Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
825a094 Merge "Update Device Art Generator for Nexus 4, 7, and 10." into jb-mr1-dev
8215acd docs: NDK r8c Release Notes
3114b1a Merge "Disable lockscreen window anim when launching camera." into jb-mr1-lockscreen-dev
e2ac520 Disable lockscreen window anim when launching camera.
604d1ee merge in jb-mr1-release history after reset to jb-mr1-dev
16d83fd Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev
b817cfb Update Device Art Generator for Nexus 4, 7, and 10.
cf69c56 "Fix camera widget scale-up regression." -> frameworks/base
567fa75 Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
3cd4640 Lockscreen accessibility - strings.
8a7785c Cleaning up the way in which the challenge influences widget size on first measure pass
1108a2c Added a makeInvisible call to Face Unlock
ef03a7f Work on issue #7343200: Fails to show wallpaper in the background...
cfc3086 Keyguard polishing
7bf93cf Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
9dc9923 Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.
750d5e1 am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
ca60ba1 Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
e668794 Only send broadcasts to registered receivers
e4335ad am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
0da554a Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev
d991024 Merge ""Implement grace period for camera widget." -> frame/base" into jb-mr1-lockscreen-dev
278a966 fix an overflow in the orientation sensonr calculations
4b976ea "Implement grace period for camera widget." -> frame/base
c864d95 am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
61ebf9c Merge "audio service: make dock audio is off by default" into jb-mr1-dev
f1c62be am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
643e337 Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
b560cfb am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
be7a814 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
c712079 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
264df9b am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
7c25850 Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev
3cbc6cd Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
f7d69a9 am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f64e70f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f4a8eb2 No playback and music widget from other user on user switch
5ba0ffa audio service: make dock audio is off by default
2f7387b merge in jb-mr1-release history after reset to jb-mr1-dev
584c4cd Move app-lib definition up for system app scanning
3e31a0d am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev
c3921fd am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
83f60c5 Merge "FusedLocation runs per user as user" into jb-mr1-dev
167282f Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
9ba407e Import translations. DO NOT MERGE
8405c56 Import translations. DO NOT MERGE
5193efb am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
4bfa1e9 Merge "Fix handling escaped chars in ssid" into jb-mr1-dev
11de9e5 Fix handling escaped chars in ssid
d4e3efe Import translations. DO NOT MERGE
19293bc Import translations. DO NOT MERGE
a5f9b3f FusedLocation runs per user as user
32c557c post user activity on widget pager moves
269518e Revert "make FLP play nicely with multiuser"
0b72824 Update status area and emergency call logic to match new spec
e364313 Implementing new slider / widget interaction where frame goes around the widget
b317db4 am dbcec903: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e5e45b1 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
dbcec90 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5c33a55 am 2407ed15: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ff45c88 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2407ed1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
4d36d9d am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev
99e8872 Merge "Don't scale screen brightness by electron beam level." into jb-mr1-dev
36eba5d am 7b9a2889: Doc change: fix some table formatting.
7b9a288 Doc change: fix some table formatting.
4e18b21 Import translations. DO NOT MERGE
46e28bd Import translations. DO NOT MERGE
3326211 Import translations. DO NOT MERGE
c14ba5f Import translations. DO NOT MERGE
b2f21c5 Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev
bc676a0 Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev
f002bf1 Merge "Bigger lock icon." into jb-mr1-lockscreen-dev
c606bf1 Improved handle touch interaction.
950c29e Bigger lock icon.
47c6cfa Ensuring layers are enabled on screen on and that pages are correctly transformed
effc03a Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev
f9048cd Polish to 3d carousel and standard pager
e7cd58b am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
c99a110 Merge "add settings for dock audio enabled" into jb-mr1-dev
5f050e5 Use settings to persist sticky widget.
1d269e8 Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev
fdbbbba Updated add-widget graphics
356bd4c Don't scale screen brightness by electron beam level.
e9b1921 merge in jb-mr1-release history after reset to jb-mr1-dev
7ee1e4f add settings for dock audio enabled
68b1405 Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev
319c7e85 Merge "make FLP play nicely with multiuser" into jb-mr1-dev
bb4b601 Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
0a27c48 Fix measurement bug in keyguard/MultiPaneChallengeLayout
f031f23 Fix for some downloaded apps showing up on all users
b0ed8bd Merge "Keyguard - prevent slider intercept when we don't want it" into jb-mr1-lockscreen-dev
113ca64 Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev
1914424 merge in jb-mr1-release history after reset to jb-mr1-dev
8905923 am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
8a6f6a8 Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
995270f Keyguard - prevent slider intercept when we don't want it
8daee80 Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev
9ec871d 3D carousel initial stab -- paging outlines / alpha effects pending design
a15eeac Merge "Fix bug where it wasn't possible to add widgets" into jb-mr1-lockscreen-dev
229dd8b Fix bug where it wasn't possible to add widgets
369f1c9 am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
0848245 Merge "Fix the user name for the owner." into jb-mr1-dev
efc4925 Making the PagedView full screen on tablets.
e5601ce make FLP play nicely with multiuser
b8a220c am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
d3d523d am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
a41ca12 am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
942a60d Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
07ce0ca Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
67625e2 Fix lockscreen slider bugs
f0ee5b8 single unlock target with honycomb semantics
4e0bf7c Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
db5aca9 Fix issue #7419050: Time is not getting updated after launching Clock
011717d Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
358148e Implement "sticky" widget logic.
1f887cb Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev
50e1f9e Merge "Final icon for (Day)dreams." into jb-mr1-dev
b055aa8 Final icon for (Day)dreams.
082351c Make the add widget button hitrectangle smaller.
61426f3 Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev
1957d28 Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
6f34b41 Fix the user name for the owner.
b42b842 Remove the handle headroom if the challenge is open.
c9a7d98 Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev
af5b49c Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev
1bfcc82 Expand top of touchable area of challenge drag handle.
000ea21 Update swipe edge size to match ux prototype.
f0fd172 lock out clicks while switching.
47cde77 Fix camera bugs found overnight.
e4ba91d docs: JOBB tool help page
6f35209 Integrate assets from UX; drag/bouncer animation behavior in slider
92130f6 Add MediaRouter API to get presentation display.
9b1db68 Fix issue where security view sometimes doesn't show.
a71984f Cleanup keyguard signals
1254f2f Persist reordering/deleting widgets on keyguard
6a8d6da am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
148d413 am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
5b45e33 am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
d6bbf71 am ea502b27: Merge "docs: animations au class" into jb-dev-docs
ea502b2 Merge "docs: animations au class" into jb-dev-docs
f90716c Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
7de482b am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
5c87f53 Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
bbba68a Route signals from SlidingChalleng to SecurityView
0b1b552 Keyguard bouncer notifications; focus moving and the bouncer; slops
968056f merge in jb-mr1-release history after reset to jb-mr1-dev
3f53212 docs: animations au class
3e98b9a Revert part of fix for b/7377776 to fix b/7411356.
b397508 am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
9023cf9 Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
d85a960 Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
589a6af Set wallpaper bitmap reference to null before reloading
654761a am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
fc53e58 Fix typos in LinearLayout comments
3e29733 Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
2e8a98e Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
dcc9681 Manual frameworks/base merge from lockhotness (camera).
72898e9 FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
e3b51ef am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
324cfc5 Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
c3fc322 Fix Google Now on lockscreen.
7fd9882 Accessibility layer in inconsistent state after running UI test automation tests.
c57f0d3 Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
7bc8af3 Haptics for PIN enter key
40d98ed Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
acb60fb Haptics for PIN keys.
661c2e7 am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
33c0a61 Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
d569274 PIN pad cosmetics.
2c1ce05 Cleaning up password input.
51d39f2 Add ECA to PIN view
df99b1d Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
86f9637 Fix new password view in keyguard
8b3dd40 Fix build
147dfc8 Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
db3efba am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
5fbc82e am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
ead7d90 Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
38c904a Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
aa2859a Adding ability to add multiple widgets to keyguard
672478a merge in jb-mr1-release history after reset to jb-mr1-dev
eee2093 Beginnings of bouncer support; add scrims and state tracking
b26306a Fix issue #7408647: Add getUserCount() API
9253f56 am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
4e7f2ff Merge "Handle group tear down only at group removed event" into jb-mr1-dev
2bc0c5f Handle group tear down only at group removed event
2ca85c2 am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
900e0ba Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
5244c93 Dim the screen quickly in response to user activity timeout.
c0657fb Integrate changes from lockscreen proto app
ee0f615 am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
f785af4 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
9933331 Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
a187b47 am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
188bf0e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
599885d am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
cd66855 Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
f0cec42 Merge "remove debug logs." into jb-mr1-lockscreen-dev
405e674 am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
dc0d122 remove debug logs.
f704e9f Merge "revise android.location.Geofence documentation" into jb-mr1-dev
a9f1666 Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev
6fb841f Fading side pages as per mock
ff87225 Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev
28c5ee9 catch exceptional cases on factory-fresh devices.
ceafeb4 Import translations. DO NOT MERGE
de18c8b Import translations. DO NOT MERGE
698e144 am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
acf5943 Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-dev
be2cf32 Be a little more lenient with panel-open gestures.
985dc14 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2171fa1 am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d9fb584 am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
0fa4cf5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1202c43 Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
c1e2466 Import translations. DO NOT MERGE
c1b2060 Import translations. DO NOT MERGE
50a5313 Missing copyright headers.
11181c7 am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
7833ea1 am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
cc9106b am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev
4d56a16 am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
22df26c am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev
16106a7 am 92bc9b31: PMS: check outInfo for null during delete
a4dcf31 am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev
40ca868 am e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev
8e080d7 Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
d8d83fa am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
cde979d am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
b17223b revise android.location.Geofence documentation
3d08792 am 76cdbdc8: Doc change: update develop landing page content.
86b6357 Manual f/b merge of lockhotness camera integration.
ecf4725 Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev
76cdbdc Doc change: update develop landing page content.
f043de9 Fix a crash in InputMethodManagerService due to permission failure.
2bb7c12 Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
0d8417b merge in jb-mr1-release history after reset to jb-mr1-dev
799916e Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
383fa18 Revert "Check non-primary user dirs during package scan"
848a555 Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev
e2ce3f7 merge in jb-mr1-release history after reset to jb-mr1-dev
f52cbb6 Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev
f0681b3 Secure windows, secure surface views and secure displays.
d799db4 AudioService: add fix for corrupted settings
19a5267 Merge latest prototype changes into keyguard
bd17bd3 Ensure we have a GL context before deleting View layers Bug #7391098
9622ca4 Fix issue #7401818: Wrong transition animation when clearing task
92bc9b3 PMS: check outInfo for null during delete
56e7563 Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev
e1655c9 Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev
fa0fd39 License of files Bluetooth package is not updated to ASL2
c2798a9 When A11y is on, use a longer interval between lockout announcements.
356f2f5 am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
da2509c Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
ce1696c am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
6757572 Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
a82f0d2 merge in jb-mr1-release history after reset to jb-mr1-dev
5c73148 am c63aa962: Merge "Fix NPE." into jb-mr1-dev
c63aa96 Merge "Fix NPE." into jb-mr1-dev
1a3bdd5 Fix NPE.
962159a Fix up GlowPadView attributes
4a4ae0b am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
fbba753 Merge "Handle offscreen animations correctly" into jb-mr1-dev
aae03bb am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev
7c420ec Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev
b75ade9 Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev
e82f68d Fix the Backup Manager's uninstall tracking
6018aee Add throwing InvalidDisplayException from addView.
f6d0fc1 Handling popups correctly for face unlock
3561d06 Handle offscreen animations correctly
0e259dc am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
2eb8303 am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
cd79b35 Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
d401a53 Merge "Improve systrace tag propagation" into jb-mr1-dev
cd57bdb am a665df57: Merge "Use lighter background for Recents" into jb-mr1-dev
95429c3 Surface: add the PhysicalDisplayInfo#secure field
a665df5 Merge "Use lighter background for Recents" into jb-mr1-dev
9ed2beb Use lighter background for Recents
77119bc Fix issue #7342364: JellyBean broke Toddler Lock, again
b659119 merge in jb-mr1-release history after reset to jb-mr1-dev
83b9647 Merge "Integrate new PIN pad." into jb-mr1-lockscreen-dev
69bdee7 Integrate new PIN pad.
3a2d6aa Use existing display list to render the resize buffer Bug #7400903
f33ff92 am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
6fd394a Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
3867dda Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev
1afe778 am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
22f91da Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
8ed4822 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0472d56 am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev
086dc1c am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
692bb13 merge new multiuser avatars in from proto app
04c8d40 Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev
c48ca65 Merge "Fix driver stop handling" into jb-mr1-dev
bd28f23 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
66e893f am 21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
21ce854 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e6464af Fix driver stop handling
7ed59ae Import translations. DO NOT MERGE
79db480 am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
8cd4ef8 Import translations. DO NOT MERGE
365ece1 Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
2107dcb Import translations. DO NOT MERGE
c1c03c4 am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
1c8e4dc Import translations. DO NOT MERGE
5d6562d Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev
5f8e3f2 am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev
b76a0c4 Avoid mentioning hidden API in docs.
bf310d1 Merge "Fix issues shown on CTS tests" into jb-mr1-dev
51aec5e Fix issues shown on CTS tests
32a1c5f am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
1c8135a Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
cf64067 am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
0058f4e Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev
ac47ff7 Reset ExpandHelper when the panel is collapsed.
a801f18 merge in jb-mr1-release history after reset to jb-mr1-dev
31821c5 am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
780a13b Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev
bd9cafa Dreams/Sleep Mode is now Daydreams.
5d3f859 Merge multi-user stuff from prototype into framework.
41308e2 Properly draw the window background on window resize Bug #7385090
d11ca4d Improve systrace tag propagation
022554e Merge latest prototype changes into keyguard
e941b1e Improve auto-brightness hysteresis.
c28261d Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev
4525f5b Check non-primary user dirs during package scan
9415aa1 am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
36425d1 Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
d691056 am 3ac692f5: Merge "reduce camera sound volume." into jb-mr1-dev
3ac692f Merge "reduce camera sound volume." into jb-mr1-dev
0869770 Fix multiple onScreenTurnedOn callbacks in KeyguardHostView.
c5043dc merge in jb-mr1-release history after reset to jb-mr1-dev
8e6dcb0 am 0b828ee0: Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
ef2faae reduce camera sound volume.
5419ae8 am 4ce82df5: Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
0b828ee Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev
4ce82df Merge "Solve issue where labels in Recents were blank" into jb-mr1-dev
fe09ad8 Solve issue where labels in Recents were blank
8af55c6 am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
e03c024 Merge "Clear data deletes too much" into jb-mr1-dev
7ecdc7f Set the correct flags for brightness dialog to show on all users
9ed957c am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
7443753 Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
8f87ea2 am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
74261d8 Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev
acba380 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
d046acd am 5be59670: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5be5967 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
547e665 Don't null the reference to Bitmap pixels until we're really ready
9157d3f Clear data deletes too much
8c16579 Update docs for multi-user storage behavior.
42ef515 Fix for bug: Gmail (and other places): cursor placed on top of letter
899b3d9 am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
034b386 Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
1bbd49d Fix nav bar glitch when quickly turning screen off then on.
8b2c916 Add ro.revision property to checkin headers
eb1e7ea Doc change: GCM category & dry_run params
167cd3e am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
23d6224 Merge "Set the secureness when creating displays" into jb-mr1-dev
047ceab am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
d07f8d0 Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
2e2f850 am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
92d9922 Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
aad8cd4 am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
2278898 Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
2291ca4 LocationManager javadoc permission fixes
cd75706 System server should always send broadcasts to a specific or all users
a6ea59e am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
cd92db8 Merge "Remove View's long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
cedb709 am a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev
5311c44 Remove View's long press callbacks when ACTION_CANCEL is received
c613a06 am 564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev
a4be1b2 Merge "Fix empty notification panel." into jb-mr1-dev
564c03d Merge "Really hide the settings button on tablets." into jb-mr1-dev
051ab5c Import translations. DO NOT MERGE
23a78f3 Import translations. DO NOT MERGE
50bc4f5 Fix empty notification panel.
7382a02 Really hide the settings button on tablets.
164497d am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
39c6526 Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
2a430cc Add NPE check to fix crash in Recents
55fb1ab Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
1ab678b am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
d6e3ad5 Merge "Reduce screen on/off latency." into jb-mr1-dev
a582c50 am f584f111: Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
ad0bda1 am e53f5265: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e570c9c Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
f584f11 Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
e53f526 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
7150c0a Import translations. DO NOT MERGE
221f69b Import translations. DO NOT MERGE
93c6094 Import translations. DO NOT MERGE
17d237e am cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev
a33079c am 3c84c9bc: Merge "Show brightness dialog for all users." into jb-mr1-dev
cc0106c Merge "Properly show emoji in the notification ticker." into jb-mr1-dev
3c84c9b Merge "Show brightness dialog for all users." into jb-mr1-dev
363a119 am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
2dd0c3a Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
d079f20 merge in jb-mr1-release history after reset to jb-mr1-dev
b5f3b70 Wire up "add widget" in keyguard
d6523da Merge latest prototype changes into the framework
596f143 am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
8074e98 Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
db1a677 merge in jb-mr1-release history after reset to jb-mr1-dev
9bd6284 am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
7707b05 am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
454248f am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
e25c241 am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref.
6faae9a Doc change: remove a few third-party refs. Fix broken image ref.
28f1f5e Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev
3f8794d am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
59420ec Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
d3156a2 Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
838906b Get basic keyguard working in new branch
7bbf816 Set the secureness when creating displays
32dafe2 Reduce screen on/off latency.
7ad4438 Fix issue #7353900: Brief flash of home screen while dream starts on lock screen.
a063bc5 am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
9bef329 Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
4be114b Re-fixing content descritpion on quick settings toggle. Bug: 7362316
db6a14c Fix crashes when quickly adding and removing users
49418d7 am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev
7e1664d Merge "New camera sounds" into jb-mr1-dev
de6fd40 merge in jb-mr1-release history after reset to jb-mr1-dev
9fcdd72 am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
9823723 Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev
3e96d3d am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
935415a Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
d5483c3 New lockscreen: allow search gesture from nav bar.
01ed79c Document immutable requirement of SharedPreferences return objects
c7eebe9 am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
6dad395 Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev
ac6e50a Catch badly formed URLs in WebView accessibility injector.
503be13 am 61e42262: Fix group join CTS test
61e4226 Fix group join CTS test
68a9e6d am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
398a671 Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
17671ff am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
ba0372d Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
fd88c25 am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
8c82025 Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
6e7aa77 Parcel VpnProfile without using disk format.
ede7409 am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
8b946c0 Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
b9d3664 Properly show emoji in the notification ticker.
833808d Fix transition into Recents with live wallpaper
561253f am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
0ed07a0 Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
5403006 am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
2275482 am 80343f64: Fix recents animations for secondary users
e9687ba Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev
ed108f3 Frameworks base: Promote dream setting defaults to config.
738cfc9 Fixing wallpaper flash when going in/out of Recents
80343f6 Fix recents animations for secondary users
fcd40e8 merge in jb-mr1-release history after reset to jb-mr1-dev
ff6c329 Cannot pan in browser if magnification is enabled.
b81ceda am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
a1f739e Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
c4070bb am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev
9254d31 am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev
c6275f5 am ce78b026: Merge "Fix deadlock." into jb-mr1-dev
1d2b445 Merge "Reduce auto-brightness jitter." into jb-mr1-dev
5831159 Merge "More migration to Global settings." into jb-mr1-dev
ce78b02 Merge "Fix deadlock." into jb-mr1-dev
2a808f9 am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
09a5321 Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
579e140 Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
f526e1e New camera sounds
4f0e969 Reduce auto-brightness jitter.
b003e28 Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
8855ba6 am ed5387be: (-s ours) am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
ed5387b am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
fcc93e7 am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
6669250 Fix deadlock.
cea3743 Try to free cache before giving up on install
afb856f am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
45c77ca Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
1e0ed6b Fix missing @hide on ViewGroup.resolveLayoutParams()
135b5ba Layoutlib: Read and close XML files as soon as possible. do not merge.
7fb1aac am 0437302f: Merge "Fix the build" into jb-mr1-dev
8d9a1f6 More migration to Global settings.
0437302 Merge "Fix the build" into jb-mr1-dev
3cb8d26 Fix the build
ac7806b am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
d8149b0 Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
78c66c9 am 07f85fec: Merge "Fix bug #7374285  GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
07f85fe Merge "Fix bug #7374285  GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
a3e9079 Robustly add symlink and add for non-primary users
7c25aab Defer layer rendering to avoid stalls Bug #7326824
34130c8 am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
80ce3d8 Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
b05e449 am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
be2a4a5 Merge "When removing windows remove from resize list." into jb-mr1-dev
2d5618c Allow getDisplayContentLocked to return null...
c48b0b9 Layoutlib: Read and close XML files as soon as possible.
d895caf am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev
b98c2fb Merge "Do a clean shutdown of p2p" into jb-mr1-dev
62fa6de Do a clean shutdown of p2p
fcc3348 Fix bug #7374285  GridLayout layout param margins are broken in RTL mode
6665287 Track size changes correctly for static wallpapers
8da94bd Stop reloading wallpaper bitmap
e114fcc am 58e60c23: Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
58e60c2 Merge "Track size changes correctly for static wallpapers" into jb-mr1-dev
d76ba62 am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
e09aed4 Merge "Changes to support updating location providers." into jb-mr1-dev
5f0d976 Track size changes correctly for static wallpapers
4e2e6df am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
e8c9ce7 am 5e42147a: (-s ours) am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
e9b533b am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
5e42147 am 64b3de29: (-s ours) am 434cd38f: Update layoutlib for jb mr1. do not merge.
82f0ba7 am 4a6b6948: am 07322102: revise code sample for callback interface
64b3de2 am 434cd38f: Update layoutlib for jb mr1. do not merge.
3220289 am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
c88e918 am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
4a6b694 am 07322102: revise code sample for callback interface
444e8aa Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
1ea75b8 Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
db164da Merge "improve some docs for dreams" into jb-mr1-dev
4bcf874 am 18937b22: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
6237ac1 improve some docs for dreams
18937b2 Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
434cd38 Update layoutlib for jb mr1. do not merge.
645a16f am 588fb15d: Merge "LocationManager permissions cleanup" into jb-mr1-dev
591a12a Show brightness dialog for all users.
588fb15 Merge "LocationManager permissions cleanup" into jb-mr1-dev
868f82a am 0141faec: Merge "Allow services to query the info for a dying user." into jb-mr1-dev
0141fae Merge "Allow services to query the info for a dying user." into jb-mr1-dev
f400513 am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
6a377f3 Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev
8481ac8 Stop reloading wallpaper bitmap
860f660 When removing windows remove from resize list.
37425c3 LocationManager permissions cleanup
faa8259 am 341aa8e0: Merge "Potential fix for bug 7352816" into jb-mr1-dev
341aa8e Merge "Potential fix for bug 7352816" into jb-mr1-dev
720a34d Fix glitch when using settings pulldown then switching to notifications.
b5249c0 merge in jb-mr1-release history after reset to jb-mr1-dev
3f84608 am a4c356ca: Merge "Add missing layout params" into jb-mr1-dev
a4c356c Merge "Add missing layout params" into jb-mr1-dev
0ad3bb8 am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
80ffd26 am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
88c66cb Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
586503d Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev
e21a2e7 am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
bd4f218 Merge "Defer more Account actions until user starting." into jb-mr1-dev
fbadb69 Changes to support updating location providers.
5723fb0 Avoid redundant wallpaper loading/drawing
2fa64ac am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3e336bd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d10f1e2 Show clear all when returning from flip quick settings.
1638931 Allow services to query the info for a dying user.
ec6aa59 Dream when user activity times out while docked if appropriate.
6109075 am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
c6ccb29 Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev
47a8b59 am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
c1dc37c Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev
36c06ae Add missing layout params
650c47a am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev
b8460d1 Merge "Take into account the texture layer's transform for clipping Bug #7370212" into jb-mr1-dev
d488b23 am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev
23fa032 Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev
27f1d67 Add special mirroring modes for demonstration purposes.
917d8ac Import translations. DO NOT MERGE
b2e2f24 Take into account the texture layer's transform for clipping Bug #7370212
6f05ae3 am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-dev
9c47473 Merge "Update layoutlib for jb mr1." into jb-mr1-dev
891b703 Update layoutlib for jb mr1.
7b39437 merge in jb-mr1-release history after reset to jb-mr1-dev
54a956c am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
871a6d7 Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
195eb1a am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
4e360f0 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
4db3165 Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
f49d835 This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
a7f9c96 Add a notification icon when connected to wireless display.
0732210 revise code sample for callback interface
904732c Call requestFocus and ensure that screenOn is set.
bd8a275 am 0f2d0147: Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev
0f2d014 Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev
e4996bb Defer more Account actions until user starting.
285d093 am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev
6f3e7bb Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev
6763bfe am 3301654a: Merge "Fix javadoc" into jb-mr1-dev
9911d18 Fix for previous commit on non-interesecting invalidations
3662f20 Append the test case name in the beginning of the test log.
3301654 Merge "Fix javadoc" into jb-mr1-dev
0d7c0ab am 1720e073: Merge "Update Arabic fonts to remove Rial ligature" into jb-mr1-dev
c29f35b Change android.permission.SERIAL_PORT to signature|system.
1720e07 Merge "Update Arabic fonts to remove Rial ligature" into jb-mr1-dev
3741950 am e663925f: Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev
e663925 Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev
f249efc Show clear all when returning from flip quick settings.
346acb1 Sanity-check erroneous backup agent instantiations
2017a05 You can only use the 2-finger shortcut when opening the panel.
c389ca6 am 90a80bb8: Merge "Handle null BSSID" into jb-mr1-dev
90a80bb Merge "Handle null BSSID" into jb-mr1-dev
474c56d am 64e5aa73: Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev
c6fd986 am 966496f5: Merge "More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf" into jb-mr1-dev
64e5aa7 Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev
966496f Merge "More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf" into jb-mr1-dev
d348ec2 am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev
f223282 am 16627347: Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev
d95316e Merge "Skip drawing offscreen objects" into jb-mr1-dev
1662734 Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev
5243957 Enable mipmapping, without a deadlock this time Bug #7353771
2ab453b Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674
b838ba6 am 26f544ae: Merge "For Matias." into jb-mr1-dev
26f544a Merge "For Matias." into jb-mr1-dev
f5d46fd am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev
d4a149d Merge "Frequency conflict handling" into jb-mr1-dev
dd5c182 docs: google market -> google play
b78ee0e Skip drawing offscreen objects
ee974a4 am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev
52d8458 am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev
fc2652e Merge "Fix the NPE for the memwriter." into jb-mr1-dev
737f4e7 Fade out the notification/settings panels just before close.
656d8f2 Fix Bluetooth QS tile.
e9a33c6 Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev
cc5339f Fixes for QS:
19f5b3e am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev
cdd2e3d am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev
9d1177d am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev
badf765 am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev
161cfef Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev
abaf773 am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
87b8a1c Fix the NPE for the memwriter.
ab61e56 am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev
0cb8a63 am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev
b6b5248 am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev
595703c am 91ffeddb: Hide settings button from tablet notification panel.
3727bef am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
f094d96 am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
783bd68 am b6454adb: Merge "Quickening." into jb-mr1-dev
1b9a141 am c3984879: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
19b304e am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b702e5d Merge "Fix Bluetooth QS tile." into jb-mr1-dev
25e1456 Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev
6f931cc Fix javadoc
f06125a Merge "Fixes for QS:" into jb-mr1-dev
1ec1154 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
144d405 Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
57fca90 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
dec9e16 Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev
025e7cb Fade out the notification/settings panels just before close.
6e2810b Fixes for QS:
9f452d0 Frequency conflict handling
0ee71ad Merge "Fix native crash while saving a panorama." into jb-mr1-dev
cd31db6 Update Arabic fonts to remove Rial ligature
ebaefec Fix Bluetooth QS tile.
040c2e4 For Matias.
be29d82 Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev
c376b72 merge in jb-mr1-release history after reset to jb-mr1-dev
a924076 Potential fix for bug 7352816
4b63f14 Fix native crash while saving a panorama.
5dd1b6e Hide settings button from tablet notification panel.
fd52137 Quickening.
4bbc615 Fix ApplicationInfo copy ctor
91ffedd Hide settings button from tablet notification panel.
b6c171b Merge "Do cleanup when Stopping users" into jb-mr1-dev
ec5acee Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
b6454ad Merge "Quickening." into jb-mr1-dev
a33d161 workaround to unbreak the build (deadlock during boot)
c398487 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
779a19f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
cf12897 Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
3679bf5 Quickening.
a7e0bcd Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
05ad745 Merge "Long press not working if explore by touch and magnification are on." into jb-mr1-dev
8e61450 Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev
1b85122 Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev
dcf5962 This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
e13ae64 Merge "Use parent window to evaluate show-to-all-users." into jb-mr1-dev
713e1bb Add API to enable mipmaps on Bitmap Bug #7353771
0312d6d More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf
bef0f61 Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)
72e3512 Long press not working if explore by touch and magnification are on.
edba852 Handle null BSSID
e4728b1 Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev
aa42c9a Correctly adjust clip regions that lie offscreen
69b0c97 Merge "Fix ApplicationInfo copy ctor" into jb-mr1-dev
9ee7356 merge in jb-mr1-release history after reset to jb-mr1-dev
48994ce Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev
de5c3a0 Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev
b147773 Fix NPE in quick settings tiles.
1b2415f Fix for bug 7358703 Gmail ANR when trying to compose a message
645b05a Merge "Blank all displays including Wifi Display when screen is off." into jb-mr1-dev
1ce4322 Fix inoperative "Forgot pattern" button when face unlock enabled
bcb0255 Fix ApplicationInfo copy ctor
fe3376b Fix NPE in quick settings tiles.
8ec0943 Blank all displays including Wifi Display when screen is off.
341220f Use parent window to evaluate show-to-all-users.
983faee Merge "Fix NPE" into jb-mr1-dev
3377b40 Merge "Fix for bug 7358703 Gmail ANR when trying to compose a message" into jb-mr1-dev
8b17969 Fix for bug 7358703 Gmail ANR when trying to compose a message
b7f9d25 Handle unknown case in LocationManager.getProvider
964629a Merge "Occasionally triple tap on the keyboard toggles screen magnification." into jb-mr1-dev
bdffd5c Fix missing layout parameters in keyguard.
8db45f0 Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev
5778cb9 Merge "Always use the correct pixel store size Bug #7357394" into jb-mr1-dev
827dde0 Merge "Support clipping in Canvas.drawBitmapMesh() Bug #7354162" into jb-mr1-dev
dc9e13b Merge "Perform all layouts within first loop." into jb-mr1-dev
3045e62 Import translations. DO NOT MERGE
417b059 Merge "Revert app freeze timeout delay." into jb-mr1-dev
0487631 Merge "Lock SyncQueue when user starting, copy RSC list." into jb-mr1-dev
a706e2f Lock SyncQueue when user starting, copy RSC list.
e34e220 Import translations. DO NOT MERGE
61759d9 Merge "Convert one more bind() -> setVar()." into jb-mr1-dev
939caef Fix NPE
b858ecd Merge "Fix bug #7345139: The First Volume Down Click looses its place on the volume slider" into jb-mr1-dev
2f20081 Avoid redundant wallpaper loading/drawing
5b4f8f9 Convert one more bind() -> setVar().
a3d5b68 Merge "Add serial port profile support and allow to connect to rfcomm channel without sdp discovery" into jb-mr1-dev
a13a41d Perform all layouts within first loop.
f37df1b Fix bug #7345139: The First Volume Down Click looses its place on the volume slider
d43b22d Always use the correct pixel store size Bug #7357394
1713774 Add new tablet sound set Bug: 7351672
60f571f Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
24b733a Flipping quick settings!
23ebfcd Flag window animation transactions as animations.
7127af5 Fix inoperative "Forgot pattern" button when face unlock enabled
e3adc08 Fix for bug 7344916 text view flickers when you hit enter
9c6536a Announce changes to the keyguard security message for accessibility.
55468c6 Occasionally triple tap on the keyboard toggles screen magnification.
a92bb4d Support clipping in Canvas.drawBitmapMesh() Bug #7354162
40b7ea4 Merge "Accessibility focus drawing does not take into account view's transformation matrix." into jb-mr1-dev
9a9f4ce Stopping Face Unlock immediately on detaching from window fixes 7338808
009d541 Merge "Fix bugs in scriptGroup." into jb-mr1-dev
8c8596e Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-dev
4682cf0 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0fcc297 Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
5d7c089 Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
4add743 Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev
75e861b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c118869 Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
a4942c9 Revert app freeze timeout delay.
81314ae Add new tablet sound set Bug: 7351672
08876d1 Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
18ea8f2 Merge "Flipping quick settings!" into jb-mr1-dev
7fee602 merge in jb-mr1-release history after reset to jb-mr1-dev
101784e Flipping quick settings!
b49a896 Add serial port profile support and allow to connect to rfcomm channel without sdp discovery
1f07529 Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev
f6dbd61 Merge "Always layout Keyguard on config change." into jb-mr1-dev
6868d6f Revert "Revert "Fix for bug 6050753.""
809bb40 Merge "Flag window animation transactions as animations." into jb-mr1-dev
b6ce6e4 Flag window animation transactions as animations.
78bd983 Accessibility focus drawing does not take into account view's transformation matrix.
69fbc3c Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
edefaa2 Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev
dec26f2 Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev
0e08215 Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev
322de60 Merge "Cleanup some internal documentation." into jb-mr1-dev
3398752 Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev
7789c9b Merge "Support pm clear as --user." into jb-mr1-dev
6f8c1ba Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev
63f9b81 Fix inoperative "Forgot pattern" button when face unlock enabled
8efca54 Ensure we always request conformant OpenGL ES 2.0 contexts
04fe872 Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
f5c1a87 Fix for bug 7344916 text view flickers when you hit enter
df40923 Merge "Update wifi display device name when renamed." into jb-mr1-dev
25160a6 Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev
756901d Do cleanup when Stopping users
016ff14 Stop dreaming if the battery not charging effectively.
42b0c70 Add missing layout_width/height Bug #7334849
256ab9e Merge "Use device availability to start WFD audio routing" into jb-mr1-dev
a3e9ff7 Support pm clear as --user.
1367e0a fix crashing apps
2aa50b6 Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-dev
ab887a0 Cleanup some internal documentation.
e6a7886 Fix bugs in scriptGroup.
3f840c8 Merge "fix crashing apps" into jb-mr1-dev
f6d1afd Announce changes to the keyguard security message for accessibility.
ee4f029 Update wifi display device name when renamed.
da479c5 fix crashing apps
477687c Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev
6dfd0b3 Fix SDK layout rendering in Eclipse.
11dea4d Merge "Fix issue where pin field doesn't have focus (issue 7348937)" into jb-mr1-dev
f2e28ab Merge "Update javadoc" into jb-mr1-dev
ac8a59d Fix issue where pin field doesn't have focus (issue 7348937)
532c9c4 Merge "Protect more service dump() methods." into jb-mr1-dev
780c128 HW Acceleration support for stroked arcs with BUTT caps
a3f4bf5 Always layout Keyguard on config change.
8e63bcc Revert "Fix for bug 6050753."
edc9005 Update javadoc
431c68b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
321e9c5 Allow any user to clear a notification targeted at USER_ALL.
a30d969 Merge "Monitor the right interface re VPN" into jb-mr1-dev
52801aa Protect more service dump() methods.
d86a532 Merge "Fix handling of lost device" into jb-mr1-dev
48df149 Merge "Rewind buffer before copying into it." into jb-mr1-dev
4a01f2b Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
6cf2a24 merge in jb-mr1-release history after reset to jb-mr1-dev
87d5795 Minor layout tweaks and bug fix in keyguard
14bb25a Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev
e6e8100 Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev
41de240 Fix handling of lost device
6f13141 Fixing issues with pattern recovery / account view (issue 7341237):
6dbf861 Fix for NPE with pattern recovery (issue 7341237)
66e9307 Merge "Disable security view transitions in keyguard" into jb-mr1-dev
27c0773 Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev
a2166de merge in jb-mr1-release history after reset to jb-mr1-dev
68c2489 Disable security view transitions in keyguard
3b9f9bc Merge "Fix inability to start pattern outside view bounds (issue 7344325)" into jb-mr1-dev
258d9fc Fix inability to start pattern outside view bounds (issue 7344325)
c4c5622 Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev
33387b1 Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev
7e39410 Fix blank clock (issue 7344512)
c92f150 Fix wallpaper not updating on initial boot.
61ccc16 Fix edge case with status message (issue 7343848)
32f9e8f Merge "Only showing important security messages in status area (issue 7341795)" into jb-mr1-dev
0a4f900 Only showing important security messages in status area (issue 7341795)
c220a61 merge in jb-mr1-release history after reset to jb-mr1-dev
e111ad3 No, that's German for "The Quick Settings, The".
f334336 merge in jb-mr1-release history after reset to jb-mr1-dev
85341a7 Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
70bc9f2 Fix keyguard dimensions; IME state for password view; layouts
211a18e Merge "Partial fix for blank widget page" into jb-mr1-dev
28dc64b Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev
308b1a6 Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
f8b93b5 Fix offsets for glowpad on keyguard
5675419 Merge "Fix cycle detection for SGs." into jb-mr1-dev
10542ec Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev
73db36e Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev
f402fa4 Merge "Simplify fused location provider." into jb-mr1-dev
f9307c5 Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev
ea06c3e Disable loading widgets in single-stage keyguard
59cb2cf Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev
53c04bd Monitor the right interface re VPN
f15005e Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev
4f66a63 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
f38bf83 merge in jb-mr1-release history after reset to jb-mr1-dev
d4805af Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev
071316e Use black bg in recents if using live wallpaper
84ebb35 Fix bug #7334966 Padding is still broken in RTL languages
9061981 use BufferedInputStream in readTextFile
f434d23 delay onDreamingStarted() to work around asynchrony.
0c63d78 Merge "Keep QS brightness slider icon in sync." into jb-mr1-dev
861a3b2 Revert fix to issue #6880627: PendingIntent.getService() returns...
0fdfa6b Simplify fused location provider.
8dd3aad Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev
95cccb9 Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev
d3d6570 Port ImageProcessing to Filterscript.
ba48a39 Align carrier info for glowpad keyguard screen
4b42941 Fix crash in ImageProcessing blend test
723a725 Make all lockscreen widgets follow haptic flag.
6b77a76 am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
5dc7ac7 am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
a7b56a2 am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
4c38e24 Merge "Don't alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev
c378656 Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev
8ec3ff8 Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev
67747a6 Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev
fe49af2 Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev
da02c64 update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666
3add43a Merge "fix stroke sub-hairline threshold" into jb-mr1-dev
d95c659 Suppressing Face Unlock during phone call - fix b/7339069
2154af2 fix stroke sub-hairline threshold
ff54920 Temporarily disable multiuser for specific builds
bfbd58d Merge "Fix bug 7338736. Only starting FUL if the screen is on" into jb-mr1-dev
f5bc42d Keep QS brightness slider icon in sync.
94c7b14 Fix bug 7338736. Only starting FUL if the screen is on
280af6f Import translations. DO NOT MERGE
1016b28 Merge "Pm command to get maximum users." into jb-mr1-dev
091f7cc Fix cycle detection for SGs.
e249763 small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
654abdc Import translations. DO NOT MERGE
4b66290 merge in jb-mr1-release history after reset to jb-mr1-dev
03e636f Don't alter accessibility JS APIs unless a page is about to load.
6ffbe60 Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev
038953d fix wrong read size in ToColor_S4444_Opaque
39ca39b Rewind buffer before copying into it.
732d88e Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev
4c76ea6 Pm command to get maximum users.
653d39a merge in jb-mr1-factory-release history after reset to jb-mr1-dev
5650d86 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6fa5a24 merge in jb-mr1-release history after reset to jb-mr1-dev
0ff7f01 Change keyguard to use single-stage unlock.
957b27f Merge "Revert "Always show emergency button on selector view screen in keyguard."  I'm reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I'll handle re-adding it if needed." into jb-mr1-dev
a1ecd5a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b6a1ea7 Revert "Always show emergency button on selector view screen in keyguard."  I'm reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I'll handle re-adding it if needed.
317beb1 Merge "New alarm ringtones" into jb-mr1-dev
8f2e74b New alarm ringtones
a3f3330 Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev
3cc10f4 Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
d3dc37d Import translations. DO NOT MERGE
e955121 Partial fix for blank widget page
c203ecf Use device availability to start WFD audio routing
40ad86e Import translations. DO NOT MERGE
b746feb Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev
fdb6be8 Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev
3994480 DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
9fcef3d Center text selection point to avoid rounding glitches
43c5b55 Always show emergency button on selector view screen in keyguard.
87afd6e am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
54a1e4d am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
5832d1c am 01154bda: DOC CHANGE: Notifications Guide
f881448 Merge "Update compatibility library tests" into jb-mr1-dev
9dfca20 Merge "Print newly generated userId." into jb-mr1-dev
810df89 Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev
3da6c21 Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev
3003bad Merge "Check whether ChromeVox is ready before attempting to call it." into jb-mr1-dev
87c6f9a Merge "This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch." into jb-mr1-dev
01154bd DOC CHANGE: Notifications Guide
d8faf74 Check whether ChromeVox is ready before attempting to call it.
d1821cc This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch.
e6d3ccc Print newly generated userId.
11159e9 Do not launch Somnambulator as a dock app.
9bec38f merge in jb-mr1-release history after reset to jb-mr1-dev
4574df0 Merge "Reducing WebView navigation timeout for accessibility." into jb-mr1-dev
e8f4fa1 Merge "Fix off-by-one." into jb-mr1-dev
2203cf3 Reducing WebView navigation timeout for accessibility.
38f8688 Return ApplicationInfo with requested userId.
c51cb89 Fix off-by-one.
86ad866 Merge "Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev
402099f Merge "Unhide setPictureListener" into jb-mr1-dev
0b68477 Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217
4cce397 Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev
2e21bdb Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev
1702686 Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev
46fb9e9 Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev
853a1ce Merge "Copy date format style from keyguard." into jb-mr1-dev
8091c8e am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
07d2ad8 am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
dff6f01 am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
45c56ae Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
49dbc16 Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev
2444ae7 Ensure MediaRouter correctly handles renamed Wifi displays.
6611988 Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
77ace2e Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
fa3b625 Cleanup on async disconnect and finalize
a987d43 Check for apps closing and restore mExiting test.
ec13924 Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
96a1b3c Unhide setPictureListener
ee0d8de Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev
b3c3815 Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev
5fb18aa Copy date format style from keyguard.
487bb6e Ensure Binder in-calls to UiModeManagerService are guarded.
1cd614c Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev
061a4de Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev
a2f7ca7 Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev
ada86cb Ignore dying users when testing for number of users on device. (Bug 7332248)
596b185 Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
0ea1603 Screen magnification does not auto-pan when fragment dialog pops up.
2882fc0 Add new ringtones/notifications for Occam.
8f89e6f Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev
ff97e6e Merge "New icon for quick settings button." into jb-mr1-dev
d07fa6e Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev
ee44fae Prevent out of range magnification scale to be persisted.
26e3f3d Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
e60cdf1 Merge "Final keyguard tablet layout integration" into jb-mr1-dev
e6a69dd New icon for quick settings button.
8f55d11 Database cleanup needs to happen for all users.
9aefa14 Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
092ad66 Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev
2a3e1ff Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev
8e76711 Merge "Don't update the text services locale in the main thread" into jb-mr1-dev
524dcb7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ace0bd7 Remove notification/quicksettings explanation cling.
efb0faf Remove the double-swipe to access quick settings on phones.
1eac6b7 Don't update the text services locale in the main thread
f550c71 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
e1f4ebf Merge "Cache wallpaper bitmap to avoid re-loading on rotation" into jb-mr1-dev
454775c merge in jb-mr1-release history after reset to jb-mr1-dev
a517de3 Donot reset mEnable flag when binding timeout.
60fa461 Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
3c0081b Merge "Use exactly the same timings for the ElectronBeam as JB." into jb-mr1-dev
6918d9f Merge "Remove Dream windows immediately." into jb-mr1-dev
6c179ad Merge "Dismiss keyguard for brightness QS tile." into jb-mr1-dev
31cee47 Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
9535c91 Fix a runtime restart when cycling between 4 users
4fc4527 Don't enable input dispatch until the screen is visible.
78eb122 Dejank electron beam.
9cf36b7 Don't process UEvents in Dalvik unless they match a pattern.
b708f77 Send accessibility event for content change upon setting content description.
eb21452 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3c584f2 Use exactly the same timings for the ElectronBeam as JB.
71b3cd5 Final keyguard tablet layout integration
8d866e5 More on issue #7318666: hide developer options from user build
6bf6eb7 Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
f6215e5 Fix the build
b2ae7a1 Update compatibility library tests
cea5207 resolve conflicting assumptions from the merge.
b2d5522 Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev
b8021a8 Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
02f0daa Merge "Fix WebView accessibility scripts." into jb-mr1-dev
1460c8c Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev
c37f349 Prevent possible divide by 0 Bug #7307304
38a6424 Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev
df31369 Fix WebView accessibility scripts.
2918ab6 Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
c61d70e Cache wallpaper bitmap to avoid re-loading on rotation
bcfc1ca Merge "Don't play notifications during speech recognition" into jb-mr1-dev
fb90107 Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev
6b17799 Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev
03bd101 Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
1dbce5f am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
5ed9d68 Move lockscreen to using haptic feedback setting.
05ab277 am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
41d35ae Allow 9patches to shrink Bug #7307304
3f36968 Fix MediaRouter prioritization around a2dp devices
0a75ed0 Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev
f864401 Merge changes I00665385,Ic76db232 into jb-mr1-dev
c194016 Merge "Use the original caller pid for computing visibility" into jb-mr1-dev
33ee290 Merge "Update to accessibility toggle message." into jb-mr1-dev
c31ed39 Send accessibility notification events only for the current user.
7573b1e Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
3198ef3 Use the original caller pid for computing visibility
0dd0b14 Merge "Include all accounts in dumpsys." into jb-mr1-dev
2a60389 Add DAG validation for ScriptGroups.
fbc21e1 Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
9617921 No sound produced on global actions dialog pops up if no vibrator is present.
9ea6343 Merge "The active window for accessibility purposes can be miscomputed." into jb-mr1-dev
76b8b5c merge in jb-mr1-release history after reset to jb-mr1-dev
6eb9620 Include all accounts in dumpsys.
57899f8 Import translations. DO NOT MERGE
64ecc0e Revert "Remove debugging statements before final ROM."
521da7e Import translations. DO NOT MERGE
6ae8a24 The active window for accessibility purposes can be miscomputed.
fa5bc08 Merge "Increase window freeze timeout for bigger screens." into jb-mr1-dev
ccf9ef6 Merge "Reduce android.bluetooth package debug messages" into jb-mr1-dev
d677054 Don't play notifications during speech recognition
c131070 Remove Dream windows immediately.
fa4865f resolved conflicts for merge of 0b479e43 to jb-dev
8af30c0 Update to accessibility toggle message.
0b479e4 Merge "Doc changes: misc GCM updates." into jb-dev-docs
7dfcb01 Increase window freeze timeout for bigger screens.
c46e87a merge in jb-mr1-release history after reset to jb-mr1-dev
2514456 Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev
4c5ba6c merge in jb-mr1-release history after reset to jb-mr1-dev
1a5f387 Merge "Revert "Don't update the text services locale in the main thread"" into jb-mr1-dev
ba683ef am 3f542740: (-s ours) am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
96a294d am dadea723: (-s ours) am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
1ed1a44 am 0c9c8d0a: am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
8ff081d am 8048b9ec: am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
72fa0b3 Revert "Don't update the text services locale in the main thread"
e50b212 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
437e9cc Merge "Adjust buffer position after copying" into jb-mr1-dev
6b3b56e merge in jb-mr1-release history after reset to jb-mr1-dev
f6138f0 Merge "Don't consider the boot completed until the animation is over." into jb-mr1-dev
0fca2a3 Merge "Fix build, only invalidate when creating user." into jb-mr1-dev
9d0791b Fix build, only invalidate when creating user.
c85e16c Merge "Make RegisteredServicesCache multi-user aware." into jb-mr1-dev
0aaffb1 Merge "Don't update the text services locale in the main thread" into jb-mr1-dev
d175a75 Merge "Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie." into jb-mr1-dev
563e414 Reduce android.bluetooth package debug messages
a726e23 Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev
6ab72d7 Make RegisteredServicesCache multi-user aware.
3f54274 am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
c2e3be5 Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
dadea72 am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
a22000d Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
3041750 Merge "Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)" into jb-mr1-dev
14c4669 Cannot force a shown item from an ActionMode into the overflow menu.
64ad954 Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev
b7c6a62 Revert "Revert "Add config resource to help ATT prepaid""
2ffd207 Instead of collecting the procmem output in the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie.
36db9d0 Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev
40874a0 Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched
20767b2 Don't consider the boot completed until the animation is over.
534a67c DO NOT MERGE Control access to inherited methods of jsinterface objects
64182d8 Merge "Properly label RecentsActivity for accessibility. Bug: 7229886" into jb-mr1-dev
c0bd747 Further work on issue #7307399: Framework needs a new pre-user-shutdown...
2aee7c1 Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev
d7059df Properly label RecentsActivity for accessibility. Bug: 7229886
2133caf Revert "Add config resource to help ATT prepaid"
2725820 Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev
840590d Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev
f966cf3 Merge "default the screen on during the dream." into jb-mr1-dev
0c9c8d0 am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
137b8f4 am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
7a6355b Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719)
f761a9a Merge "Doc change: edits to TV tablet story." into jb-dev-docs
6f2cdcd Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev
59a9603 Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev
0cd6410 Merge "Remove debugging statements before final ROM." into jb-mr1-dev
17cf1f2 Fix build
a8a9bd6 Fix issue #7311376: Add API to allow apps to know if they are...
f545660 Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev
637a30f Merge "Fix a segfault when there is no power module." into jb-mr1-dev
9e6e835 fix concurrent headset and HDMI connection
96985fc Return true on successful accessiblity action click/long click.
79dc154 Merge "Disable poor network avoidance by default" into jb-mr1-dev
fafdb6f Disable Camera + Search until USER_SETUP_COMPLETE.
3ab07da merge in jb-mr1-release history after reset to jb-mr1-dev
b30a856 Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev
c9c47f8 Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev
1042874 Prevent full wake lock from keeping device awake while dreaming.
8048b9e am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
28a40e0 am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
bbe461b Disable poor network avoidance by default
aa0d43b Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
f32b582 Doc change: Link to AVDs docs from tablet quality checklist.
37c4565 merge in jb-mr1-release history after reset to jb-mr1-dev
16eb7cd Back up / restore the "Avoid poor connections" wifi setting
a8a6b08 Merge "Add fused location provider to real provider list" into jb-mr1-dev
cbdb213 Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev
61413b5 Face Unlock is shown correctly during a phone call - fix b/7271718
74bc9b6 Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev
d488bc0 Defer wifi bounce following restore for 1 minute...
cc4104f Suppressing FUL after user switch (fix b/7316467)
0a19d00 Fix a segfault when there is no power module.
4fd6c20 Doc changes: misc GCM updates.
f1b246d Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev
36070b4 Fix verfication bypassed for adb installs
64cb35c Merge "Add config resource to help ATT prepaid" into jb-mr1-dev
1606212 Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev
f1f3b49 Remove debugging statements before final ROM.
c357518 Add fused location provider to real provider list
f8f1f88 docs: Release Notes: Android Platform 4.1.2 (16, r3)
c0c0c0e Merge "Multiuser love for LocationManager" into jb-mr1-dev
901ac56 Add config resource to help ATT prepaid
e45c4e4 Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev
af3cd21 Merge "New command line tool: "settings"" into jb-mr1-dev
0f31450 am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
fba8b7f am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
f19e4b4 Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
14dfe4e Merge "enforce camera sound according to country code" into jb-mr1-dev
3307958 Allow more scaling values to be tuned in resource overlays
b312163 Merge "Fix handling of hidden access points" into jb-mr1-dev
462ff63 Fix handling of hidden access points
3b9e7f3 am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
fb554fc am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
b049b1e am 46c4b488: Doc change: Subscriptions free trials on Google Play.
46c4b48 Doc change: Subscriptions free trials on Google Play.
e8f67ed Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev
7ed267f Fix one case where recents is sometimes not visible
10d54d1 merge in jb-mr1-release history after reset to jb-mr1-dev
8fa0838 Don't update the text services locale in the main thread
6be35dd Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
8f4baad Merge "Blank or unblank all displays as need." into jb-mr1-dev
4f8e5ce Camera: Query AudioService for shutter sound enforcement.
c86884c Fix an issue on showInputMethodPickerFromClient
223ce5c Implement music and user priority scheme in keyguard
b64c3dd Dismiss keyguard for brightness QS tile.
434f817 Merge "Don't do a wifi p2p scan in MediaRouter if we're already connected" into jb-mr1-dev
b072a96 Don't do a wifi p2p scan in MediaRouter if we're already connected
1cea2f3 Increasing timeout for screenshot chord in keyguard. (Bug 6941775)
9e316a1 Blank or unblank all displays as need.
af75948 New command line tool: "settings"
eb7f157 Merge "FUL fallback is no longer account login  - fix b/7280196" into jb-mr1-dev
0c9b535 Merge "Fix "checking account" string" into jb-mr1-dev
a934fd1 default the screen on during the dream.
b711d57 Multiuser love for LocationManager
531c237 Add an upgrade step for settings moved to global.
2aac1a0 Merge "Improve the power off fade animation." into jb-mr1-dev
dd45d01 enforce camera sound according to country code
1f415fa docs: nfc ndef helper methods bug 5957772
6c5bd36 Fix "checking account" string
252c206 Improve the power off fade animation.
e70bf65 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
62f1722 Merge "Accessibility enhancements within quick settings and notification shade." into jb-mr1-dev
3c576d9 Import translations. DO NOT MERGE
0fb7e32 Merge "Last position improvements for GeofenceManager" into jb-mr1-dev
55c7029 Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev
4efbab4 Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev
bd03f5a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
46c2699 Import translations. DO NOT MERGE
8d19760 DO NOT MERGE remove defunct javascript interface
36d337a Framework side of issue #7302511: GCM client needs to use new framework API...
8215ddb Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev
318b00b Show the touch explore enable dialog for the current user.
bac221f Accessibility enhancements within quick settings and notification shade.
9704b56 Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev
847b122 Merge "Fix problems with IME layers." into jb-mr1-dev
08fdd5b Doc change: edits to TV tablet story.
e6f7d50 Fix problems with IME layers.
9ded0e1 FUL fallback is no longer account login  - fix b/7280196
bb5f014 Merge "Use offset in line drawing" into jb-mr1-dev
55adc14 Adjust buffer position after copying
0e2aade Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f895f3c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
713246b merge in jb-mr1-release history after reset to jb-mr1-dev
9c2a38e Merge "Fix resource reading for secondary users" into jb-mr1-dev
de8e3b1 Merge "Fix NPE if pulling down QS quickly on very first boot." into jb-mr1-dev
9d09824 Fix NPE if pulling down QS quickly on very first boot.
245b453 Properly handle cancel event in GlowPadView
2167d73 merge in jb-mr1-release history after reset to jb-mr1-dev
33a8bd8 Merge "New icon for "Sleep now."" into jb-mr1-dev
843c539 Merge "AudioService: fix settings for fixed volume device" into jb-mr1-dev
133fcdf Merge "Clear draw flags when updating TextureView's layer Bug #7171323" into jb-mr1-dev
52b307e Clear draw flags when updating TextureView's layer Bug #7171323
118f484 Fix NPE on devices without notification panel help clings.
286da7b Fix for 7301594 Html.toHtml creating potentially invalid html
33902db AudioService: fix settings for fixed volume device
b341959 Merge "QuickSettings - fail gracefully if we can't query the profile data" into jb-mr1-dev
8efcdb6 merge in jb-mr1-release history after reset to jb-mr1-dev
db43f47 QuickSettings - fail gracefully if we can't query the profile data
d6344d7 Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev
64442c1 Fix resource reading for secondary users
b52b6bf Merge "Fix issue #7295951: Mako asks which Launcher to use at every re-boot" into jb-mr1-dev
9302251 Merge "Reduce screen on latency, eliminate flashes." into jb-mr1-dev
ec799e8 Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev
50ae66a Work around a possible driver bug Bug #7296475
297d789 More on #7296510 Transition from lock screen to dreaming is really bad
8b9cf1c Reduce screen on latency, eliminate flashes.
6309271 Fix issue #7295951: Mako asks which Launcher to use at every re-boot
b883116 Merge "Notification & settings panel help." into jb-mr1-dev
5745a67 Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev
af3f32d New icon for "Sleep now."
138f272 Merge "Save resized windows even if freezing." into jb-mr1-dev
33877e1 Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
b17a726 Notification & settings panel help.
786d109 Merge "Quick settings user display and switching" into jb-mr1-dev
b9afc27 merge in jb-mr1-release history after reset to jb-mr1-dev
7711260 Merge "Keep quick settings brightness icon/dialog level in sync." into jb-mr1-dev
fc6825b Merge "Update quick settings wireless display tile per spec." into jb-mr1-dev
140cdb7 Merge "Allow the dim brightness to be brighter than the minimum." into jb-mr1-dev
2ec390d Merge "Increase lock screen timeout when on custom widget page." into jb-mr1-dev
c7505bc Increase lock screen timeout when on custom widget page.
ade0a9a Save resized windows even if freezing.
5962b12 Adds showWhenLocked attribute to Activities.
b76eebf Allow the dim brightness to be brighter than the minimum.
1ad0fd9 Merge "Accessibility active window not updated on time." into jb-mr1-dev
f81dc4c Merge "Screen magnification cannot be engaged in landscape on a phone." into jb-mr1-dev
5217773 Merge "Fix issue #7296314, issue #7296314." into jb-mr1-dev
48f37ec Keep quick settings brightness icon/dialog level in sync.
6f2a3d2 Quick settings user display and switching
4c1e318 Fix issue #7296314, issue #7296314.
d9c9912 Merge "Incorrect temporary detach of accessibility focused view may lead to a crash." into jb-mr1-dev
4d12d5b Merge "Recover from bad input event timestamps from the kernel." into jb-mr1-dev
a7bcb54 Screen magnification cannot be engaged in landscape on a phone.
f33b2b2 Recover from bad input event timestamps from the kernel.
b30cb10 Use offset in line drawing
b71ccfc Merge "Fix widget cross-talk between users due to Settings widget" into jb-mr1-dev
2b1cab0 am 42bf1848: am daf69014: am a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs
42bf184 am daf69014: am a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs
daf6901 am a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs
a4c7176 Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs
bfe4362 am 07afab6b: am 34765caf: am d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs
f772cba Accessibility active window not updated on time.
07afab6 am 34765caf: am d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs
34765ca am d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs
d8a4a72 Merge "Doc change: edits to distribute content." into jb-dev-docs
c886060 Incorrect temporary detach of accessibility focused view may lead to a crash.
9aeb0a8 Doc change: Add core quality and tablet quality docs and spotlight.
a21bf0c Suppress unnecessary calls to update widget size (issue 7287744)
f948500 Merge "Fix the issue on the input method switch picker" into jb-mr1-dev
a3225e2 Fix a deadlock involving BatteryService.
b623054 Don't disable multi-user widget when Device Policy is enabled.
bfd4e32 Lock the screen while dreaming after the appropriate timeout.
7af8d1b Ensure that dreams show while docked.
2fc69ff Coordinate screen on with the window manager.
020daad Merge "Accessibility focus not cleared on temporary detach." into jb-mr1-dev
5a3322f Merge "Fix unresponsive back button in keyguard." into jb-mr1-dev
8d0739d Accessibility focus not cleared on temporary detach.
8320de8 Fix widget cross-talk between users due to Settings widget
0a34d9e Fix unresponsive back button in keyguard.
fdcb225 Merge "Fix a deadlock involving BatteryService." into jb-mr1-dev
6409e44 am 1c2056d6: am 98d4d719: am 2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs)
1c2056d am 98d4d719: am 2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs)
98d4d71 am 2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs)
12ac607 Merge "Don't disable multi-user widget when Device Policy is enabled." into jb-mr1-dev
ec7131f Merge "Lock the screen while dreaming after the appropriate timeout." into jb-mr1-dev
605ea69 Fix a deadlock involving BatteryService.
6aaf295 Lock the screen while dreaming after the appropriate timeout.
2874a54 Merge "Add flag for displaying non-user's Windows to user." into jb-mr1-dev
d7eece3 Merge "Clear identity when requesting current user." into jb-mr1-dev
b06ccdf Merge "Ellipsize long avatar names in user switcher." into jb-mr1-dev
b78738f Clear identity when requesting current user.
0728206 Merge "Ensure that dreams show while docked." into jb-mr1-dev
7b83158 Ellipsize long avatar names in user switcher.
aa99257 Merge "Only play notification sounds for active user." into jb-mr1-dev
88400d3 Add flag for displaying non-user's Windows to user.
7221d3a Don't disable multi-user widget when Device Policy is enabled.
8637bd9 Only play notification sounds for active user.
73755c9 Merge "Fix settings restore" into jb-mr1-dev
9fca9e9 Ensure that dreams show while docked.
5075f8e Merge "Update TextureView's layer on size change Bug #7171323" into jb-mr1-dev
3543beb Fix settings restore
88801b2 Update TextureView's layer on size change Bug #7171323
3f1246a Merge "Coordinate screen on with the window manager." into jb-mr1-dev
d0f1993 Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev
c38c9be Coordinate screen on with the window manager.
3ea5fc2 Import translations. DO NOT MERGE
01e2f4f Update quick settings wireless display tile per spec.
72d2853 Import translations. DO NOT MERGE
7ef38ea Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev
06c8cfd Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"
e0bc96e Revert "Updated Roboto fonts with correct T comma accent encoding"
8347809 Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.
fc82b56 Lubricate a sticky notification panel.
26bf1a7 Merge "Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"" into jb-mr1-dev
f4037ff Merge "Revert "Updated Roboto fonts with correct T comma accent encoding"" into jb-mr1-dev
61695ff Make sure settings writes are permission checked correctly
bce0cbb Fix issue #7275122: Wall paper jank when switching users
9dc11eb Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev
3aeeaaf Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"
f07b5a5 Revert "Updated Roboto fonts with correct T comma accent encoding"
04b0963 Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev
fcfd3e6 Merge "Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE." into jb-mr1-dev
0223ffa Fix for bug: 7281620. Blank line after date in status widget disappears.
5b5d31b Merge "Lubricate a sticky notification panel." into jb-mr1-dev
d762019 Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev
c38bbc3 Lubricate a sticky notification panel.
7f1c248 Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.
a801f68 Restore rubberbanding on initial pulldown.
b62f227 merge in jb-mr1-release history after reset to jb-mr1-dev
3ba439d Fix the issue on the input method switch picker
20de160 Revert "Changes to support updating location providers."
d21b483 Merge "Add multi user support for bluetooth" into jb-mr1-dev
577b071 Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
efd7b26 Merge "More userActivity() calls in keyguard" into jb-mr1-dev
2a04e74 Merge "Updated clock hands for Quick Settings." into jb-mr1-dev
96b248a Updated clock hands for Quick Settings.
9cf2c52 More userActivity() calls in keyguard
b290885 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
9565ceb Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f5e2b2c Merge "DreamService API revisions." into jb-mr1-dev
2d78490 DreamService API revisions.
a07b1ff Merge "Support animating just the backlight when turning off." into jb-mr1-dev
29126cf Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev
f052093 Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev
0cd3c97 Merge "Settings (and general) restore fixes" into jb-mr1-dev
5067685 Settings (and general) restore fixes
9fdabab Allow lower case for owner info in keyguard
a52772f Support animating just the backlight when turning off.
fca9d63 Add multi user support for bluetooth
82b9464 Merge "Changes to support updating location providers." into jb-mr1-dev
0cdbd07 Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev
d8d842a No breadcrumbs for single-pane preferences
cb1518d Fix parceling of display info flags.
8aca4ca Read in the disable-keyguard-features flag from the XML file
1934862 Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev
c192c64 Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev
5430835 Ensure we send at least one wakeup/gotosleep transition.
439b85e Updated Roboto fonts with correct T comma accent encoding
327424d Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev
284b205 Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev
2ee1f65 Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev
f752202 Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
634cf31 Fix serial number assignment for new user on a freshly wiped device
17f36d1 Merge "Allow phone to go to sleep while in call." into jb-mr1-dev
82245c1 Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev
60ec50a Last position improvements for GeofenceManager
33f9cb8 Fix issue #7290206: Need API to get/look up user serial number
dfc8e79 Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev
2646b3a Merge "Prevent  overflow in LocationRequest.setExpireIn()" into jb-mr1-dev
dd2f15a Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev
7fd1386 Merge "Properly cancel Tether notification." into jb-mr1-dev
a9afacc Merge "multiuser support for LocationBlacklist" into jb-mr1-dev
3cab6b0 Properly cancel Tether notification.
11b999d MediaRouter/Wireless Display - correct initial state
93cbbb2 Allow phone to go to sleep while in call.
34637e5 Make sure to check write perms after rewriting destination table
941221c Handle other providers in isAllowedProviderSafe()
2ed01ad a few more crosslinks for design guide (to other design docs or dev docs)
dce8b94 Merge "Fix parceling of display info flags." into jb-mr1-dev
b4fad85 Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev
d690481 Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev
3f2ba62 Fix parceling of display info flags.
6474c4c Fix dupes in initial wallpaper selection
f3b8e6f Fix regression in AbsListView CHOICE_MODE_SINGLE
9bf15b4 Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912
b2eb028 Merge "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912" into jb-mr1-dev
e72fe16 Prevent  overflow in LocationRequest.setExpireIn()
fb442c8 Import translations. DO NOT MERGE
3c008f2 Merge "Disable quick settings panel in setup wizard (user 0)." into jb-mr1-dev
414561c am 7645936c: am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
7645936 am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
ab1456a am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
e3eeeb6 Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
97c69c5 Import translations. DO NOT MERGE
1cea533 am a35333c1: am c465ae32: am 688447e5: fix the lesson title names
a35333c am c465ae32: am 688447e5: fix the lesson title names
c465ae3 am 688447e5: fix the lesson title names
688447e fix the lesson title names
8a22919 Merge "Fix issue #6968859: home not exiting an ANR'd dream" into jb-mr1-dev
c30b6da Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev
3594e85 Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev
0c1b75c Bring back the notification panel handle peek animation.
d367b70 Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
6ebbe1b Merge "Invoking the global action dialog stops dreaming." into jb-mr1-dev
27b3819 Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
e4ed092 Merge "Fix for bug: 7274232. Bold date on lock screen." into jb-mr1-dev
0a890b3 Merge "Remove Start Dreaming^W^W Sleep Now 1x1 widget." into jb-mr1-dev
5fe7e2a Fix issue #6968859: home not exiting an ANR'd dream
7aa88f7 Remove Start Dreaming^W^W Sleep Now 1x1 widget.
2d1cf35 Fix for bug: 7274232. Bold date on lock screen.
dcf5a66 Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
3364b2f Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev
2babbe1 am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev
4e6922d Reset status bar in keyguard, fix MU status bar bug.
c3b8a9b am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev
069bc4a docs: Remove Android Open Accessory docs, which are now on source.android.com
bc7a20a resolved conflicts for merge of 78866b71 to jb-dev
18c2b6e Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev
7077b3c Read in the disable-keyguard-features flag from the XML file
b3f55fd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ceb4a21 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
78866b7 Merge "Doc update: TTL change." into jb-dev-docs
68e11d4 am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs
70e6cff am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs
6b96217 am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs
cea1f19 Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs
83762d2 multiuser support for LocationBlacklist
4473aba Doc change: edits to distribute content.
097922b Throw an exception instead of crash when a surface does not have a binding surface texture
1205d16 Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev
078a490 Clear notifications properly on ACTION_USER_STOPPED.
c19efc2 Changes to support updating location providers.
31fed73 Merge "AudioService: filter flags in volume methods" into jb-mr1-dev
f429921 throw SecurityException in isProviderEnabled()
cd54ca7 merge in jb-mr1-release history after reset to jb-mr1-dev
e4e8c56 Disable quick settings panel in setup wizard (user 0).
6295ef3 Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev
00d2d41 Support multi-user switch in TextServicesManagerService
f068fed Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
ebf7e28 Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev
d4cc942 add links from various design docs to corresponding developer docs
5b14b96 Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev
d211767 Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev
203a2f4 Fix launching home when there are multiple launchers installed
09d1cb3 am 486eb461: am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs
486eb46 am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs
5713b5b am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs
99f5ff0 Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs
5120adb Import translations. DO NOT MERGE
b4dc1c8 Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
35dd752 Merge "Rewrite raw insert()s and some raw query()s of moved-to-global keys" into jb-mr1-dev
c221d2b Rewrite raw insert()s and some raw query()s of moved-to-global keys
85201d3 Import translations. DO NOT MERGE
a6cab32 Merge "Events for window's content change should be dispatched  only for the active window." into jb-mr1-dev
1a2fac3 Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
ac2fc16 Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev
ce3e948 Fix keyguard landscape layout on phones
f7ee2a03 Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev
6fb7fd3 Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev
58fd9f8 Events for window's content change should be dispatched  only for the active window.
17033bf Remove unneeded margin below action bar subtitles
dfab363 Fix rendering artifacts on tiled renderers Bug #7275145
c428aae Fix issue #7267494, issue #7212347
33c3689 Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev
afccaa8 Use myUserId() only in registerContentObserver()
1a1918a Announce changes in keyguard message, e.g. bad unlock pattern.
55941e3 am c1f68fdd: am 3a247b27: am 48b2cadf: fix badge generator button
c1f68fd am 3a247b27: am 48b2cadf: fix badge generator button
3a247b2 am 48b2cadf: fix badge generator button
48b2cad fix badge generator button
db24f0a Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT
2e307a6 Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev
0fd713c Merge "Exception in the touch explorer when dragging." into jb-mr1-dev
ec33d56 Exception in the touch explorer when dragging.
88c3a51 Merge "Fix a bug in double-swiping panels..." into jb-mr1-dev
04fe8eb Merge "Exception when performing the global gestrue to enable accessibility." into jb-mr1-dev
e59ac5c Fix Catalan ("ca") date formatting.
6cc795a am 663db551: am 4d62456e: resolved conflicts for merge of f15f8a1b to jb-dev
663db55 am 4d62456e: resolved conflicts for merge of f15f8a1b to jb-dev
2e7b11a Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev
4d62456 resolved conflicts for merge of f15f8a1b to jb-dev
c5caba0 am 2af82879: am 25a9144b: Merge "docs: Update design download links" into jb-dev
2af8287 am 25a9144b: Merge "docs: Update design download links" into jb-dev
d288337 Exception when performing the global gestrue to enable accessibility.
25a9144 Merge "docs: Update design download links" into jb-dev
4eaa251 Merge "fix settings data base upgrade for ringer mode" into jb-mr1-dev
72f9a3e Merge "Clear interface address and reset connections" into jb-mr1-dev
6823de7 Merge "Modifying user switcher per design (issue 7047393)" into jb-mr1-dev
f15f8a1b Merge "add analytics event tracking for Design downloads, SDK downloads, Badges and Device art." into jb-dev-docs
fe3057f add analytics event tracking for Design downloads, SDK downloads, Badges and Device art.
3ec7bac No breadcrumbs for single-pane preferences
ab781ba am d4c18b01: am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs
d4c18b0 am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs
b31d0b3 am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs
55b0222 fix settings data base upgrade for ringer mode
d2e9486 Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs
efc7a2e Always enable hardware layers in widgets in keyguard while dragging.
db74299 Don't set keyboard insets if keyboard is hidden.
833a89c Merge "Fix range on blur intrinsic." into jb-mr1-dev
b8bb7a0 Merge "Port unmerged notification changes from jb-dev to jb-mr1-dev" into jb-mr1-dev
5a829cb Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev
0befeb2 Clear interface address and reset connections
22702c2 Doc update: TTL change.
4377d14 Port unmerged notification changes from jb-dev to jb-mr1-dev
e174ae2 Fix for testPaintFlagsDrawFilter CTS test
8abd702 Merge "Ensure dreams can be started when not powered." into jb-mr1-dev
70bf7d2 Merge "Fix PackageInstaller displays with multi-user" into jb-mr1-dev
645832d Ensure dreams can be started when not powered.
cdf932e Fix PackageInstaller displays with multi-user
f74df47 NfcAdapterExtras: expose driver name.
85db803 hide the redundant clock when the notification shade is open.
542a51c Invoking the global action dialog stops dreaming.
a762dfc am 21dec9f9: am 6a54f4e6: am 66ff277f: (-s ours) docs: Update design download links
45eacdd docs: Update design download links
0a8d326 Modifying user switcher per design (issue 7047393)
21dec9f am 6a54f4e6: am 66ff277f: (-s ours) docs: Update design download links
6a54f4e am 66ff277f: (-s ours) docs: Update design download links
26884df Merge "Send LockPatternView accessibility announcements before callbacks" into jb-mr1-dev
66ff277 docs: Update design download links
750bb9b Fix a bug in double-swiping panels...
e303c5c Send LockPatternView accessibility announcements before callbacks
7636693 Merge "Increase the anti-jitter threshold for status bar flings." into jb-mr1-dev
db9a376 Increase the anti-jitter threshold for status bar flings.
4b576e3 Merge "change string for wifi not connected state." into jb-mr1-dev
4fc3fb4 Merge "Always enable hardware layers in widgets in keyguard while dragging." into jb-mr1-dev
daab6af change string for wifi not connected state.
b25629b Merge "Close a Spinner dropdown if its anchor view goes away." into jb-mr1-dev
484de9d Merge "Fix for bug 6954231 text wraps on second line and is fused..." into jb-mr1-dev
1795325 Merge "Make settings backup/restore work in the new multi-user world" into jb-mr1-dev
f16daf6 Close a Spinner dropdown if its anchor view goes away.
cbfcf5a Merge "Panel physics changes." into jb-mr1-dev
67eab79 Panel physics changes.
8bd206b Don't set keyboard insets if keyboard is hidden.
799448b AudioService: filter flags in volume methods
7ba4b48 Merge "Fix build" into jb-mr1-dev
e1339bf Fix build
9e85191 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
6b55899 Fix for bug 6954231 text wraps on second line and is fused...
dfef9b0 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
f97262b Revert "Import translations. DO NOT MERGE"
3edcf5e Merge "make bluetooth iconography consistent with other quicksettings icons." into jb-mr1-dev
b2a7d27 make bluetooth iconography consistent with other quicksettings icons.
b92df33 Revert "Import translations. DO NOT MERGE"
6303084 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d14508f Merge "Disable statusbar pulldown gesture tracking." into jb-mr1-dev
8a29640 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
151f00d Disable statusbar pulldown gesture tracking.
fc6770e Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev
1fd3474 Merge "Allow QS to be closed via drag on background." into jb-mr1-dev
e5f7ec0 Allow QS to be closed via drag on background.
211f230 Merge "Fix Recents dismiss/back button behavior" into jb-mr1-dev
83ab5f6 merge in jb-mr1-release history after reset to jb-mr1-dev
e592363 Fix Recents dismiss/back button behavior
eeadda5 Always enable hardware layers in widgets in keyguard while dragging.
c2a2816 Merge "Update keyguard to send userActivity events" into jb-mr1-dev
fd28053 am bd26b2fb: am 5958cb0d: am c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories.
bd26b2f am 5958cb0d: am c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories.
5958cb0 am c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories.
c395f4a Doc change: Add core quality and tablet quality docs, tablet developer stories.
5d2da713 Update keyguard to send userActivity events
3f0a57d Merge changes Iccea764b,I624b559e into jb-mr1-dev
5558b79 Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
6bcd732 Switch back to user switcher in keyguard
61cd69c Keyguard polish
ff53254 Improve the screen dim duration calculation.
f3fb895 Implement screen on hack for wireless chargers.
891a216 am 39c78f0a: am b2e7d79f: am ddab47b7: update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
39c78f0 am b2e7d79f: am ddab47b7: update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
b2e7d79 am ddab47b7: update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
3573950 Close the current input method when attached view doesn't have a handler
d27f1cd Merge "Further refine touchMajor processing in ScaleGestureDetector" into jb-mr1-dev
75b694f Merge "Fix issue #7274813: A few sticky broadcasts aren't being sent to all users" into jb-mr1-dev
3e2358a Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev
a4d8204 Fix some synchronization issues in BatteryService.
5b5c414 Further refine touchMajor processing in ScaleGestureDetector
720d14d Merge "Fix issue #7273573: Need API to find out if activity is destroyed" into jb-mr1-dev
06fcebc Merge "audio service: fix system volume settings" into jb-mr1-dev
1ed299f Merge "Make USB services multi-user aware." into jb-mr1-dev
4b5aa78 Delay setting hidden until after isVisibleNow test.
fc3f24b Make USB services multi-user aware.
6d9dcbc Fix issue #7273573: Need API to find out if activity is destroyed
ddab47b update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
031e9d2 Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev
5cf72e1 Merge "Accessibility support for the widgets switcher of the lock screen." into jb-mr1-dev
75c4800 Merge "Add icon for mobile notification" into jb-mr1-dev
6526fdd Accessibility support for the widgets switcher of the lock screen.
ebb8f41 Add icon for mobile notification
bcbe9cf Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
9c614bf Merge "Send masked soft input mode into method." into jb-mr1-dev
9bfb8bc Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev
046184f Merge "Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO" into jb-mr1-dev
cb882f9 Fix bug removing all windows that belong to a display.
5bc54bf Merge "Fix issue #7272775: Auto Start Apps Not Starting" into jb-mr1-dev
3ed62ad Merge "Fix package verification with multi-user" into jb-mr1-dev
970a494 Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev
77aebfd Add new Display API for secure video capabilities.
c272664 Add some missing debug output.
659d260 am a142be8e: (-s ours) am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
aa4b3c7 Fix issue #7274813: A few sticky broadcasts aren't being sent to all users
a142be8 am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
60ce6d4 Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev
0e3984b Merge "Bring back Netflix progress bar Bug #7274157" into jb-mr1-dev
33b8f41 am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
aff614a Fixing up keyguard widget pager layouts
4253abb Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev
11f03b4 DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
41c769d Bring back Netflix progress bar Bug #7274157
0d21e21 Remove checkPermission() call in getAllProviders().
5bb4e29 Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1
98ec566 Merge "Re-add default sms_short_codes." into jb-mr1-dev
a22f081 am b847f0b5: am 04c63a40: docs: android training - Data Storage
de9627f Merge "Add operator name to network notification" into jb-mr1-dev
b847f0b am 04c63a40: docs: android training - Data Storage
4a9f071 Fix issue #7272775: Auto Start Apps Not Starting
d5523dc Call Surface.destroy when Display is removed.
66488d6 Make settings backup/restore work in the new multi-user world
31864d7 Fix range on blur intrinsic.
04c63a4 docs: android training - Data Storage
4736039 Import translations. DO NOT MERGE
d55deb0 Fix package verification with multi-user
09f090b am e81e42d7: (-s ours) Reconcile with jb-release - do not merge
e81e42d Reconcile with jb-release - do not merge
4e81bd4 Attempt to fix missing transport control in keyguard
6310b20 Import translations. DO NOT MERGE
aeb8d0e Up motion event not injected by the touch explorer at the end of a drag.
8257124 Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev
acb1c12 Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO
ec9b13d Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev
b8aad91 Add operator name to network notification
c6e570d Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev
c12dd97 Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
6ac833c Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev
6e2bee7 Migrate more System and Secure settings to Global.
fb4a113 Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
919adac Disable quick settings for users until USER_SETUP_COMPLETE.
cf8675e Draw stroked rectangle as meshes instead of textures Bug #7233734
0944d62 Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev
217ca3b Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." into jb-mr1-dev
832815c Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...
841594b Fix jump cut when dismissing items in Recents
f175525 Merge "Fix bug 7138446: Icon blips in during Recents animation" into jb-mr1-dev
141efcb Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-dev
9bdaada Fix bug 7138446: Icon blips in during Recents animation
87d7d94 Merge "Accessibility focus should not scroll automatically." into jb-mr1-dev
45af84a Touch explorer and magnifier do not work well together.
9c022df re-use status bar DateView in QuickSettings.
002e9d3 audio service: fix system volume settings
a85236e Accessibility focus should not scroll automatically.
bebefaa Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev
f683b56 Send masked soft input mode into method.
b531c81 Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev
6aa06b9 Merge "Fix notifications dismiss button." into jb-mr1-dev
57e6203 Merge "enable safe media volume according to country" into jb-mr1-dev
11d8481 Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev
d640bd3 enable safe media volume according to country
0f9deb3 Merge "renaming Sleep Mode feature." into jb-mr1-dev
bd27ea2 Merge "Update javadocs for DreamService." into jb-mr1-dev
a645447 renaming Sleep Mode feature.
60a8351 Fix notifications dismiss button.
6d8f648 merge in jb-mr1-release history after reset to jb-mr1-dev
9a0890c Fix jump cut when dismissing items in Recents
56925d6 Always update peer list in display controller
7ffa8c0 Fixing up keyguard widget pager layouts
30ed33b Merge "Owner should not be announces as a user switch." into jb-mr1-dev
0a551d6 Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev
5b7b999 Merge "Hiding appropriate nodes for accessibility in recents. Bug: 6855305 Change-Id: I2c9fac2cfc777f912ff78283bbe6b3a9666f17c6" into jb-mr1-dev
59f0769 Owner should not be announces as a user switch.
0207c09 Fixing a coupld lockscreen bugs
9a455fb Upading the strings for the global accessibility enabling gesture.
689586d Fix framework side of #7132432 com.android.vending:...
b35000f Merge "Attempt to fix missing lock sounds" into jb-mr1-dev
b14288d Attempt to fix missing lock sounds
ee82f8f Fix camera disambiguation in secure keyguard
2868059 Hiding appropriate nodes for accessibility in recents. Bug: 6855305 Change-Id: I2c9fac2cfc777f912ff78283bbe6b3a9666f17c6
3750db1 Merge "Route GPS notifications to all users." into jb-mr1-dev
6f354ed Merge "Fix issue #7226101: Secure image capture takes 5 seconds to start" into jb-mr1-dev
046cff1 Merge "Fix CTS test failures." into jb-mr1-dev
9ba8d78 Fix CTS test failures.
9f5ed35 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
bfa1063 Merge "Fix target utilization property_get." into jb-mr1-dev
2b77c10 Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
f16b625 Merge "Allow "factory.long_press_power_off" to be toggled at runtime." into jb-mr1-dev
d8357ce Merge "Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da" into jb-mr1-dev
b97d876 Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev
cc5a055 Fix issue #7226101: Secure image capture takes 5 seconds to start
9440a9c Fix bug #7259242 text is left justified with no padding
b3124b1 DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
f7c80fe Quick reject empty paths
d219797 Fix bug #7259242 text is left justified with no padding
bb47d3a MediaRouter/Wifi Display improvements
40c2870 Status bar: Keep disabled state per user.
efe9b48 Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
4aeb961 Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da
075bb6b Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" into jb-mr1-dev
6e6d781 Fix bug #7259242 text is left justified with no padding
7fde078 am e9d5d627: am 94b94fc5: am 32a1d2db: dashboard update for 10/1
e9d5d62 am 94b94fc5: am 32a1d2db: dashboard update for 10/1
94b94fc am 32a1d2db: dashboard update for 10/1
410bc60 Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev
cb6f950 Merge "New internal API to eliminate poke locks." into jb-mr1-dev
850c5b7 Allow "factory.long_press_power_off" to be toggled at runtime.
4b08e07 Merge "Quick reject empty paths" into jb-mr1-dev
946d05b DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
749a997 Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
3f00ffb Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev
2961d11 Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev
e983008 Fix target utilization property_get.
90fc905 Enable hardware acceleration for pointer location overlay.
db21284 Disable use of twilight mode for auto-brightness.
1e3b98d New internal API to eliminate poke locks.
3dc524b Use new API to override user activity timeout from keyguard.
1f7a09b Merge "Only inform DisplayManager of visible content." into jb-mr1-dev
ba30ac6 Merge "Redraw static wallpapers when a redraw is needed." into jb-mr1-dev
2ee6a2a MediaRouter/Wifi Display improvements
65d11b3 Only inform DisplayManager of visible content.
3a4d41a Update javadocs for DreamService.
4831543 Merge "Fix light default theme" into jb-mr1-dev
bf09ffb Quick reject empty paths
078e360 Import translations. DO NOT MERGE
2e7d25b Introduce ACTION_QUICK_CLOCK for the QS time tile.
a004f28 Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
e65afdb Merge "Lighten grain and make live preview gpu friendly." into jb-mr1-dev
a6af5fc Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev
80766f1 Fix bug #7259242 text is left justified with no padding
28b291f Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev
b525c3c Merge "Fix broadcast to a specific user" into jb-mr1-dev
2036a94 Merge "Fix cache deletion for secondary users" into jb-mr1-dev
0ac1028 Move bluetooth priorities from Secure to Global.
383b0f8 Merge "Repair lights out mode." into jb-mr1-dev
d0c439b Merge "Remove extra padding from alert dialog layouts in -xlarge" into jb-mr1-dev
825b330 Repair lights out mode.
6ad19f2 am 30bbfeaf: am a180cc3c: am cd579c57: wording tweak to brand guidelines
5c24fd0 Avoid NPE in GpsLocationProvider
30bbfea am a180cc3c: am cd579c57: wording tweak to brand guidelines
32a1d2d dashboard update for 10/1
a180cc3 am cd579c57: wording tweak to brand guidelines
5e3dcf7 Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
e98bde0 Fix broadcast to a specific user
54289b8 Fix cache deletion for secondary users
cd579c5 wording tweak to brand guidelines
c56e560 Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
bfbf6e1 Merge "Fix IME tile related crash" into jb-mr1-dev
aca0c75 Fix IME tile related crash
ff70848 Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
b5174cc Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
fb729c7 Redraw static wallpapers when a redraw is needed.
38389b6 Route GPS notifications to all users.
13451a2 Status bar: Keep disabled state per user.
17d5f47 Merge "Remove IME tile from Quick Settings." into jb-mr1-dev
dd68da8 Remove IME tile from Quick Settings.
d0f051d merge in jb-mr1-release history after reset to jb-mr1-dev
79eda11 Merge "Assets were drawn in the wrong timezone." into jb-mr1-dev
0a00cfd Merge "Tapping the clock now takes you to date/time settings." into jb-mr1-dev
a60d4bb Assets were drawn in the wrong timezone.
154bc06 Tapping the clock now takes you to date/time settings.
135e5fb Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
32a1e76 Remove extra padding from alert dialog layouts in -xlarge
d56b4d1 Construct a task stack for picking a wifi network from notification
c709de0 merge in jb-mr1-release history after reset to jb-mr1-dev
534bc83 Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
2f39e9f Switch from uevent model to /dev/input/event.
bdac829 Merge "Make rssi state change sticky" into jb-mr1-dev
e27f8cf Fix layout margins for Preferences in dialogs
5def66e Re-add default sms_short_codes.
71520a6 Merge "Handle ISE when physical volume isn't mounted." into jb-mr1-dev
5607e6f Fix light default theme
17d9f67 Make rssi state change sticky
edce6a7 Remove clearUserActivityTimeout().
b023a58 Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
62ea436 Merge "Fix texture corruption" into jb-mr1-dev
2a30547 Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
6a2d17f Fix texture corruption
2b58c1b Merge "Disable package verification in test harness" into jb-mr1-dev
fe37f8f Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...
a2064df Disable package verification in test harness
2032a12 Merge "Making runway lights appear for correct pages (issue 7232481)" into jb-mr1-dev
1d1fb6c Making runway lights appear for correct pages (issue 7232481)
fb42be7 Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev
32ee831 Handle ISE when physical volume isn't mounted.
933a754 Fix build
132a742 Fix UNSPECIFIED measurement in RelativeLayout
2effc77 Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
0a5bc22 Merge "Integrate keyguard paging hint" into jb-mr1-dev
b97a71e Merge "Getting rid of keyguard widget flag that isn't used" into jb-mr1-dev
a6efc96 Merge "Changing debug for b/7094175." into jb-mr1-dev
ce75fef Merge "Fix the build" into jb-mr1-dev
10c84ed Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
796e5bf Fix the build
8ed6b6a Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev
af61cc4 Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
fc49474 Update APIs to JB MR1 level 17.
955b66d Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095" into jb-mr1-dev
47fb191 Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
f2e5cf4 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
c8a3d97 merge in jb-mr1-release history after reset to jb-mr1-dev
ce803d8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c36c49e Changing debug for b/7094175.
9ea8f39 Explore by touch enabled when screen magnification is on.
a995b6e Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
c1aa6a5 Integrate keyguard paging hint
82ebe6f Getting rid of keyguard widget flag that isn't used
9654329 Getting rid of blue outline in user switcher, instead brighten the user
885d82d reset() should reset. Otherwise it would be called something else. Bug #7256095
7f81320 Merge "Get rid of preventScreenOn()." into jb-mr1-dev
7c3586c Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
1ed143e Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
343e113 Fix bug #6427629 Clean up layout direction APIs
1206648 Get rid of preventScreenOn().
d3081bc Merge "Revert setting GO idle time out" into jb-mr1-dev
1ebb720 Lighten grain and make live preview gpu friendly.
8421556 Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
be87e2f Fix issue #7255954: API Review: rename Dream to DreamService
c521178 Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
4682421 Sending interaction end event at the end of a drag.
3efe106 Clean up SIM PIN and PUK screens in keyguard.
2c22bb8 Merge "Update Premium-SMS detection UI." into jb-mr1-dev
ce6fc8d Revert setting GO idle time out
9c7c5cf Show plmn in emergency call allowed mode.
4984ec7 Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
be290dd Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
106a692 Merge "Keep callback reference from being null." into jb-mr1-dev
3ff8e1a Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev
d5edc77 Fix adjustViewBounds handling for ImageView
1d35273 Merge "Fix issue #7202950: After clearing data, clear data button is still enabled." into jb-mr1-dev
15bbde4 Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
925a659 Merge "Use updatable file for premium-sms filter" into jb-mr1-dev
d4ac8d7 Fix issue #7211769 and #7244492, thrash around on #7226656.
00baebe Keep callback reference from being null.
c552081 Merge "Don't try to open action bar overflow menus from bogus events" into jb-mr1-dev
4acbe2d am ef6130d6: am dc3e0069: am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs
ef6130d am dc3e0069: am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs
dc3e006 am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs
b78c220 Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs
6a5b0a3 Don't try to open action bar overflow menus from bogus events
40b8b01 ScaleGestureDetector does the safety dance.
91c5c21 Adding missing file in previous change (Bug 7252771)
1ee9faf Add wireless display selection support to MediaRouter.
df02c90 Fixing crash in QuickContacts. (Bug 7252771)
29dcd65 Merge "Track offset of center child view in Gallery for later layouts" into jb-mr1-dev
8c43650 Merge "Fix a couple of rendering issues Bug #7253839" into jb-mr1-dev
07ddb46 Merge "NumberPicker should adjust min and max when displayed values are set." into jb-mr1-dev
4e8510b Track offset of center child view in Gallery for later layouts
a3dc55f Fix a couple of rendering issues Bug #7253839
94ffe87 Merge "Pass display arg to blank/unblank" into jb-mr1-dev
053644d Merge "add api level 17 to javadoc filter and update version number" into jb-mr1-dev
59adf04 am 7e8c613f: (-s ours) Reconcile with jb-mr0-release - do not merge
aa64b11 Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev
7e8c613 Reconcile with jb-mr0-release - do not merge
4131a37 String change for video routing via MediaRouter; "HDMI" not "HDMI audio."
fd4da14 Merge "Add Settings.Secure.USER_SETUP_COMPLETE" into jb-mr1-dev
a1410e6 NumberPicker should adjust min and max when displayed values are set.
073a32d Merge "Fix occasional re-posting of ticker text." into jb-mr1-dev
47c52a8 Merge "Some accessibility events not sent from touch explorer if apps misbehave." into jb-mr1-dev
8af2a13 Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev
f59a90c Fix occasional re-posting of ticker text.
669aa7c Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
287f8a6 Merge "Remove dock home support." into jb-mr1-dev
7c13520 Remove dock home support.
808ce66 Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev
cfb7d39 Merge "Adding missing file in previous change (Bug 7252771)" into jb-mr1-dev
f7910e3 Merge "Add wireless display selection support to MediaRouter." into jb-mr1-dev
1134de0 add api level 17 to javadoc filter and update version number
6e2cbcc Merge "Missed a spot, needInput was not getting called." into jb-mr1-dev
f3a2bf8 ScaleGestureDetector does the safety dance.
4873a48 DO NOT MERGE - Full (local) restore security changes
1d74a5a Adding missing file in previous change (Bug 7252771)
cd03a26 Missed a spot, needInput was not getting called.
db705ef re-write the Dialog guide to focus on using DialogFragment
705ab80 Add wireless display selection support to MediaRouter.
9fc6b8c Fixing crash in QuickContacts. (Bug 7252771)
8c832e9 am ad8bda21: (-s ours) am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes
ad8bda2 am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes
fe304b8 Some accessibility events not sent from touch explorer if apps misbehave.
54801e1 Merge "Fix for bug 6936752 Tamil text gets truncated on right-hand side" into jb-mr1-dev
01996793 Merge "Remove user switcher from long-press power menu" into jb-mr1-dev
56f2e63 Import translations. DO NOT MERGE
9dbbfcd Merge "Pass the originating uid to the package verifier" into jb-mr1-dev
856b01e Make the theme for choose account and choose account type dialogs same.
edf60a2 Import translations. DO NOT MERGE
f80ad90 Merge "Add the SystemUI's dream-starter as a DESK_DOCK app." into jb-mr1-dev
6e06191 Merge "Prop the tablet notification panel open a bit." into jb-mr1-dev
95841ac Merge "Inconsistent events on transition from gesture detection to touch exploration." into jb-mr1-dev
ca86882 Merge "Accessibility services that do not accept events are mismanaged." into jb-mr1-dev
af08ccb Merge "Add null checks before using mViewMediatorCallback." into jb-mr1-dev
7def1db Add null checks before using mViewMediatorCallback.
c6fa237 Use updatable file for premium-sms filter
bc4ba82 Remove user switcher from long-press power menu
a174a77 Merge "Close the notification shade when starting dream." into jb-mr1-dev
0dc2b81 Merge "Cleanup internal status bar APIs." into jb-mr1-dev
aed4b6f Inconsistent events on transition from gesture detection to touch exploration.
1f22b6a Accessibility services that do not accept events are mismanaged.
e680f54 Prop the tablet notification panel open a bit.
591a9e8 Close the notification shade when starting dream.
3a12029 Add the SystemUI's dream-starter as a DESK_DOCK app.
855a9d7 merge in jb-mr1-release history after reset to jb-mr1-dev
195b6e1 Merge "Fix panel handles on large screens." into jb-mr1-dev
13701b5 Merge "Bundle correlated switch changes atomically." into jb-mr1-dev
3cd9612 Merge "Fix ime swtich issue" into jb-mr1-dev
d08a923 Fix ime swtich issue
08874db Merge "Fix HierarchyViewer so it can load Contacts" into jb-mr1-dev
97723b2 Fix HierarchyViewer so it can load Contacts
97298cd Merge "Fix recents animation in landscape Bug #7250041" into jb-mr1-dev
4b41688 Fix recents animation in landscape Bug #7250041
7d82989 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2d75435 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1bc9d3f temporarily disable blacklisting
b97ad20 Revert "Do not use last app rotation as default."
e8f5276 Revert "Fix adjustViewBounds handling for ImageView"
624ef46 Global gesture to toggle Accessibility system-wide.
97caa01 Fix perf regression from scale/density mismatch
b53e70e Plug memory leak that happens when reusing display lists Bug #7195815
3be9a14 Don't use the QCOM_tiled_rendering extension with functors Bug #7247880
a7a257d Merge "Plug memory leak that happens when reusing display lists Bug #7195815" into jb-mr1-dev
1f04fdd Import translations. DO NOT MERGE
0e7d76c Import translations. DO NOT MERGE
448f6e1 Merge "temporarily disable blacklisting" into jb-mr1-dev
42af2ac Merge "Revert "Do not use last app rotation as default."" into jb-mr1-dev
bcc046a Bundle correlated switch changes atomically.
ae26839 Merge "Revert "Fix adjustViewBounds handling for ImageView"" into jb-mr1-dev
0f862b4 Revert "Do not use last app rotation as default."
5735b1b Merge "Fail fast on persistent failure" into jb-mr1-dev
68f3eb3 Revert "Fix adjustViewBounds handling for ImageView"
10a2979 Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev
7befb7d Global gesture to toggle Accessibility system-wide.
5e9187a Merge "Fix "system" resources; more context user work." into jb-mr1-dev
e496114 Merge "Treat additional inputmethod subtypes per user" into jb-mr1-dev
75aefb8 Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing
7c72a8f Merge "Fix perf regression from scale/density mismatch" into jb-mr1-dev
ded653b Fix "system" resources; more context user work.
3dc0b80 Merge "Fix layout state issues." into jb-mr1-dev
3a8af8e Merge "Migrate more Secure settings to Global." into jb-mr1-dev
034de6b Plug memory leak that happens when reusing display lists Bug #7195815
5e08af0 Respect per-user rotation lock et alia
f41496f Fix issue #7202950: After clearing data, clear data button is still enabled.
a852ff3 Merge changes I9873540e,I4f6c38e3 into jb-mr1-dev
93aa70c Merge "Only poke the wakelock for FUL if the screen is on fixes 7222901" into jb-mr1-dev
b319d5d temporarily disable blacklisting
64d1f3e DO NOT MERGE - Full (local) restore security changes
812d2ca Fix layout state issues.
6ed9e43 Skia's ColorMatrix vector is in the 0..255 range not 0..1 Bug #7248980
0d5cad7 Merge "Updating AndroidClock font to match the Roboto thin style for time display." into jb-mr1-dev
327b321 Merge "Fixing various QS issues. (Bug 7217102)" into jb-mr1-dev
54c1a64 Don't use the QCOM_tiled_rendering extension with functors Bug #7247880
96a8bb6 Merge "Fix crash caused by null owner info Fixes bug 7249550" into jb-mr1-dev
36c37a0 Fix crash caused by null owner info Fixes bug 7249550
24de605 Updating AndroidClock font to match the Roboto thin style for time display.
efba323 Fixing various QS issues. (Bug 7217102)
ca1269f Fail fast on persistent failure
3f5a59a Fix perf regression from scale/density mismatch
03b8d3a Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams
9a04856 Other improvements for bug #6427629 Clean up layout direction APIs
9aacd50 Merge "Fix issue #7242119 and #7242008." into jb-mr1-dev
625239a Migrate more Secure settings to Global.
e00d33c Merge "Fix rectangle AA offset calculation" into jb-mr1-dev
4af1146 Merge "Force redraw of new/resized windows" into jb-mr1-dev
1081eed Pass display arg to blank/unblank
4251736 Merge "Update keyguard layouts on phone" into jb-mr1-dev
3af630c Update keyguard layouts on phone
391fef0 Force redraw of new/resized windows
16b897c Fix rectangle AA offset calculation
3f91e43 Merge "Full (local) restore security changes" into jb-mr1-dev
41148af Merge "Fix bug #7241988 Padding is mostly set to "0"" into jb-mr1-dev
bbd1029 Fix bug #7241988 Padding is mostly set to "0"
3244e96 Fix issue #7242119 and #7242008.
de6ae44 Add Settings.Secure.USER_SETUP_COMPLETE
37d83a3 Pass the originating uid to the package verifier
f6d6fa8 Full (local) restore security changes
13522a2 Fix panel handles on large screens.
580ee8b Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
62d2d62 Merge "Fixing Keyguard widget click handling (issue 7179972)" into jb-mr1-dev
11cf178 Cleanup internal status bar APIs.
acbe41f Only poke the wakelock for FUL if the screen is on fixes 7222901
9a4a037 Merge "Stop FaceUnlock when detached from window fixes b/7222226" into jb-mr1-dev
6c805cb Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b0d135d Merge "Add stroke support to polygonal shape rendering" into jb-mr1-dev
d973039 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
4735a1e Merge "New notification/settings panel handle assets." into jb-mr1-dev
4e32ba7 New notification/settings panel handle assets.
a156958 merge in jb-mr1-release history after reset to jb-mr1-dev
fbb9c61 Stop FaceUnlock when detached from window fixes b/7222226
2da2ec1 Merge "Fix imf flag" into jb-mr1-dev
accd22a Fix imf flag
5ade83b Treat additional inputmethod subtypes per user
66442c7 Merge "Work on issue #7232641: ISE crash when rotating phone in label list mode" into jb-mr1-dev
2480bc1 Merge "Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev
f43a33c Work on issue #7232641: ISE crash when rotating phone in label list mode
c7ba771 Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user
7bb89cf Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev
f21b94a Merge "Remove unused Secure settings." into jb-mr1-dev
68b7a6d Merge "First step towards cleaning up Global settings." into jb-mr1-dev
0b17115 Merge "RS char bug repro case" into jb-mr1-dev
c49c71a Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev
f9d40f4 Cure narcolepsy.
dd78d46 Fix JNI method signature.
571c81e ScaleGestureDetector bugfixes
6c673ba Reverting public setSoWriteTimeout
bc33545 Allow applications to connect to known wifi displays.
3ff2d86 Fixing AppWidgetService / AppWidgetHost to work in system process
4de9936 Remove unused Secure settings.
38796fe Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
a6a4cbc Fixing Keyguard widget click handling (issue 7179972)
eed8f06 Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
0c9bbf4 Merge "Make DreamManagerService more robust." into jb-mr1-dev
5a864aa Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev
bdfce2e First step towards cleaning up Global settings.
ead9054 Merge "Move DreamManagerService to its own package." into jb-mr1-dev
1974420 Merge "fix build break" into jb-mr1-dev
abde042 ScaleGestureDetector bugfixes
0e3d40d fix build break
43d1c2d Import translations. DO NOT MERGE
c31c543 Merge "fix blend intrinsics, add tests" into jb-mr1-dev
244a0bc Merge "Make gradients beautiful again Bug #7239634" into jb-mr1-dev
3a584a0 Import translations. DO NOT MERGE
39284b7 Make gradients beautiful again Bug #7239634
74478f7 fix blend intrinsics, add tests
13987fb Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
7b87999 Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev
992f238 Reverting public setSoWriteTimeout
bf18487 Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
62c82e4 Make DreamManagerService more robust.
cef440f Move DreamManagerService to its own package.
b1271ac Fix adjustViewBounds handling for ImageView
51ce160 am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.
46cc524 am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.
4d5c2b0 Fix issue #7238170: Edit picture option is not available for the secondary user.
d648a60 Fix sync problems when setting up a new user and account
f7243dc Add --error-on-failed-insert option to aapt. do not merge.
834fc23 Merge "More activity tests." into jb-mr1-dev
e521573 Merge "Maybe fix issue #7211766: bindService() to User u0 While u10 is..." into jb-mr1-dev
b12e135 Maybe fix issue #7211766: bindService() to User u0 While u10 is...
cb4d600 Add stroke support to polygonal shape rendering
62fbb83 Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev
fea9df6 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
8b3750e Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
404479a Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global
54ea6bf Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173" into jb-mr1-dev
1951db8 Merge "Multi-user ringtone playback." into jb-mr1-dev
bd43152 Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
fd3398c am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
44c564f am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
d8104d9 am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
829986a Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
74708d8 DOC CHANGE: Fix Google Play services page
9faab4f Fix Wifi Stress test after wifi settings are moved to Settings.global
d77050a Assign default texture id of 0
d401d58 updates to the brand guidelines, based on the partner toolkit
c9f345f Document interaction of SurfaceView and post-layout transforms
832981c am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
6aba1d7 am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
8a58c03 am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
b4510e3 Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev
8e3dca8 Merge "Doc change: Update GP services description." into jb-dev-docs
d2a8a5e Doc change: Update GP services description.
4368ba4 am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
3cda846 am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
8bf95ee am ed5ff3bd: add analog clock attributes to docs
a2b978b Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev
ed5ff3b add analog clock attributes to docs
80c491f am 16eb5366: am 54645245: am 14a36625: fix markup bugs
16eb536 am 54645245: am 14a36625: fix markup bugs
5464524 am 14a36625: fix markup bugs
4118012 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
2ea1045 Merge "Applies a layer's color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev
e529ece Applies a layer's color filter even when the layer is a quad Bug #7238059
14a3662 fix markup bugs
fddedc9 Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev
0122a3d Fix writing text version of styleable IDs. do not merge.
d48478e Merge "Assign default texture id of 0" into jb-mr1-dev
f8b18ce am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.
4649d03 am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.
98d3a64 Assign default texture id of 0
6c6ddbf Fix writing text version of styleable IDs. do not merge.
65c4a2b Multi-user ringtone playback.
f41f505 Dream metadata now specified using an xml-resource.
3272a38 Fix Wifi Stress test after wifi settings are moved to Settings.global
2832136 Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev
72a3747 Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev
3c508b4 merge in jb-mr1-release history after reset to jb-mr1-dev
4e1ab15 Enable multi-user function for IMF
f05d511 Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev
ca68f4a Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev
0f08b81 Remove WifiStateTracker code tracking wifi p2p
df8bfe0 LockScreen: only set keystore password for owner
17ef62c fix a possible dead-lock when clearing caches
348f08f Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev
54643d7 make sure to destroy GL objects on the GL thread
0baa380 Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912
8d60b1e Restore RSTest functionality (char bug is fixed).
5e1c74d Merge "Remove permission check in registerAdapter" into jb-mr1-dev
4cdc538 Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"
d895d37 RS char bug repro case
cefbd14 Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"" into jb-mr1-dev
56257af Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"
e8e2b67 Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev
d736d20 Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
9703880 am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state
82e7fdf am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state
4f832bc am 3b1c5d55: add tip about including android:id for layout state
3b1c5d5 add tip about including android:id for layout state
670ef53 Remove permission check in registerAdapter
067b473 Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-dev
be07e6a am c80188eb: am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
c80188e am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
9b51638 am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
6e065a7 Merge "Handle multi-user mountObb() requests." into jb-mr1-dev
e35d928 cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
5c41522 Deleting objects on the wrong thread is a silly idea Bug #7195815
265f278 P2p fixes
4fbbda4 Handle multi-user mountObb() requests.
b4693e2 Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev
3992645 More activity tests.
2fd6cb0 Merge "Fixing the build" into jb-mr1-dev
0631585 Fixing the build
b32e221 Merge changes I332f020f,I632648ac into jb-mr1-dev
0a52088 Merge "Fix typo." into jb-mr1-dev
c6c4365 Implement android.media.AudioManager.getProperty()
80cd819 Use more reasonable warning thresholds for power on/off.
282c51d Merge "Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)" into jb-mr1-dev
61ad1ba Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev
c91fb58 Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
fe54290 Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
c86b23b Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)
0c62257 Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev
5d50ab7 Merge "Deleting objects on the wrong thread is a silly idea Bug #7195815" into jb-mr1-dev
bf5d185 Merge "Attempt to clarify how pluralization actually works." into jb-mr1-dev
99f19db Merge "Fix 7216326: Recents has a "dead zone" on tablets" into jb-mr1-dev
a4ce6ae Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
76218b8 Fix 7216326: Recents has a "dead zone" on tablets
0cd0167 Attempt to clarify how pluralization actually works.
e20a177 Adding a global accessibility action to open quick settings.
150443a Merge "Fix 7216870: recents relaunches dismissed activity" into jb-mr1-dev
e8e9870 Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev
e79275a Merge "P2p fixes" into jb-mr1-dev
be47828 Merge "Load resources for the correct user" into jb-mr1-dev
8a13749 Deleting objects on the wrong thread is a silly idea Bug #7195815
1908cf9 Merge "Fixing argument expectations of View.requestRectangleOnScreen" into jb-mr1-dev
98edc95 Load resources for the correct user
fd901f7 Add a static generator that takes a Socket Write Timeout Argumanet
bf6f6f9 Update references to migrated global settings.
d493596 Handle user switched for settings changes.
989ae75 Fixing argument expectations of View.requestRectangleOnScreen
28e0b09 Fix typo.
e181bd9 Fix AbsListView to correctly retain its state if not layed out.
761d3d0 Reduce test warmup time to avoid driving into thermal throttle.
b1c4ab5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1c9766e Merge "The active window for accessibilitiy incorrectly tracked." into jb-mr1-dev
3273ca7 Regression in screen introspection APIs due to the multi-user change.
f465b72 Fixing various QS issues. (Bug 7216908, Bug 7217154)
c41096e P2p fixes
7fb98b3 Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode
1a2297a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5520ca7 Update Premium-SMS detection UI.
3df0e34 Import translations. DO NOT MERGE
a8afa69 Regression in screen introspection APIs due to the multi-user change.
08e8d84 Fix 7216870: recents relaunches dismissed activity
62b482a Import translations. DO NOT MERGE
1ab8a08 Merge "Fix for bug: #7172778. Javadoc errors in LocationManager." into jb-mr1-dev
ade54e5 Merge "Fix recents animation in landscape on tablet" into jb-mr1-dev
a752e7c Fix recents animation in landscape on tablet
7357788 Fix for bug: #7172778. Javadoc errors in LocationManager.
1f88ba8 Fix bug #6427629 Clean up layout direction APIs
6433916 Merge "Don't destroy the same texture twice Bug #7221449" into jb-mr1-dev
ef09a21 Don't destroy the same texture twice Bug #7221449
89ba270 Merge "Fixing various QS issues. (Bug 7216908, Bug 7217154)" into jb-mr1-dev
509e2ce Merge "Improvements to notification/settings panels:" into jb-mr1-dev
9b3a7f7 Merge "Update doc on getConfiguredNetworks" into jb-mr1-dev
173bae2 Improvements to notification/settings panels:
a8a7e71 Merge "Extra GC heap configuration parameters." into jb-mr1-dev
b62e812 merge in jb-mr1-release history after reset to jb-mr1-dev
5e21bf9 Unhide SSLCertificateSocketFactory.setSoWriteTimeout
b8c2ac3 Merge "Watch for voice recognition service changes for all users" into jb-mr1-dev
f80a9b2 Watch for voice recognition service changes for all users
4bbcc65 Display a fixed volume silder when docked.
f4b5ab1 Fixing various QS issues. (Bug 7216908, Bug 7217154)
3b772c6 Merge into jb-mr1-dev
5ef9cb6 Merge into jb-mr1-dev
b8d4c9f Merge into jb-mr1-dev
7e886bc Merge into jb-mr1-dev
03de511 Fix graphics glitch and layouts in recents on 10" display
ed1b6f4 Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
a7546e3 Merge into jb-mr1-dev - do not merge
c002936 Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
bf2e088 Merge into jb-mr1-dev
164ff6b Merge into jb-mr1-dev
fe3632b Merge into jb-mr1-dev
56d8cc1 Merge into jb-mr1-dev
ecfc9ca Merge into jb-mr1-dev
d336460 Merge into jb-mr1-dev
9529386 Fix build
0dfe1cf Merge into jb-mr1-dev
07e35aa Merge into jb-mr1-dev
7951c45 Merge into jb-mr1-dev
a5e1d21 Merge into jb-mr1-dev
ec19961 Merge into jb-mr1-dev
7a7c6aa Merge into jb-mr1-dev
641c36f Merge into jb-mr1-dev
e83221c Fix alpha channel computation with ColorMatrixColorFilter Bug #7222476
f853859 Fix build.
1b24275 Merge into jb-mr1-dev
fd5be70 Merge into jb-mr1-dev
0de06b7 Merge into jb-mr1-dev
c68accd Merge into jb-mr1-dev
ca94050 Merge into jb-mr1-dev
93fd0f7 Merge into jb-mr1-dev
908a432 Merge into jb-mr1-dev
6fb2514 Merge into jb-mr1-dev
8f862ef Add NfcBarcode technology API.
5a8aefa No more double-swiping to toggle panels on tablets.
666d475 Return carrier label to notification panel.
7641506 Fix wrong password attempt count in DevicePolicyManager
76c0dd4 The active window for accessibilitiy incorrectly tracked.
03e7b88 More than one finger at a time can trigger a system crash.
ae76051 Test FS getElementAt
5935853 Update doc on getConfiguredNetworks
3671410 Fix dialogs on secondary displays.
85d4955 Add test for copy kernels.
ea7e915 AppInfo from Notifications for secondary users
1925e29 getBestProvider() prefers GPS over NLP
fe03e97 Add extra error check when eglCreateContext fails Bug #7216919
187f3f9 Magnified frame not properly computed when keyguard goes away.
1b10241 Fix for bug 6936752 Tamil text gets truncated on right-hand side
d0b90d3 Hiding a method for JB-MR1
482410d reduce notification pad on large displays.
4c7dc4a Add extra error check when eglCreateContext fails Bug #7216919
8d0243a Fix surface view on secondary display.
7ae1883 Merge "Fix build" into jb-mr1-dev
0988524 Fix build
14a9f2b Fix drag and drop surfaces on secondary displays.
2033763 Allow a window on a secondary display to have focus.
efd43bd Force activities to run on the second display for testing.
9ceac5a TaskStackBuilder and intents without an explicit target
816153b Merge "Test image for 2 input tests." into jb-mr1-dev
139748f Fix issue #7215984: java.lang.RuntimeException: Unable to create...
270a331 Merge "UI test automation service should not be auto reconnected." into jb-mr1-dev
657968a UI test automation service should not be auto reconnected.
598cfca Merge "Properly launch quicksettings activities." into jb-mr1-dev
583fab5 Import translations. DO NOT MERGE
4d6f90e Adding support for new 'uid2445' column in Calendar's Events table.
4249be4 Merge "Updated versions of DroidSansFallback" into jb-mr1-dev
7d8bcb4 Move multi-user OBB under user-specific path.
c4b95cf Test image for 2 input tests.
a850f9a Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev
5bcb551 fix argument parser for global settings URLs
487acdf Camera: Improve enableShutterSound documentation.
87e2f75 Add a property to disable libhwui's scissor optimization Bug #7158326
bc391d5 Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev
53fe756 Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
9b93f4d Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev
7451f15 Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev
556b09e Fix issue #6926562: Ensure all multi-user cache files are managed correctly
b00df8e Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
cd11b22 Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev
50cdf7c Fix issue #7214090: Need to be able to post notifications to all users
c0373df Do not preload videoeditor_jni since it breaks the emulator
d5111f2 Merge "Fix the build." into jb-mr1-dev
026efcc Fix the build.
fcf0061 Merge "Skip operations for users who are not running" into jb-mr1-dev
0ff6537 Merge "Add columns to CalendarContract" into jb-mr1-dev
888eb73 resolved conflicts for merge of 814f5ac3 to jb-mr1-dev
8658e1a Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev
814f5ac am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
18fd992 am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge
b079d1f am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
c6f8a99 Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev
a07cbb9 Reconcile with jb-mr0-release - do not merge
ee4262e merge in jb-mr1-release history after reset to jb-mr1-dev
2ce1ae8 Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev
562c45c Updated versions of DroidSansFallback
3ffdcc7 Properly launch quicksettings activities.
26c5686 Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev
84c843f merge in jb-mr1-release history after reset to jb-mr1-dev
49397ac9 Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev
6b3292c Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev
97dc917 Avoid deadlock when deleting layers Bug #7217459
916b2b5 Merge "Increase WFD connect time out to 60s" into jb-mr1-dev
2c2ca5c Increase WFD connect time out to 60s
b499884 Better handling of multiple touch events in GlowPadView
f7a3e97 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
752cd92 Always bind to DefaultContainerService as OWNER.
5325010 Extra GC heap configuration parameters.
ac4bd00 Change 5x5 convolve to better test impl.
1a7d487 Fix bug #6427629 Clean up layout direction APIs
be4c5dd Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
9c7b529 Merge "Verify pass-by-value kernels with structs." into jb-mr1-dev
5e8cbdc Merge "Fixing services start order that impacts ICS - JB upgrade"
97e146c Fix bug #6427629 Clean up layout direction APIs
8a06969 Merge "Refactor Cell Location public API." into jb-mr1-dev
335fff3 Merge "P2p fixes" into jb-mr1-dev
d36adc3 P2p fixes
239e430 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
17e3e9e Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev
e3f2ac9 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
d392b87 Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev
e56ffdc Fix bug #6427629 Clean up layout direction APIs
4285de3 Fix overdraw debug on QCOM
574cf60 Make sure we never bind to texture #0 Bug #7195815
4457e85 Fix bug #6427629 Clean up layout direction APIs
8dbb634 Allow apps to getProviders() without location permissions.
c0e1f26 Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev
3b84206 Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
5a37088 Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev
11820f7 Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev
b939e35 Merge "Fix issue #7209355, #7214271." into jb-mr1-dev
8da429e Fix issue #7209355, #7214271.
925b6a7 Merge "Optimize glyph cache texture uploads" into jb-mr1-dev
5a009dc Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev
b92d8f7 Optimize glyph cache texture uploads
bda527e Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev
57d863c Merge "Fix the build" into jb-mr1-dev
c96a7fb Further tweak config_minScalingSpan for large screen devices
a65fe88 Fix the build
415f26b Merge "Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales" into jb-mr1-dev
5c2591e Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev
067af95 Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev
ed0b4f9 Force destroy scripts in imageProcessing.
a91c9f9 Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev
7b770b0 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a1b25d6 merge in jb-mr1-release history after reset to jb-mr1-dev
29f5230 Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
c4358c7 Verify pass-by-value kernels with structs.
c50f31d Check READ_EXTERNAL enforcement outside of lock.
c4b16f1 Merge "Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)" into jb-mr1-dev
4e1c866 Import translations. DO NOT MERGE
504f757 merge in jb-mr1-release history after reset to jb-mr1-dev
1cd5522 Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev
3fd47af Send USER_PRESENT for keyguard choice "None"
6d51571 Allow acquiring ContentProviders across users.
8e586f6 Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev
7c450aa Add support for a new developer setting: overdraw debugging
550ea7f Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
88923c9 Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev
6a86495 Fix issue #7214462: Some recent thumbnails are black.
5bfaeae pause music playback when switching user.
d88e305 Fix bug #7206086 NumberPicker widget should use locale digits
9f12373 Merge "Fixing a regression in the UI test automation." into jb-mr1-dev
9903e26 Volume keys control music volume after music stops
9371a0a Fixing a regression in the UI test automation.
993c3d7 Merge "Fixing typos" into jb-mr1-dev
77e95d3 Merge "Show lockscreen widgets for the current user." into jb-mr1-dev
db38d8a Fixing typos
82c8cda Merge "Add run all button to image processing test." into jb-mr1-dev
8fd96ec Show lockscreen widgets for the current user.
199bc56 Show plmn in emergency call allowed mode.
a9d7d85 Get your own cursor Drawables, WebViewClassic!
7546b5f Merge "Add Mandelbrot test to ImageProcessing." into jb-mr1-dev
c9108b1 Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev
b94d69a Add run all button to image processing test.
6eeff85 Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev
34563e2 Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)
0a5c556 Merge "Multi-user support for the accessibility layer." into jb-mr1-dev
dbb2614 Merge "Optimize shaders for dithered gradients" into jb-mr1-dev
172cb76 Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
c9e94ea Merge "Fix issue #7213113: Remove old intent resolver" into jb-mr1-dev
52c6234 Fix issue #7213113: Remove old intent resolver
6ccf4e2 Fixing onRestoreInstanceState crash in Launcher
8562cb5 Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev
38533ea Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
bd1e007 Changing public method to @hide, doesn't have to be public
58d37b5 Multi-user support for the accessibility layer.
7ab7a8b Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
08681ad Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev
b77b3cf Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
7b3132d Merge "Add Blend intrinsic." into jb-mr1-dev
a1d12dd Optimize shaders for dithered gradients
abb53b7 LockScreen: don't update KeyStore password on unlock
f70bb04 Add Blend intrinsic.
03bdc8a Fix security check for private allocateAppWidgetId api
5ce25d7 Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
ec50146 am 2e642866: am be676b6c: am 4a5425db: fix layout bug
2e64286 am be676b6c: am 4a5425db: fix layout bug
be676b6 am 4a5425db: fix layout bug
4a5425d fix layout bug
2f6d882 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
3ca5971 Merge "Support HDMI hotplug." into jb-mr1-dev
063d15f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e87bf03 Support HDMI hotplug.
691b68b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
7478cf8 Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev
1ed9fa1 Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
059aedf Merge "Finish this bit before I forget." into jb-mr1-dev
f7e52d9 Finish this bit before I forget.
25645d8 Remove UID checks from LockPatternUtils
0e64d89 Add Mandelbrot test to ImageProcessing.
f98db0d Merge "Improve find on page accessibility" into jb-mr1-dev
2be31d8 Import translations. DO NOT MERGE
26d48a7 Improve find on page accessibility
2c0feea Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev
15cd685 Import translations. DO NOT MERGE
c6e4917 Refactor Cell Location public API.
04c2bb8 Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev
09016ab Do not use passive GPS data for COARSE only apps.
268118d Migrate away from lightsOut() in BeanBagDream.
987f1e7 Merge "allowBackup doc fix." into jb-mr1-dev
642030e Merge "Ensure that the decoder is thread-safe." into jb-mr1-dev
4e5753f Add setting to skip verifying ADB installs
df655d0 Merge "Fix javadocs to fix build." into jb-mr1-dev
5e416d8 Fix javadocs to fix build.
2250550 Merge "Additions to Dream public api." into jb-mr1-dev
3ed6f94 Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023)
0c6f379 Day numbers in CalendarView have incorrect size.
4187f92 Merge "API REVIEW: Undeprecate Location.dump() Bug #7173109" into jb-mr1-dev
8a624ef API REVIEW: Undeprecate Location.dump() Bug #7173109
9921d84 Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev
5cb61c8 allowBackup doc fix.
abcaeea NPE in AcitivtyChooserModel.
61d3704 Merge "Polygonal rendering of simple fill shapes" into jb-mr1-dev
739bc9e Merge "Fix issue #7205845: Permissions screen: make "New" text blue instead of red" into jb-mr1-dev
adfe87c Fix issue #7205845: Permissions screen: make "New" text blue instead of red
3f7c246 Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev
45b07b9 Merge "Add intents to open text and video from search." into jb-mr1-dev
8e28555 Skip operations for users who are not running
466bd63 Merge "New method returning user metadata." into jb-mr1-dev
d5c582c Additions to Dream public api.
37563c5 Get your own cursor Drawables, WebViewClassic!
f1a457d Do not turn safe volume on upon headset connection
95c942e am 4feac670: (-s ours) am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
ac439e5 Eliminate potential for NPE in WindowAnimator.
537d47f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ced8d21 Add string for 'Ethernet'.
0887711 Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev
b1ac72b Add intents to open text and video from search.
1618868 merge in jb-mr1-release history after reset to jb-mr1-dev
1227233 Merge "Bugreport in Quick Settings (if you turn it on)." into jb-mr1-dev
a2facc3 Merge "Fix the seesaw behavior on the status panels." into jb-mr1-dev
cd77583 Ensure that the decoder is thread-safe.
edc1a2b Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
7566abd Merge "Add support for changing status widget on security screen" into jb-mr1-dev
c9cc62b Merge "Add secure version of image capture intent." into jb-mr1-dev
11cb642 Update layers in a single batch at the beginning of a frame Bug #7186819
37959ef Add secure version of image capture intent.
3034d45 Merge "Fix for native crash on image decode OOM" into jb-mr1-dev
74defbf Merge "Query users excluding any being removed" into jb-mr1-dev
005bfc6 Fix for native crash on image decode OOM
c19d448 Bugreport in Quick Settings (if you turn it on).
920ace0 Query users excluding any being removed
3e87eaf Merge "Fix the build." into jb-mr1-dev
e5de9919 Fix the build.
e4ab16a New method returning user metadata.
35d323a Use global wifi_sleep_policy constants
20c41d5 Add support for changing status widget on security screen
d3724b9 Merge "Don't load views before onResume called." into jb-mr1-dev
8da91a6 Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev
f2eb2e3 Merge "Fix javadoc." into jb-mr1-dev
3e27c34 Fix bug #7205072 Text inside popup window is too close to the edge
b4544d6 am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev
91254a0 am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp
11a6450 Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev
957fadc Merge "Use min group owner intent for concurrency" into jb-mr1-dev
c0d2b5e Tweak keyguard security flip animation timing.
da6f7ab Merge "Fix aprox fs function names bug b206696" into jb-mr1-dev
a95a3b4 Fix javadoc.
596bcc2 Merge "Optimize tiling management Bug #7186819" into jb-mr1-dev
57b5268 Optimize tiling management Bug #7186819
36fa5a4 Fix aprox fs function names bug b206696
99766cf Use min group owner intent for concurrency
0aac9b7 Merge "GLSurfaceView defaults to 888 instead of 565" into jb-mr1-dev
b4c3367 Merge "Disentangle input manager service startup." into jb-mr1-dev
ddfaa3f Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev
e6ff478 Merge "Use less static synchronized" into jb-mr1-dev
a21ad1a Merge "Fix bug #7198224 TimePicker widget shouldn't be completely RTL" into jb-mr1-dev
6730c3c Merge "Fix safe volume warning message flickering" into jb-mr1-dev
0516a9e Fix safe volume warning message flickering
a9d131c Disentangle input manager service startup.
bbd28a2 Provide a debugging option to force enable wifi display.
4feac67 am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
c098ff6 am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev
77f6677 Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
fea72d3 Ignore 12496bfc into jb-dev-plus-aosp
776dbf2 Import translations. DO NOT MERGE
2f98008 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
416f6ec Import translations. DO NOT MERGE
58e7f73 Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev
6cc5d7f Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev
0cfb73d fix broken user build: do not throw an error when in user flavor.
9f9d345 Use less static synchronized
0a9a219 Add columns to CalendarContract
7c0edba Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
fbe44b7 Fixing partiallyUpdateAppWidget to cache the new changes
bbdfada Merge "docs: Systrace tool documentation" into jb-dev
ae2d732 Get your own cursor Drawables, WebViewClassic!
c1ec220 Merge "Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode." into jb-mr1-dev
35fae68 Change the way how airplane mode is set, since it has been moved to Settings.Global namespace. Also run as a system app, since only system apps can change airplane mode.
ca6da00 Don't load views before onResume called.
6de76d2 Merge "Implement multi-user PackageMonitor." into jb-mr1-dev
c72fc67 Implement multi-user PackageMonitor.
e6f6380 Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev
488d275 Fix bug #7198224 TimePicker widget shouldn't be completely RTL
b756445 Multiuser awareness in content observer infrastructure
12496bf Merge "Add --output-text-symbols option to aapt. do not merge." into jb-dev
198a030 Fix the seesaw behavior on the status panels.
314488b Merge "Captive check for both mobile and wifi" into jb-mr1-dev
710f46d Polygonal rendering of simple fill shapes
5e3a1c0 docs: Systrace tool documentation
d86077c Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev
ca2cb18 Merge "Suppress location information for non-active users." into jb-mr1-dev
62796aa Expose android.media.AudioManager.getProperty()
9538bdd Captive check for both mobile and wifi
d053554 Merge "Push dropbox logging into libcore." into jb-mr1-dev
f6e24d6 Merge "Remove pointless exception supression." into jb-mr1-dev
f9fac2c Merge "Add multi user volume management" into jb-mr1-dev
a3ae439 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
4dd3c37 Merge "Remove logging for old version mismatches." into jb-mr1-dev
b6610d8 Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev
a12a7b3 Suppress location information for non-active users.
3d5be42 Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev
5ca88a1 Merge "Add tests for pass-by-value kernels." into jb-mr1-dev
95cd451 Merge "add cleanspec." into jb-mr1-dev
1dd273a add cleanspec.
683ab00 fix underfull content bug in inbox and big text templates.
a884f7c merge in jb-mr1-release history after reset to jb-mr1-dev
e0de5bf Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev
350bb15 Remove pointless exception supression.
8e356e0 Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev
97e9ee2 Cleanup blur test, remove deprecated functions.
48b9b0d Make DPM API for disabling keyguard widgets more generic
f803ff4 Merge "Make wifi display state changes more robust." into jb-mr1-dev
c2b9ea6 Make wifi display state changes more robust.
e02acec Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
925ad51 Merge "Add support for remembering Wifi display devices." into jb-mr1-dev
89d5546 Add support for remembering Wifi display devices.
b7faaf4 Push dropbox logging into libcore.
d5d853e Merge "Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on the display to enable later UX decision - Work around SIM state bug" into jb-mr1-dev
0967a9e Remove logging for old version mismatches.
4c97ef9 Merge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev
2b7028e Add support for QCOM_tiled_rendering Bug #7186819
263459d Add tests for pass-by-value kernels.
109f1fd Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on the display to enable later UX decision - Work around SIM state bug
4e7b551 Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev
36901b6 Move HAS_TRANSIENT_STATE flag into a safe area.
c3e3311 Merge "Migrate network stats from removed users." into jb-mr1-dev
c575e00 Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev
6013d8c Fix DPI scaling on TVDPI
30ddd69 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
43dc3ad Disable content observer cross-user permission checks...
c8c0838 setShowGTalkServiceStatus() is deprecated but tested by CTS
4be07ad Merge "Revert "Test aggressive throttling"" into jb-mr1-dev
73c1416 Fix issue #7196015: system_server deadlock during setup wizard
c8d33ad Import translations. DO NOT MERGE
fcccd49 Import translations. DO NOT MERGE
daa57e8 Migrate network stats from removed users.
4046e01 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
f4f6b4c Fire "dreaming started" and "dreaming stopped" broadcasts.
5555209 Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev
f7c6c5a NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
55bc7ef Revert "Test aggressive throttling"
bc0fab1 Add multi user volume management
5d6f34e Disable content observer cross-user permission checks...
d92e998 Fix deadlock in LockPatternUtils by using local id.
dbf30ed Update preloaded-classes for JB-MR1
6704a48 Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev
52716de Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev
f1b6741 Fix deadlock in LockPatternUtils by using local id.
4673e7e Migrate UI to supportsMultipleUsers().
8f301e6 Merge "Add debug for b/7094175." into jb-mr1-dev
a1c4663 Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev
390392f Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev
e6c660a Disable content observer cross-user permission checks...
eba784f Changes to support side-loading of apps from other users.
f8d618c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
10bd410 am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
baed0a8 am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
072533e Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev
56fd88d am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
efa5685 Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev
d79dd34 Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev
09ad083 Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev
5580005 am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB
15491c6 Switch to showing top-most thumbnail of recent apps.
a490bdd Merge changes I4513afbd,I20e2194c into jb-mr1-dev
9198495 am 19a39686: am b79d8ecc: udpate media formats for JB
549be8b Merge "New API for querying audio properties" into jb-mr1-dev
8863cca Fixes to Starting window and Wallpaper windows.
19a3968 am b79d8ecc: udpate media formats for JB
ab12f0f Merge "Implement resolving of icon attributes to resIds in AlertController"
7b6ec1f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
4fc4505 merge in jb-mr1-release history after reset to jb-mr1-dev
5d1a870 Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev
b79d8ec udpate media formats for JB
5d4206a Merge "Get strings in" into jb-mr1-dev
7f0aaac Get strings in
5d8d169 Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev
d2b82f7 Fix wrong pattern count in keyguard pattern security view.
4adb9d3 Merge "DevicePolicyManager per user" into jb-mr1-dev
69542e4 Fix some typos in Javadoc for Accessibility APIs
2d95a33 Merge "Fix build.  Missed current.txt in previous checkin." into jb-mr1-dev
9e6e5ae Fix build.  Missed current.txt in previous checkin.
4e54f93 Merge "Add test for layer updates optimizations" into jb-mr1-dev
189ff17 Add test for layer updates optimizations
2a81fe6 Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev
55db686 Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev
98c370e Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev
4b6d93f Make invalidateOptionsMenu asynchronous
e69e9e6 Clean up and publish the YUV to RGB intrinsic.
1e5aeec Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev
bb1aeff Don't allow more than 3 actively running users at a time.
6d4e887 Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
72b4db1 Unhide and document feature android.hardware.camera.any.
752af83 Add hardware feature android.hardware.camera.any.
8071124 Move X509TrustManagerExtensions to correct directory
954a5d6 Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev
24755d2 Merge "mutate() didn't work as advertised Bug #7162705" into jb-mr1-dev
f43f5c7 Add --output-text-symbols option to aapt. do not merge.
402f0c8 Merge "Refactor Carrier text as a movable module." into jb-mr1-dev
684385d mutate() didn't work as advertised Bug #7162705
9ccf13c Fix formatDateRange month names for Farsi.
53141ef Compute GradientDrawable's opacity correctly
5f72c96 Tweaking how settings adds keyguard widgets
3fe5bf6 Make getMediaStorageDirectory() user-aware.
0b81be6 Lockdown should only augment connected networks.
ceb5a98 Merge "Minimize state changes when updating layers" into jb-mr1-dev
9ffc604 Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev
35643dd Minimize state changes when updating layers
29d0aa7 Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev
be456f2 Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
e91aa0f Compute GradientDrawable's opacity correctly
ad79342 Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev
29e0bd2 GLSurfaceView defaults to 888 instead of 565
688ca47 Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev
6eac514 Merge "Remove trailing period from missing SIM string" into jb-mr1-dev
c11f77f Fix bug #7173155 API REVIEW: android.view.View
772db42 Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev
7d0882b Merge "send connection broadcast on client disconnect" into jb-mr1-dev
5ef9c59 send connection broadcast on client disconnect
6323b6c Use localized digits for Time formatting.
db45484 AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
6281d7c Merge "Multi-user MTP." into jb-mr1-dev
8b3560d Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev
20586fa Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev
642258a Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev
84dbf46 Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)
dbed514 Merge "Fix bug #7172699" into jb-mr1-dev
aff9d52 Further tune config_minScalingSpan for small screen devices.
fd5a80f Code cleanup for X509TrustManagerExtensionsTest.java
6026473 Tweaking how settings adds keyguard widgets
94998c9 Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev
599dd7c DevicePolicyManager per user
f35df5b Fixing services start order that impacts ICS - JB upgrade
ef3b79c Settings provider needs to send notifications as itself
4b3a934 Visualizer only works on sounds >5 sec.
ab3d0fd Merge "Move files to make eclipse-java happy" into jb-mr1-dev
48618c9 Merge "Fix GL shader bugs" into jb-mr1-dev
315a7c0 Use proper digits in formatElapsedTime and format3339
0990ffb Fix GL shader bugs
d44daab Move files to make eclipse-java happy
cdf964e Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev
cb4c581 Fix bad isinstance check in X509TrustManagerExtensions and add test.
f358260 Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable
6b58fde Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev
63bcc14 Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev
c8459dc Settings provider needs to send notifications as itself
27bd34d Multi-user MTP.
a216360 Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev
d3d9f3f Fix bug #7173351 API REVIEW: android.util.LocaleUtil
08a8158 Add Kernel, Method, and field IDs bug 7182873
24ed276 Merge "WFD fixes" into jb-mr1-dev
e0c28d5 WFD fixes
49b0a9b Fix bug #7172699
00bc4c0 Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev
ed41a4e Initial commit for X509TrustManagerExtensions.
465d720 am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
ad23333 am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
c95b1d8 am a59b1dac: am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
0f38c08 am 3ce6b008: am d67459ff: new Google Play badges and some updates to corresponding pages
bc95e93 am fe7e473d: am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI
79d977b am 04afdd68: am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
4ca7f55 am 6c47d0a9: am ada4f081: am 61d85c43: add link to device dock lesson
e7b5711 am 880051db: am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights.
81ae8e7 am 08ec998b: am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support
7e26ef6 am 0a94b84d: am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions.
ebeb95b am 21c5007e: am 8a80ac46: am 54efa69f: older not lower
e3c672c am 77ae2e6f: am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition
9ecfb8d am db6313ce: am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
f7e2e40 am f5c717a9: am 2141c068: am 243170f7: Doc update: Fix typo.
963b250 am 5c97d966: am 9ae01846: fix broken link for action bar pack
945080b am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
b250e94 Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev
a59b1da am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
3ce6b00 am d67459ff: new Google Play badges and some updates to corresponding pages
fe7e473 am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI
04afdd6 am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
6c47d0a am ada4f081: am 61d85c43: add link to device dock lesson
880051d am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights.
08ec998 am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support
0a94b84 am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions.
21c5007 am 8a80ac46: am 54efa69f: older not lower
77ae2e6 am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition
db6313c am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
f5c717a am 2141c068: am 243170f7: Doc update: Fix typo.
5c97d96 am 9ae01846: fix broken link for action bar pack
1e86994 Merge "MtpData bmp format file can't recognize when copy bmp into DUT"
a4b0e55 Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev
8b18219 Use a larger scaling span for larger screen devices.
0cbfcff Add debug for b/7094175.
76a10e8 Import translations. DO NOT MERGE
4529146 am 7f5de016: Skip f5cbd762 - it\'s in frameworks/opt/telephony
900d551 Import translations. DO NOT MERGE
c5a6cde Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev
923c18b Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev
96b6cf9 Merge "Adjust FAQ." into jb-mr1-dev
af68e7c Visualizer only works on sounds >5 sec.
7f5de01 Skip f5cbd762 - it's in frameworks/opt/telephony
4dff2ab Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev
9c06088 merge in jb-mr1-release history after reset to jb-mr1-dev
b4db962 Add APIs to enable SNI and session tickets on sockets.
68d7897 Merge "Fix build - current.txt regenerated" into jb-mr1-dev
d6c1cc4 Fix build - current.txt regenerated
f7a6dfc Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev
f9cb7ba Refactor Carrier text as a movable module.
931be0e Merge "Don't show empty widget in the case where a widget can't be inflated" into jb-mr1-dev
e928d7d Pass Bitmap instead of ParcelFileDescriptor in UserManager
edf0ba6 am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
4420402 cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
5bc09e2 Merge "Disable notification scans when p2p is connected" into jb-mr1-dev
99a3cae Don't show empty widget in the case where a widget can't be inflated
3809f50 Disable notification scans when p2p is connected
917a3b3 SurfaceTexture: remove call to doGLFenceWait
3443602 Merge "Revert "Increase idle time out to 25s"" into jb-mr1-dev
049dd8e Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev
ee261a5 Revert "Specify max go intent for wifi display"
aba7902 Revert "Increase idle time out to 25s"
c535d2f Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev
6cbd33f Fix dumb bug merging receivers for multiple users.
3bcbad7 Plumb display name into SurfaceFlinger
21dfd7c Merge "Update headphone volume safety warning message." into jb-mr1-dev
c33f94e Merge "Fix API review bugs." into jb-mr1-dev
82f385a Merge "Add extra EGL error checking" into jb-mr1-dev
740ee65 Add extra EGL error checking
2bb25cd Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev
218e2f1 Merge "Specify max go intent for wifi display" into jb-mr1-dev
7ab7260 Specify max go intent for wifi display
f1aa107 Merge "Per-user content observer APIs" into jb-mr1-dev
e6d5545 Fixing construction of handler in AppWidgetHost
8832c18 Fix API review bugs.
ca28410 Merge "Increase idle time out to 25s" into jb-mr1-dev
968df85 Increase idle time out to 25s
49a22f2 Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev
a8a402f Merge "Fix bad shader code" into jb-mr1-dev
1c5c206 Fix bad shader code
c7fb118 Activity.onStop(Bundle) does not exist
b6397c7 Update headphone volume safety warning message.
16aa973 Per-user content observer APIs
04d5b9f Merge "Go to home screen after launching each app." into jb-mr1-dev
4246f69 Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev
75e0af8 TaskStackBuilder correctness fixes
c31f5a7 Merge "Add error information to event logs." into jb-mr1-dev
beb9d53 Add error information to event logs.
ad9b3211 Try again to fix issue #6912004:tap on gmail notification sends me to home screen
417e267 Merge "Revert "Simple MVC based binding mechanism for android controls." Do not merge." into jb-mr1-dev
4215017 Merge "Use shared app gid for dalvik cache" into jb-mr1-dev
d699110 Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev
f9c6a10 Merge "Making QS scrollable and making numerous tweaks." into jb-mr1-dev
5f62301 Making QS scrollable and making numerous tweaks.
1d31d5b Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev
07a0ede Start userId from 10, reserving 1-9 for special use in the future.
7134ef6 Merge "Fix date formatting for fa locales." into jb-mr1-dev
8e1c2b6 Revert "Simple MVC based binding mechanism for android controls." Do not merge.
a9d9dec Go to home screen after launching each app.
d67459f new Google Play badges and some updates to corresponding pages
e2f0ec8 Merge "Enabling hardware layers while overscrolling widget pager" into jb-mr1-dev
5b50a25 Enabling hardware layers while overscrolling widget pager
6a9b2cb Use shared app gid for dalvik cache
5b1c8d3 Adjust FAQ.
e01538f Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev
e2fb519 Merge "Swap remote submix initialization order." into jb-mr1-dev
6b6c905 TaskStackBuilder - use the correct package for looking up parents
7109aad Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev
f74d2f2 Merge "Fix occasional crash bug with layers" into jb-mr1-dev
9f5f80e Merge "Fix modulation and gamma correction issues" into jb-mr1-dev
e645324 Merge "Add UserManager.getUserIcon()" into jb-mr1-dev
3b49f07 Add UserManager.getUserIcon()
c9bd4ca Swap remote submix initialization order.
a41d5db am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt."
9ff22e4 am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."
79c95c3 am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt."
8a67598 am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."
5de9603 am 31820a35: Merge "Add --output-text-symbols option to aapt."
cc9747e am d7252571: Merge "Add --error-on-failed-insert option to aapt."
cbe6920 Fix issue where recents would not show up sometimes
178af59 Add debug to help with b/7135184.
b574a26 am b86b7f07: small update to the ADT installation steps based on new ADT UI
ad4bbdf am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
ada4f08 am 61d85c43: add link to device dock lesson
603f6de Fix occasional crash bug with layers
2dec992 am 24a024ec: Doc change: fix typo in JB highlights.
a1981bc am d5abc558: docs: update for multi apk doc for ABI support
917d45e am 73ec048e: Doc update: Appwidgets JB additions.
8a80ac4 am 54efa69f: older not lower
b9b05df am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition
0cc7398 am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
34de3bc Fix date formatting for fa locales.
cc5dd18 Merge "Change order of ps and suspendmode calls" into jb-mr1-dev
2141c06 am 243170f7: Doc update: Fix typo.
9da603c Change order of ps and suspendmode calls
31820a3 Merge "Add --output-text-symbols option to aapt."
b86b7f0 small update to the ADT installation steps based on new ADT UI
d725257 Merge "Add --error-on-failed-insert option to aapt."
844d2a9 Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
61d85c4 add link to device dock lesson
24a024e Doc change: fix typo in JB highlights.
d5abc55 docs: update for multi apk doc for ABI support
73ec048 Doc update: Appwidgets JB additions.
54efa69 older not lower
8982939 docs: Accessibility DevGuide, Jelly Bean edition
d46023d dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
243170f Doc update: Fix typo.
c71a57d Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5dbeb6a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
228c984 New API for querying audio properties
9d7657c Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev
b181909 Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev
39a37c3 Merge "headphone volume limitation" into jb-mr1-dev
bdfc7d9 merge in jb-mr1-release history after reset to jb-mr1-dev
89c8281 Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev
8406d05 Merge "New uninstall option to uninstall for all users." into jb-mr1-dev
6d235d8 New uninstall option to uninstall for all users.
443e474 Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user" into jb-mr1-dev
3d33a63 Add restoreCallingIdentity under finally
c34dcc1 headphone volume limitation
db831da Fix permission accessing getCurrentUser
61e8180 Merge "Fix suspend settings at boot" into jb-mr1-dev
11f0cb7 Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
6f31feb merge in jb-mr1-release history after reset to jb-mr1-dev
fa9fc5b Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev
1c045ec Fix suspend settings at boot
489f345 Add a minimum height of 64dp for AlertDialog content
b137c80 Merge "More adjustments to permissions." into jb-mr1-dev
2ca2c87 More adjustments to permissions.
a40b2b3 Merge "Add test for failed dexopt" into jb-mr1-dev
97e7c59 Merge "Enable package verification" into jb-mr1-dev
86e85ef Merge "Set backlight brightness in correct order." into jb-mr1-dev
e15bdc2 Add test for failed dexopt
36c67c2 Enable package verification
1f13a98 Merge "Import panel background assets from UX" into jb-mr1-dev
2d5b6e8 Import panel background assets from UX
735f740 Set backlight brightness in correct order.
e23ab8b Selectively enable back button in keyguard for security screens.
42af751 Merge "Add setting to change verifier visibility" into jb-mr1-dev
89e68d7 Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev
3849490 Merge "Return empty scan results for background user" into jb-mr1-dev
5a4010c Create main activity intents as needed for TaskStackBuilder/Up nav
df5bdd7 Merge "Make librs_jni depend on libRSDriver to remove circular dependency" into jb-mr1-dev
6253985 Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev
24b351a Second pass on Keyguard multi-user switcher
4505a43 Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
e6686b3 Add setting to change verifier visibility
12618a7 Make librs_jni depend on libRSDriver to remove circular dependency
929a40a Remove trailing period from missing SIM string
306df86 Merge "New location service permission strings." into jb-mr1-dev
b278933 New location service permission strings.
330b187 Return empty scan results for background user
6e5fe43 Remove settings and rotation buttons from notification panel.
b1861c3 Minor fixes/clarifications for previous patch.
b45965f Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev
7db4eec Merge "Squish!" into jb-mr1-dev
a91f9e2 Make more items per-Display.
828e56e Squish!
36ec9a1 merge in jb-mr1-release history after reset to jb-mr1-dev
d65afc6 Merge "More multi-user stuff." into jb-mr1-dev
398bad0 Merge "Fix debug log." into jb-mr1-dev
5dc5a00 More multi-user stuff.
8df3b2b Camera: Document face detection confidence recommendations.
d0c6ccb Move NetworkPolicy from apps to UID.
ee10044 Updating public API.
b3571a6 Merge "Fix build" into jb-mr1-dev
5f9c4c4 Fix build
edf60d3 Fix up symbols.xml.
c3ff72f Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
08153ee Switch DateUtils and Time over to using the CLDR for all week and month names.
08b2b6b Fix keyguard timeout dialog messages
23321b8 Merge "Use ICU's CLDR data for "AM" and "PM" strings." into jb-mr1-dev
c12d642 Merge "Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"" into jb-mr1-dev
a8deafb Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev
2892dfb Merge "Fix default population of wifi settings" into jb-mr1-dev
6f5a9a9 Fix default population of wifi settings
8dd9206 Fix NPE in rotation lock QS.
4af8534 Use ICU's CLDR data for "AM" and "PM" strings.
74a550f Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev
1c9894a Merge "Remove AndroidKeyStore from API" into jb-mr1-dev
4249682 Merge "Fix suspend bugs" into jb-mr1-dev
7f269e4 Deprecate those parts of DateUtils the documentation says not to use.
fea122e Revert "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]"
f743e54 Change verifyServerDomainAndCertificates to pass in a hostname.
633fe60 Fix suspend bugs
9ceede6 am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
086676a am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
f5437ee am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
ce24985 Remove AndroidKeyStore from API
297ad25 Merge "Deprecate those parts of DateUtils the documentation says not to use."
d3c0101 Deprecate those parts of DateUtils the documentation says not to use.
0b62fa2 Merge "Send more information to verifiers" into jb-mr1-dev
9ae0184 fix broken link for action bar pack
8b681cb Some formatting missed in the previous patch
3efa8ba Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev
77276b6 Adding accessibility events for touch and gesture detection states.
b4ad71a Merge "Increase GO idle time out to 5 seconds" into jb-mr1-dev
a149edf Increase GO idle time out to 5 seconds
c3a691e Merge "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]" into jb-mr1-dev
537421b PhoneStatusBar: Fix NPE while accessing quick settings.
836033d Merge "Update account list on account picker activity resume" into jb-mr1-dev
76a6142 Add support for per-package policy for sending premium SMS.
13d428e Send more information to verifiers
a87826c Merge "Fix face unlock for multiple users" into jb-mr1-dev
c115862 merge in jb-mr1-release history after reset to jb-mr1-dev
4f49d94 Adding data type overlay to network tile.
4cb846b Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev
51fbaff Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev
04a34b3 Merge "Actually move to Global settings." into jb-mr1-dev
e6e6197 Actually move to Global settings.
ce18d1c Merge "Get correct user's package info during clip processing" into jb-mr1-dev
ad9833a Get correct user's package info during clip processing
f387517 Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]
e4bf0ea DEFAULT_VERIFY_ENABLE turns verification off
4b4b954 Fix face unlock for multiple users
a043c2c Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev
023c05a Move to Global.NETSTATS and Global.NTP constants.
4a0c3b1 Import translations. DO NOT MERGE
673e7b7 Import translations. DO NOT MERGE
f229e4d Add support for settings for lock widgets
49321ec Merge "Suppress ExpandHelper on quick settings." into jb-mr1-dev
d4726d0 Adding rotation lock tile to quick settings (on tablets).
ad92ce8 Merge "Fix bug with getting widget categories" into jb-mr1-dev
95a2ff7 Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev
c1eff08 am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
ca5e341 Fix bug with getting widget categories
e590568 am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable"
eceb317 am f4afc401: Merge "framework: fix bug for uninitialized variable"
5b329e8 Fix debug log.
f4afc40 Merge "framework: fix bug for uninitialized variable"
e136a72 Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev
b8c50e8 Text layout in switch may be null when accessibility events are fired.
0dbc410 Merge "Fix Settings writes to a different user" into jb-mr1-dev
a96fa35 Merge "Don't prematurely delete temporary files" into jb-mr1-dev
a938f56 Fix modulation and gamma correction issues
494ac35 Merge "Multiply alpha for AA as late as possible" into jb-mr1-dev
0b2fa8c Don't prematurely delete temporary files
7ffa0b7 merge in jb-mr1-release history after reset to jb-mr1-dev
2dc6af2 Merge "Fixup a comment." into jb-mr1-dev
565f042 Fixup a comment.
51d7100 Merge "Prevent crash when invalidating all Views Bug #7165793" into jb-mr1-dev
f84208f Prevent crash when invalidating all Views Bug #7165793
cd6e7e1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1a5efec Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3418648 Merge "Foundation for tiling optimization" into jb-mr1-dev
85ef80d Foundation for tiling optimization
2f2f0d4 Merge "Failing uchar4->int4 test" into jb-mr1-dev
a6d846a Merge "Fix the build" into jb-mr1-dev
3240ad0 Fix the build
4401501 Merge "Eat copy pasta." into jb-mr1-dev
5380a06 Eat copy pasta.
78d2a66 Fix Settings writes to a different user
3a1136e Merge "We don't need black frames for forced display size." into jb-mr1-dev
33aef98 Allowing association between a view and its label for accessibility.
0f75513 Revert "Add accessibility scroll actions to TabWidget"
9f44a13 Multiply alpha for AA as late as possible
8d16778 Update account list on account picker activity resume
ed1395f Updating Wifi/Mobile tiles to reflect actual connection state with new assets.
35f3a22 Merge "Unhide intrinsics and document API." into jb-mr1-dev
80d8190 Unhide intrinsics and document API.
83835b1 Merge "Break flings with opposing velocities" into jb-mr1-dev
81665b9 Merge "Updating assets, fixing Battery tile to show proper states." into jb-mr1-dev
eaa5ab0 Updating assets, fixing Battery tile to show proper states.
4796dfd Merge "Improve debug output." into jb-mr1-dev
dc5a638 Improve debug output.
cd66359 Break flings with opposing velocities
76a3cb9 We don't need black frames for forced display size.
ca90e9a dodging the @JavascriptInterface bullet
ef8e0b4 Fix crash in recents
cdfc56a Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev
1f1f5970 Merge "Require ACCESS_FINE_LOCATION for Geofence use." into jb-mr1-dev
45a0b90 Merge "Enable remote submix for wifi display." into jb-mr1-dev
83cdb02 Merge "Add accessibility scroll actions to TabWidget" into jb-mr1-dev
303309c Merge "Settings db upgrade steps only apply to the owner user" into jb-mr1-dev
59c5bee Settings db upgrade steps only apply to the owner user
bd6acda Merge "Fix bugs in grain where values could go out of bounds." into jb-mr1-dev
24271a8 Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev
4fab68b Require ACCESS_FINE_LOCATION for Geofence use.
6053088 Add accessibility scroll actions to TabWidget
dcd8c81 Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev
0c89049 Add Notification.Builder.setShowWhen(boolean).
7eac0f5 Propagate systemUiVisibility changes to window manager
38ba12c Import translations. DO NOT MERGE
79d4566 dodging the @JavascriptInterface bullet
cf6fa9f Import translations. DO NOT MERGE
c5df37c Add preliminary API for reporting display capabilities.
8a788cb Fix build.
86398b6 Merge "Fix crash in recents" into jb-mr1-dev
f353f94 Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev
482f159 Fix crash in recents
8a95803 Fix bugs in grain where values could go out of bounds.
f60921d Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev
e001382 Merge "Bring back new permission organization." into jb-mr1-dev
fd2ccaf am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-dev
d21b9a9 am 2f140f96: Merge "Doc change: GCM changes" into jb-dev
f5cbd76 Merge "Show plmn in emergency call allowed mode." into jb-dev
2f140f9 Merge "Doc change: GCM changes" into jb-dev
aefd73d Merge "Try to avoid possible NPE" into jb-mr1-dev
0f001d3 Try to avoid possible NPE
c8c4cbe merge in jb-mr1-release history after reset to jb-mr1-dev
cae22d8 Merge "Give DefaultContainerService all external storage." into jb-mr1-dev
dfa4530 Give DefaultContainerService all external storage.
cd403fc Bring back new permission organization.
b4e56ed Suppress ExpandHelper on quick settings.
f5736aa Merge "Fix build." into jb-mr1-dev
bd7057f Fix build.
c2c5cd0 Merge "Updated tests for simpler ScriptC constructors." into jb-mr1-dev
58b2b24 Updated tests for simpler ScriptC constructors.
27d9183 Merge "Core accessibility settings should not be cleared on restore." into jb-mr1-dev
818d204 Core accessibility settings should not be cleared on restore.
3e451fa Merge "New permissions UI, again." into jb-mr1-dev
1803e5e Merge "Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service." into jb-mr1-dev
19f4a29 Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service.
e2052a3 Merge "Secure setting for LocationFudger's accuracy" into jb-mr1-dev
7454d3b New permissions UI, again.
2a4057d Updating IME tile with proper subtype name.
5efc533 Merge "Fix service binding for singleUser services" into jb-mr1-dev
4076bc5 Fix service binding for singleUser services
43229d7 Adding IME tile.
69689a7 DO NOT MERGE Push event logging down into libcore.EventLogger
7c65e39 DO NOT MERGE Added event logging for config installation failures.
755b877 DO NOT MERGE Create intermediate directories when installing config data.
b631084 DO NOT MERGE Add components for the Android Config Updater to system server.
79cf1a2 Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev
c868b64 Moved a few telephony settings from Secure to Global
bbbb154 Merge "Fix Javadoc spelling" into jb-mr1-dev
7807e0f Wait for installd to finish starting before booting.
fe9c14f Temporarily turn off package verification
5fe7fbf Merge "Don't crash when copying a null Rect Bug #7158068" into jb-mr1-dev
0c348b6 Merge "end() a reverse()'d animation correctly" into jb-mr1-dev
dd4b1fe Don't crash when copying a null Rect Bug #7158068
51e67a0 Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev
fd21824 Merge "Wait for installd to finish starting before booting." into jb-mr1-dev
df9ec61 Secure setting for LocationFudger's accuracy
3c78702 Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev
f69c812 Wait for installd to finish starting before booting.
39de2b0 Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev
4be2975 Merge "Rename variables and methods for clarity." into jb-mr1-dev
b11ce42 Show plmn in emergency call allowed mode.
5c0e78c Rename variables and methods for clarity.
6fba0a0 Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it
4dd1768 end() a reverse()'d animation correctly
61a2177 Fix Javadoc spelling
3ddaace Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev
04578ee Merge "Fix for bug 6872613 Need to revert back to a less hacky Arabic Font" into jb-mr1-dev
faecd09 Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev
4f77268 Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev
c516a5c Only consider hiddenRequested when deciding layout
b11b9fc Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev
88469e5 Enable remote submix for wifi display.
2f5bdb0 Fix for bug 6872613 Need to revert back to a less hacky Arabic Font
f6f1661 MtpDatabase: Use actual file size instead of media database size column
eb1f534 Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev
13ba4e4 Fix for b7155617 race condition in TextLayoutCache.cpp
c733a79 Fix b/7087723 Patch leftover after tapping the red eye area
4a86019 Temporarily turn off package verification
4e11e3e Doc change: GCM changes
f4fd2eb Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev
b4c02e6 Minor update to addjavascriptinterface documentation
2cd3566 Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev
8872465 Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev
b967464 Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev
4f8da32 Merge "Make JavascriptInterface annotation public." into jb-mr1-dev
743115f Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev
6cfba16 am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
40ad466 am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
4c686da am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
c409142 am 53d1864c: am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev
53d1864 am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev
8dc0ff0 Merge "fix another link in the style doc" into jb-dev
816518f fix another link in the style doc
a962d74 Merge "EffectsTest enhancements" into jb-mr1-dev
cceed1d Merge "Include <sys/socket.h> instead of <linux/socket.h>."
0482791 am eb0b6e27: am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev
eb0b6e2 am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev
94b2b5e Merge "fix links to style and themes source files" into jb-dev
600a75c fix links to style and themes source files
0efca17 Tracking upgrade to bouncycastle 1.47
bd0fe87 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev
e91d5be Make JavascriptInterface annotation public.
568e3eb am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge
4b0764e Reconcile with jb-mr0-release - do not merge
0240397 merge in jb-mr1-release history after reset to jb-mr1-dev
8b29d63 Merge "Include user identifier in external storage paths." into jb-mr1-dev
b049e21 Include user identifier in external storage paths.
de3debd Fix notification gestures.
40c6ae4 Single finger notification expansion.
8a0e1fe am b8026996: (-s ours) am e445c258: Merge "Fix notification gestures." into jb-dev
ec4c62b am 2da1e221: (-s ours) am a5e042f9: Merge "Single finger notification expansion." into jb-dev
b802699 am e445c258: Merge "Fix notification gestures." into jb-dev
2da1e22 am a5e042f9: Merge "Single finger notification expansion." into jb-dev
e445c25 Merge "Fix notification gestures." into jb-dev
a5e042f Merge "Single finger notification expansion." into jb-dev
06849e8 Fix SeekBar when in RTL layout direction
778c859 Include <sys/socket.h> instead of <linux/socket.h>.
c7b6ec7 Merge "Improve reporting of wifi connection state." into jb-mr1-dev
c0229e2 Fix notification gestures.
8c09f63 Adding a couple extras keys for keyguard widget selection
90ddc90 A new broadcast action which is sent when profile changes
f5de650 Add --output-text-symbols option to aapt.
7714a24 Add --error-on-failed-insert option to aapt.
5e900e3 Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev
3e1476a Adding a scaling threshold in ScreenMagnifier
d057e73 am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
c095eb0 am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
70a5967 am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
b1ee588 Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev
d420e3a Refactoring the scale and pan detection in the ScreenMagnifier.
5c09d60 Merge "Fix CacheBitmap crash issue when using H/W UI rendering"
be06e32 Fix bug #7148393 Switch can crash when hierarchyviewer is connected
0585744 Merge "Discard framebuffer commands when we redraw the entire buffer" into jb-mr1-dev
45e4c3d Discard framebuffer commands when we redraw the entire buffer
a40627d Enforce encapsulation for MarginLayoutParams startMargin and endMargin
709c542 Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev
6072b00 Fixing crash in emulator due to missing bluetooth.
f8f0edd Improve reporting of wifi connection state.
7e7786a Fix bug #7146516 Padding can be "over" resolved
ff2aa0b Initial pass at adding Music control to new keyguard.
8d5e6f8 Maybe fix issue #7146119: exception in FragmentManager
73e0d75 Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev
9c673b0 Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev
45f6aaa UsbDebuggingActivity: Strings update after review
d979dd7 Go back to keyguard if user is switched in lock screen
0bb4d07 Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
9b4125e Screen magnifier should handle window rebuilds correctly.
85cf4a1 Merge "Disable suspend optimizations during DHCP" into jb-mr1-dev
6434d73 am 91de90da: am 01f9bf3f: small update to the ADT installation steps based on new ADT UI
ec7d138 Disable suspend optimizations during DHCP
91de90d am 01f9bf3f: small update to the ADT installation steps based on new ADT UI
1e26a8b Merge "LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test" into jb-mr1-dev
01f9bf3 small update to the ADT installation steps based on new ADT UI
99c0cb3 Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
f008ab7 am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
5d33e76 am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
6520885 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
2415841 Merge "EthernetDataTracker: indicate link up based on flags"
e091f22 Use shared app gid for forward-locked processes
79ccb1e Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
4dc7a68 Set up default (random) Android IDs for all users
b6b72f5 EthernetDataTracker: indicate link up based on flags
d428e95 Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev
752ef4e Merge "This enables the back button in keyguard" into jb-mr1-dev
b0246ce Merge "Fixing build (update-api)" into jb-mr1-dev
9ba2a18 Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
2071e84 Fixing build (update-api)
80cd3fc EffectsTest enhancements
81985bc core: config: Update the description of the autoBrightnessLevels array.
a709473 Deleting the defunct SearchBox interface.
faed98a Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
ea4f446 am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
72c06bc am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
aec914b Merge "Adding notion of keyguard widgets" into jb-mr1-dev
0c99f7e am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
ea42443 Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev
ff5c914 Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
ba3cf72 Merge "Telephony: Clarify IccCardConstants.State enum"
59c53c6 Don't auto-discover peers until scan requested.
7ffa04b Single finger notification expansion.
0f68d16 Use wfdInfo to filter available sinks.
c574fd0 Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev
7cfd7d5 NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
2fa10c6 Fix build break
dce2a53 Fixing issue with Airplane Mode. (Bug 7141144)
a910390 Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev
5cf8bd7 Merge "Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware" into jb-mr1-dev
af87681 NEW_API: Unhide android.hardware.Camera#enableShutterSound
a361809 Merge "Remove "unlinklib" command from installd" into jb-mr1-dev
8015f03 Merge "Enforce a user limit" into jb-mr1-dev
6fc7275 Merge "Camera: Add enableShutterSound method." into jb-mr1-dev
06ee8cd Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev
f625436 Merge "Handle ascii encoded SSID" into jb-mr1-dev
faea76f Enforce a user limit
25da937 Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev
9bbd70a Remove "unlinklib" command from installd
0aa2d42 Adding notion of keyguard widgets
8b9e467 am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev
c02b500 am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev
b6deeed Handle ascii encoded SSID
58e6831 MtpDatabase: Fix typo affecting parent and format queries
c0e0d2b Merge "docs: update for multi apk doc for ABI support" into jb-dev
0e9292b Remove defunct searchbox implementation from webview.
660c8a1 Merge "Add support for controlling remote submix audio routing" into jb-mr1-dev
b743a23 Added annotations for injected accessibility objects
db425bb Merge "Fixing issue with Airplane Mode. (Bug 7141144)" into jb-mr1-dev
08b1cc8 Fixing issue with Airplane Mode. (Bug 7141144)
67ccb62 merge in jb-mr1-release history after reset to jb-mr1-dev
9f750af Update the dream manager to be multi-user aware.
576e1df Implement resolving of icon attributes to resIds in AlertController
0bac8bc Merge "Animations for user switching." into jb-mr1-dev
d03a555 Attempt to fix blank keyguard issue
4497e0c Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware
1679b36 Adding brightness dialog to quick settings.
e641b6a Adding alarm to quick settings.
ee6c6ae Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
9d9ece3 Animations for user switching.
ee30963 Fix CacheBitmap crash issue when using H/W UI rendering
e1f02ef Merge "Miscellaneous fixes for Settings" into jb-mr1-dev
ce3ef0a Merge "Screen magnification should disengage on screen off." into jb-mr1-dev
36e614c Screen magnification should disengage on screen off.
befab9e Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev
eeabf94 Merge "Allow pattern to start from outside pattern view" into jb-mr1-dev
5bf7800 Merge "Force keyguard if there are multiple users" into jb-mr1-dev
b70ff9a Force keyguard if there are multiple users
43aa159 Allow adb shell am display-size to use bigger sizes.
df46c63 Merge "Prevent degenerate 9-patches from drawing out of bounds Bug #7137292" into jb-mr1-dev
3c396fc Merge "Reducing the click delay while screen magnification is enabled." into jb-mr1-dev
70561df Prevent degenerate 9-patches from drawing out of bounds Bug #7137292
c9d834d Update airplane-mode manipulation for the new Settings namespace
86fe9e1 Reducing the click delay while screen magnification is enabled.
d5fe147 Miscellaneous fixes for Settings
4e2eb65 Merge "Update airplane-mode manipulation for the new Settings namespace" into jb-mr1-dev
53d13ec Merge "Fix adb am display-size." into jb-mr1-dev
3c5dab4 Merge "Make input system aware of multiple displays." into jb-mr1-dev
2e7d0cb Merge "Move native libraries to /data/app-lib" into jb-mr1-dev
c09cdce Update airplane-mode manipulation for the new Settings namespace
94740e6 Control access to inherited methods of jsinterface objects
6625389 Scaling in viewport moving state locks into a magnified state.
bdf8fa0 Merge "Fix some destroy bugs" into jb-mr1-dev
4899d6f am cd3ec7a2: am e9e40b43: Merge "add link to device dock lesson" into jb-dev
cd3ec7a am e9e40b43: Merge "add link to device dock lesson" into jb-dev
a25526a am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
e9e40b4 Merge "add link to device dock lesson" into jb-dev
51740d6 am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
0e9f34b Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
c73d67f add link to device dock lesson
095e8aa Fix some destroy bugs
e35c54e Merge "Allow simultaneous scale and pan in magnified state." into jb-mr1-dev
e215f26 Fix adb am display-size.
bc91c5f Merge "Report the user id of every app to ddms." into jb-mr1-dev
6d04712 Allow simultaneous scale and pan in magnified state.
5737534 Allow pattern to start from outside pattern view
009ea5a Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev
83d616a Make input system aware of multiple displays.
4573e29 Merge "Flesh out multi-user in am commands." into jb-mr1-dev
8a9f5d4 USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
e29b24b Check for null ViewRootImpl when saving accessibility focus in ListView.
2876412 Reset GL buffer state after functor invocation
1676c85 Flesh out multi-user in am commands.
9137320 Avert crash when dragging text in same TextView
d693dfa Report the user id of every app to ddms.
d7f5a51 Merge "IME support for trackball and generic motion events" into jb-mr1-dev
b38070c IME support for trackball and generic motion events
e11dc0d Merge "Fix clone() for Animators with just a 'to' value" into jb-mr1-dev
00177e4 Fix clone() for Animators with just a 'to' value
cae2e38 Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-dev
2ac2afe Add support for controlling remote submix audio routing
da2f0ea Camera: Add SCENE_MODE_HDR.
ddbe50d Move native libraries to /data/app-lib
dcc036c Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev
5e0cc0d Fix port logic in WifiDisplayController.
1434e29 Merge "Check for null ViewRootImpl when saving accessibility focus in ListView." into jb-mr1-dev
562af68 Merge "Reset GL buffer state after functor invocation" into jb-mr1-dev
996be34 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
27093de Check for null ViewRootImpl when saving accessibility focus in ListView.
2323ec7 Merge "Notifications: Hide ticker updates from background users." into jb-mr1-dev
7e8f6c4 Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev
0c38150 Improve scaling vs pan in screen magnifier.
7c07cdd Import translations. DO NOT MERGE
3c1a201 Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev
b7a6859 Fix DevicePolicyManager crash when settings password quality (and possibly others).
69fe527 Camera: Add enableShutterSound method.
beb8bd0 Reset GL buffer state after functor invocation
67202c9 merge in jb-mr1-release history after reset to jb-mr1-dev
61e3683 Notifications: Hide ticker updates from background users.
753e128 Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev
799553e Merge "Fix device list update" into jb-mr1-dev
e298d88 Fix device list update
41bd89f Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-dev
01a7c79 Merge "Various fixes." into jb-mr1-dev
2d1b378 Various fixes.
f09263e SurfaceTexture: add updateTexImage synchronization
3e6d426 Merge "Handle case where user info might not be available." into jb-mr1-dev
7a8cce3 Handle case where user info might not be available.
ab603ac Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev
1f6d870 Update WifiP2pWfdDevInfo from device found event
e3e5349 am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
61d0981 am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
3150fee am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
be3267a Merge "Add a native library to test APKs" into jb-mr1-dev
785aaa2 Merge "Add more testing for native libraries" into jb-mr1-dev
bfe1ab8 Merge "Fix aapt to get expat header files from the approved location."
69d6b53 Merge "Update PackageSetting flags when updating" into jb-mr1-dev
e64e097 Add a native library to test APKs
7e921a1 Add more testing for native libraries
5455f68 Update PackageSetting flags when updating
63bdb34 Copy all mutable state before sending to clients.
dedb451 Disable wifi display API when the adapter is not registered.
5de4d98 Merge "Use correct PowerManager call to wake up screen" into jb-mr1-dev
8727a73 Merge "A little cleanup." into jb-mr1-dev
ee15e15 Fix aapt to get expat header files from the approved location.
783f9e6 Use correct PowerManager call to wake up screen
1b8ecc5 A little cleanup.
644ea77 This enables the back button in keyguard
47b2efc Merge "Copy all mutable state before sending to clients." into jb-mr1-dev
d8544a5 Copy all mutable state before sending to clients.
fdb5bd2 Merge "Disable wifi display API when the adapter is not registered." into jb-mr1-dev
21c7153 Disable wifi display API when the adapter is not registered.
25c925e Throw ALL the exceptions! (in the PackageManagerTests)
0c19162 Remove "protect" command from installd
add52a9 Viewport should zoom out when screen magnification is disabled.
5b1720e Merge "Viewport should zoom out when screen magnification is disabled." into jb-mr1-dev
6d0df87 Viewport should zoom out when screen magnification is disabled.
584dafe merge in jb-mr1-release history after reset to jb-mr1-dev
a3909a9 Work around crash when display is removed.
e168edb Merge "Add skeleton Wifi-Display tile in QS." into jb-mr1-dev
20ec8ac Merge "Improve Wifi display discovery API." into jb-mr1-dev
508257b Add skeleton Wifi-Display tile in QS.
180bbc7 Improve Wifi display discovery API.
3a5b801 LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test
8f008e7 Merge "More multi-user methods in PM" into jb-mr1-dev
151ec4c More multi-user methods in PM
8e81013 Merge "Make display manager tell input system about viewports." into jb-mr1-dev
d728bf5 Make display manager tell input system about viewports.
a4a2bee Merge "Initial changes to add QuickSettings." into jb-mr1-dev
d63c597 Initial changes to add QuickSettings.
1edf63e Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev
631938f Enable auto-brightness adjustment feature with system prop.
b0d10aa Merge "Add new wifi display discovery API." into jb-mr1-dev
0597100 Merge "Retry wifi display connections." into jb-mr1-dev
e08ae38 Add new wifi display discovery API.
f82b583 Merge "Add permissions to control and configure wifi display." into jb-mr1-dev
4319079 Merge "Fix doc typo." into jb-mr1-dev
4aacf93 Merge "Fix memory corruption in LayerRenderer::copyLayer" into jb-mr1-dev
e49d7ec Fix memory corruption in LayerRenderer::copyLayer
4ea283a Merge "Sanity-check existence of restore agent" into jb-mr1-dev
be6024d Merge "Fix crash in ShapeDrawable" into jb-mr1-dev
1558cf1 Fix crash in ShapeDrawable
1ac44eb Merge "Don't hide the PIN keyboard even when a physical keyboard is present." into jb-mr1-dev
5d75052 Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev
74ee865 Add Binder.getCallingUserHandle().
e7287a0 Sanity-check existence of restore agent
ddb12e8 Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-dev
0a26696 Merge "Log all individual settings restored" into jb-mr1-dev
d717788 Log all individual settings restored
e46efc0 Enable lazy-loading of security views in keyguard
824b959 Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev
0cfebf2 Retry wifi display connections.
4b71e4e Add permissions to control and configure wifi display.
4d0b562 Disable hardcoded wifi display adapter.
d888399 Explicitly specify current user everywhere home is started.
0458a69 Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev
2cee686 Fixing off by one error in the ScreenMagnifier.
ac8f575 Don't hide the PIN keyboard even when a physical keyboard is present.
2463741 Wrapped call to notifyAll() in a synchronized block
524a889 Fix EmergencyDialer button on devices without telephony hardware
7201829 Merge "Make mirroring automatic based on Windows on display." into jb-mr1-dev
7017e48 Merge "Add support for Wifi display." into jb-mr1-dev
cd62059 Merge "installd: fix forward locking symlink" into jb-mr1-dev
1275abd Merge "Move verification settings to Settings.Global" into jb-mr1-dev
cd42ce5 Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev
11941fd Fix crash when setting wallpaper from non-primary user.
7de350a installd: fix forward locking symlink
df4a94e Merge "Fix incorrect indexing calculation." into jb-mr1-dev
17fec32 Fix doc typo.
efb735d Fix incorrect indexing calculation.
cd664f0 Merge "Add greyscale intrinsic test." into jb-mr1-dev
3f7bbe8 Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-dev
4d8fc79 Move verification settings to Settings.Global
5fc6266 Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev
dc531fa Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev
330a5bf am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge
2ff4377 Reconcile with jb-mr0-release - do not merge
75040f8 Handle different x, y scales in drawLines AA path
965e7ff Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev
259d5e5 Resolve the correct home intent for secondary users
d6a53c3 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev
62df6eb Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
7c02632 Merge "AudioSystem: new audio device enums" into jb-mr1-dev
722285e Make mirroring automatic based on Windows on display.
89b3f48 Merge "Enable changing properties of layer paint" into jb-mr1-dev
c0be8c8 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev
ad73532 Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
649d0d7 Merge "More multi-user stuff:" into jb-mr1-dev
55e6b77 Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev
58ecc20 Reduce the number of locks acquired by display lists
5e03e2c More multi-user stuff:
417984d Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev
d15ebf2 Enable changing properties of layer paint
cbad976 Add support for Wifi display.
14c6251 am aa98d509: am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor update
aa98d50 am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates" into jb-de
6525f7b Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates" into jb-dev
970683c Merge "Further fixup of migration to global settings" into jb-mr1-dev
5ef4942 Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
f491258 Hiding some of the deprecated android.webkit API's
5cc2351 Deprecating methods (and a constant) for JB MR1
9219874 Further fixup of migration to global settings
4db5d23 Merge "Back key to dismiss full screen video" into jb-mr1-dev
d672d29 Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev
bae1d47 Merge "Fix the build" into jb-mr1-dev
c5daf84 Fix the build
56b6293 am 21d8331d: am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev
21d8331 am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev
ae050d5 Merge "Doc update: Appwidgets JB additions." into jb-dev
7629a91 am 0152a51c: am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev
0152a51 am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev
882b267 Merge "Doc change: fix typo in JB highlights." into jb-dev
6ca8f88 Doc change: fix typo in JB highlights.
53082ec AudioSystem: new audio device enums
390a06b Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev
6543c29 Merge "The drawables cache strikes again Bug #7117785" into jb-mr1-dev
30ee76c Restore accessibility focus after ListView layout.
f6aa537 Merge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction" into jb-mr1-dev
01fcb72 Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev
37ee534 Merge "Add context support to backdropper filter." into jb-mr1-dev
41ed910 Merge "Audio Effects test app" into jb-mr1-dev
e590dc6 Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
2ab0113 Pass EXCLUDE_FROM_RECENTS when starting secure camera.
240a90d Merge "Fault tolerance in Bluedroid" into jb-mr1-dev
1223e5a Fault tolerance in Bluedroid
c1ccbf5 Add greyscale intrinsic test.
8fd5853 Document ColorMatrix intrinsic and add helpers
9545dc0 Include primary flag in StorageVolume.
162fabb Let Pair represent null values.
1a9c0dfd Mark all settings upgrade transactions as successful along the way
bd4a708 docs: update for multi apk doc for ABI support
8e21d4d Merge "Adding accessibility check in the node provider of NumberPicker." into jb-mr1-dev
a909276 Adding accessibility check in the node provider of NumberPicker.
01fa888 Merge "Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo." into jb-mr1-dev
eb9862f Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo.
4b15ab6 Fixing the build
f92b57c Merge "Don't use toArray() inappropriately" into jb-mr1-dev
a96798e Don't use toArray() inappropriately
52832e0 Merge "Granular navigation not possible in edit text if the view has content description." into jb-mr1-dev
2f4bf52 Granular navigation not possible in edit text if the view has content description.
3540f1f Merge "Granular navigation uses mContentDescription instead of getCpontentDescription()s" into jb-mr1-dev
05282aa Granular navigation uses mContentDescription instead of getCpontentDescription()s
6da5827 Merge "Screen magnification - feature - framework." into jb-mr1-dev
1cf70bb Screen magnification - feature - framework.
c71d406 Merge "Better layout for Face Unlock on 600dp tablet" into jb-mr1-dev
a56f8f7 Merge "Fix EmergencyDialer button on devices without telephony hardware" into jb-mr1-dev
2b0442f Merge "Event logging for lockdown VPN state changes." into jb-mr1-dev
91c6a64 Event logging for lockdown VPN state changes.
0af4b8b Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction
fa8d83d Merge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev
b75111d Merge "Add wireless to KeyguardUpdateMonitor isPluggedIn" into jb-mr1-dev
f56e243 Restrict lockdown and firewall to AID_SYSTEM.
bf4d55c Merge "Add connection broadcast on group creation failure" into jb-mr1-dev
85ab8e8 Better layout for Face Unlock on 600dp tablet
47df44a Fix EmergencyDialer button on devices without telephony hardware
1047509 Update documentation for layout direction qualifiers for Resouces
0a66763 Add connection broadcast on group creation failure
65476e6 Merge "Fix m11 to be Y scale instead of X" into jb-mr1-dev
f330d19 Add context support to backdropper filter.
9147cd4 Fix m11 to be Y scale instead of X
5f49c30 The drawables cache strikes again Bug #7117785
06efb53 Per-user settings
9e130e7 Merge "Limit certain actions to default Display." into jb-mr1-dev
5558eac Back key to dismiss full screen video
f645da5 Convert resized() method to new parameters.
5851c6e Merge "Convert resized() method to new parameters." into jb-mr1-dev
a6b5eca Merge "Don't trigger log for empty views" into jb-mr1-dev
656e3af Convert resized() method to new parameters.
3667aa3 Don't trigger log for empty views
c862d0f Merge "Add secure setting for package verification" into jb-mr1-dev
776dafa Merge "Log if a view fails to fit in the drawing cache" into jb-mr1-dev
10e9d1d Log if a view fails to fit in the drawing cache
16e119e Add secure setting for package verification
66b9fb1 Iintial stab at multi-user switcher on Keyguard
2370126 DO NOT MERGE - Make WebView track focal points more accurately
9d9fe3d DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2e2beaa Audio Effects test app
fb3ec44 am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
f66603e am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
3f3ce8a am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
49a7387 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3065963 Wrapped call to notifyAll() in a synchronized block
fae0d66 Merge "Nested fragments." into jb-mr1-dev
6f7c139 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
bf3e62b Merge "Make SimpleSessionDescription locale safe"
8a802db Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
62bea2f Nested fragments.
40e86a5 Merge "New "Start dreams" launcher shortcut." into jb-mr1-dev
378d131 Merge "Varying-based AA rect drawing" into jb-mr1-dev
369bb97 Merge "P2p API for WFD" into jb-mr1-dev
c67fb6c am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
657dba9 am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
7a64752 am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
4aa83ec am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
ab4cd45 P2p API for WFD
32f6fd5 New "Start dreams" launcher shortcut.
32ac1e1 Fix NPE in NdefRecord parser.
1d9c5d8 Reconcile with jb-mr0-release jb-release - do not merge
bb60bc2 Merge "Musicplayer application can not display DRM files of internal storage."
31498ed merge in jb-mr1-release history after reset to jb-mr1-dev
4848f42 Merge "Fixing issue where recents items would go dim" into jb-mr1-dev
a92a01b Add wireless to KeyguardUpdateMonitor isPluggedIn
69b0818 Limit certain actions to default Display.
0762cec Fix bug #7112174 ActionMenuView should be aware of layout direction
5830cb2 Cosmetic code changes to face unlock after review.
d2d4a64 Merge "Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd" into jb-mr1-dev
6212cc0 Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd
e7376e2 Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev
6ebdc11 Varying-based AA rect drawing
000464a Initial pass at re-enabling face unlock in new keyguard.
18e8768 Merge "remove defunct javascript interface" into jb-mr1-dev
6d617c2 Merge "Stabilize perf data." into jb-mr1-dev
3e777c7 Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev
27230f0 Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev
1489540 Fixing issue where recents items would go dim
76fb297 Stabilize perf data.
3e4599a Don't depend on LockPatternUtils to get DevicePolicyManager
96ab460 Doc update: Appwidgets JB additions.
9ca26e4 Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev
f6bdb63 Import translations. DO NOT MERGE
91a65b5 Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev
fd5494b Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev
ec098ef am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
8de24dc Restore original default Wifi sleep policy (always)
f73fbf7 Don't depend on LockPatternUtils to get DevicePolicyManager
f389f28 resolved conflicts for merge of 7749a1c5 to jb-mr1-dev
18621bd Import translations. DO NOT MERGE
342c6bc am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
7749a1c am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
5409955 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
b4ac801 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
5575e97 Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev
f53c571 am b693f6a9: am 8f58d381: older not lower
b693f6a am 8f58d381: older not lower
e8c47a8 am 3bcf81df: am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev
8f58d38 older not lower
d773ca8 remove defunct javascript interface
3827d43 am 5ba48e12: am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev
3bcf81d am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev
5ba48e1 am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev
253483d Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev
d4107dc Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev
380a8e3 Merge "Am: Clean mLaunchingProviders of all providers started by the client"
ba4cf3c docs: Accessibility DevGuide, Jelly Bean edition
0b5a4a1 am 11626a91: am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
11626a9 am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
1ca2fee Merge "Make default value of auto-sync in SyncStorageEngine configurable"
9eb3bd8 am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
42a58ec Merge "Revert "Watchdog: Improvement of debuggability""
4a332f5 Merge "Don't invalidate all the glyphs when flushing large textures" into jb-mr1-dev
022668b Telephony: Clarify IccCardConstants.State enum
395b393 dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
5a426f6 Merge "Full-height panels on phones." into jb-mr1-dev
bf526d1 Full-height panels on phones.
81c531a merge in jb-mr1-release history after reset to jb-mr1-dev
256a1b4 Merge "The default notification LED color is now white." into jb-mr1-dev
7877016 Merge "Fixing preloading recents for all devices" into jb-mr1-dev
c9ce0ab Make the SystemUI stop the screen saver when a full-screen notification is posted.
24518e4 Do not play sounds or vibes for background users' notifications.
d0d4bb8 Fixing preloading recents for all devices
881f0b1 Remove unneeded imports
8481980 Merge "Porting old code for min alpha for items in recents" into jb-mr1-dev
a1730fa Merge "Debug code for window transition crash" into jb-mr1-dev
580e9f7 Merge "Make battery shutdown temperature configurable" into jb-mr1-dev
f87633f Merge "update to new SurfaceComposerClient API" into jb-mr1-dev
0d727c7 Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev
63f1c43 update to new SurfaceComposerClient API
5729fcd Add ColorMatrix Intrinsic.
b326fa0 am 4289b49d: (-s ours) am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
730b5b6 am 52da9fa7: (-s ours) am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
4289b49 am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately
52da9fa am c4ce0da2: DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
521dc51 Don't invalidate all the glyphs when flushing large textures
fa1babd Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures
6c8c6d9 Merge "Correctly check the height of a glyph prior to caching it" into jb-mr1-dev
e43f785 Correctly check the height of a glyph prior to caching it
bac6c12 Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev
fd8bf5c Fix another issue #7097984 java.lang.SecurityException: Permission Denial:
6809352 Merge "Fix GPS settings change listener in LocManager" into jb-mr1-dev
9f3b0bf DO NOT MERGE - Make WebView track focal points more accurately
c4ce0da DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
deeade3 Merge "Make WebView track focal points more accurately" into jb-mr1-dev
adb9388 Merge "Delay starting scale gesture events until a touch slop threshold" into jb-mr1-dev
bb95cb9 Fix GPS settings change listener in LocManager
f1ffb4f Merge "update image processing to fix ScriptGroup names." into jb-mr1-dev
d84aaa2 Merge "Fix line drawing path to use proportional distance from center" into jb-mr1-dev
c83f982 Merge "Code cleanup in FontRenderer" into jb-mr1-dev
8087246 Code cleanup in FontRenderer
7950d08 Merge "Make mLayoutNeeded per-Display." into jb-mr1-dev
0116136 Merge "installd: reduce privileges." into jb-mr1-dev
19d59bc Make mLayoutNeeded per-Display.
4b09dd3 Better flow for SIM PIN/ SIM PUK screens in keyguard.
2ecaedd Merge "Small code cleanup in FontRenderer" into jb-mr1-dev
c3f6d18 update image processing to fix ScriptGroup names.
9b1204b Small code cleanup in FontRenderer
175ae55 Merge "Update DevicePolicyManager with ability to disable keyguard widgets" into jb-mr1-dev
6904208 Merge "Enable package verification" into jb-mr1-dev
85399cc Merge "Refactor FontRenderer.cpp" into jb-mr1-dev
de66e67 Merge "Add some new native deletage to layoutlib." into jb-mr1-dev
035ce2c Merge "Add support for "-rtl" in resources" into jb-mr1-dev
5eb51de Add some new native deletage to layoutlib.
812b19a installd: reduce privileges.
1027ed2 Make WebView track focal points more accurately
47ec2fb Delay starting scale gesture events until a touch slop threshold
8f5ad76 Fix line drawing path to use proportional distance from center
d2ed9d0 Fix issue #7097984 java.lang.SecurityException: Permission Denial:
f3c74f3 Make battery shutdown temperature configurable
1676118 Merge "Keyguard bug fixes" into jb-mr1-dev
b8ec470 Update DevicePolicyManager with ability to disable keyguard widgets
68ed7e4 Enable package verification
784827b Revert "Watchdog: Improvement of debuggability"
d2a8df9 Merge "Fix issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev
9f5dab3 Refactor FontRenderer.cpp
34a75df Merge "Remove single pass actions from display loop." into jb-mr1-dev
ed48f9f Merge "Change layout inner loop order for multi display." into jb-mr1-dev
e32bb6c Merge "Only show the BeanFlinger screensaver to the worthy." into jb-mr1-dev
b8839dd Fix issue #7097984 java.lang.SecurityException: Permission Denial:
b788556 am ad17717e: am d3b74b91: am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
ad17717 am d3b74b91: am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
d3b74b9 am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
b4597aa Merge "Fix my fix." into jb-mr1-dev
e2bdca5 Fix my fix.
a15bd8a Merge "Fix build." into jb-mr1-dev
52fba38 Fix build.
e25081c am 10d1095a: am 1eca514a: Merge "Doc update: Fix typo." into jb-dev
b307ceb Merge "SearchWidget: passing APP_DATA to voice intent"
7d69e8b Merge "Add registering for explicit users." into jb-mr1-dev
20e8098 Add registering for explicit users.
9fc4b35 Add new hw acceleration test
10d1095 am 1eca514a: Merge "Doc update: Fix typo." into jb-dev
1eca514 Merge "Doc update: Fix typo." into jb-dev
ea3a09a Remove single pass actions from display loop.
599943e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d9d00c1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
76a7165 Change layout inner loop order for multi display.
adf0b21 Porting old code for min alpha for items in recents
a4dd301 Debug code for window transition crash
e62e6d8 Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed
4ee3649 Am: Clean mLaunchingProviders of all providers started by the client
a5c6d59 merge in jb-mr1-release history after reset to jb-mr1-dev
2b5d0ea Make default value of auto-sync in SyncStorageEngine configurable
1bcfe84 SearchWidget: passing APP_DATA to voice intent
e94831e Merge "Minor refactors." into jb-mr1-dev
3983419 Minor refactors.
a7ee006 The default notification LED color is now white.
0baaac5 Revert "Revert "Add more support for transformed clip rects and paths""
a8557d2 Revert "Add more support for transformed clip rects and paths"
d36ebe0 Keyguard bug fixes
703bd32 Merge "Add more support for transformed clip rects and paths" into jb-mr1-dev
dfe082f Add more support for transformed clip rects and paths
a4640c0 Add some NullPointerExceptions to AndroidKeyStore
2701f32 Merge "Remove Binder.getOrigCallingUid()." into jb-mr1-dev
430e5b2 Merge "Centralize the creation of the user system directory" into jb-mr1-dev
ce20a45 Merge "Paramaterize and adjust the glyph cache sizes" into jb-mr1-dev
f83ec83 Merge "More improvements to the display manager." into jb-mr1-dev
3b9a416 Merge "Initial draft of high-level multi-display APIs." into jb-mr1-dev
4ed8fe7 More improvements to the display manager.
a492c3a Initial draft of high-level multi-display APIs.
61f5737 Centralize the creation of the user system directory
4120375 Remove Binder.getOrigCallingUid().
176d105 Merge "Don't set the time zone under the caller's identity" into jb-mr1-dev
8977982 Don't set the time zone under the caller's identity
eb32a49 Paramaterize and adjust the glyph cache sizes
58a2950 Merge "Lots of keyguard improvements - Fix "too many attempts" dialogs - Fix account unlock mechanism so the user can use email account as backup for pattern unlock - Add mechanism to support future account recovery from non-pattern screen - Tune animation timing for flipping security view. - Move password field to the top of the security view - Add padding and visual feedback to navigation area button" into jb-mr1-dev
77bf72a Revert "Update Back softkey icon Bug: 6020915"
c104d16 DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
0bcf4ad Only show the BeanFlinger screensaver to the worthy.
1d963f3 Work around instability of Display.getRotation().
753f590 GestureDetector - Mask action when checking POINTER_UP
8c890f8 Merge "Work around instability of Display.getRotation()." into jb-mr1-dev
7f3cf95 Work around instability of Display.getRotation().
6beee26 am a3503f26: am 6ee6615d: Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev
a3503f2 am 6ee6615d: Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev
6ee6615 Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev
f14f01c Revert "Update Back softkey icon Bug: 6020915"
9ecd02b am b9445141: (-s ours) am f1faf774: Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev
b944514 am f1faf774: Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev
89bc863 Merge "Add an OnDismissListener to AutoCompleteTextView" into jb-mr1-dev
f1faf77 Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev
3926360 DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
f4247c2 Merge "GestureDetector - Mask action when checking POINTER_UP" into jb-mr1-dev
f90165a GestureDetector - Mask action when checking POINTER_UP
aed83ee Import translations. DO NOT MERGE
464fb99 Import translations. DO NOT MERGE
20c38ea Musicplayer application can not display DRM files of internal storage.
00453e7 Merge "Tweak overlay display adapter scaling." into jb-mr1-dev
0cc2e9b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
258341c Lots of keyguard improvements - Fix "too many attempts" dialogs - Fix account unlock mechanism so the user can use email account as backup for pattern unlock - Add mechanism to support future account recovery from non-pattern screen - Tune animation timing for flipping security view. - Move password field to the top of the security view - Add padding and visual feedback to navigation area button
a2875f4 Merge "Notify verifiers that verification is complete" into jb-mr1-dev
6cab600 Merge "Make detachViewFromParent more robust" into jb-mr1-dev
46e942d framework: fix bug for uninitialized variable
b2fc49b Merge "Integrate new assets from UX that include layout bounds." into jb-mr1-dev
a559f88 am 0e90f738: am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns"
0e90f73 am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns"
f531176 am 0dab1a19: Merge "Fix code problem in writePidDns"
dc2cf24 Integrate new assets from UX that include layout bounds.
780c491 Add an OnDismissListener to AutoCompleteTextView
ca479d4 Make detachViewFromParent more robust
0dab1a1 Merge "Fix code problem in writePidDns"
f203aee Enforce permissions for calls with specified userId
21ee2ca DO NOT MERGE Remove dead code
b2dd4e8 am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
8be03ac DO NOT MERGE - Use focal point for scrolling in GestureDetector
1a907db am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
48c7c6c DO NOT MERGE - New implementation for ScaleGestureDetector
d1b5cfc Notify verifiers that verification is complete
862c383 am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
f331e6f Turn off deadzone flash, replacing it with logcat.
1011369 Fixed MemoryUsage issue with reporting results.
315948f Use focal point for scrolling in GestureDetector
0fa814d Merge "Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set" into jb-mr1-dev
fbb4321 Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
4b60a8d Merge "Added check of ActivityInfo launch mode when starting activity."
7336569 Merge "Improve multi-user broadcasts." into jb-mr1-dev
d02239d am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
4dc187b Merge "Fix a typo in the sample code" into jb-mr1-dev
30b5bea am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
92c0e37 Merge "Fixed MemoryUsage issue with reporting results." into jb-mr1-dev
6fdd496 Merge "DO NOT MERGE Remove dead code" into jb-dev
a242deb Fix a typo in the sample code
5ac72a2 Improve multi-user broadcasts.
6c16d03 am 3dda2cff: (-s ours) am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
029d4eb am 00925a3b: (-s ours) am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
3dda2cf am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
00925a3 am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
ecb388e Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
0dd248e Merge "Turn off deadzone flash, replacing it with logcat." into jb-mr1-dev
25bb8ee Turn off deadzone flash, replacing it with logcat.
2effa64 Fixed MemoryUsage issue with reporting results.
4698e36 am 6ab3ea5f: am 147ef944: am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
6ab3ea5 am 147ef944: am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
147ef94 am 60d1e1a0: Merge "Watchdog: Improvement of debuggability"
8b300ed Merge "Don't die(immediate) if from performTraversals." into jb-mr1-dev
60d1e1a Merge "Watchdog: Improvement of debuggability"
5305953 DO NOT MERGE - Use focal point for scrolling in GestureDetector
d33b621 DO NOT MERGE - New implementation for ScaleGestureDetector
0c9278d Merge "AudioService: pause music when undocked" into jb-mr1-dev
7a8b68c Merge "Use focal point for scrolling in GestureDetector" into jb-mr1-dev
dba8a81 Fix CDMA decoding of multipart UTF-16 SMS messages.
fef288b am 8f58dfa9: am da5cd308: am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
8f58dfa9 am da5cd308: am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
da5cd30 am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
794da7a AudioService: pause music when undocked
79df545 Fix keyguard layout on tablet
ae03afd Merge "onSavePassword dialog can leak when WebViewClassic is destroyed."
df2390a Don't die(immediate) if from performTraversals.
e217ee4 Access to all users' external storage.
08db9df Merge "Fix keyguard layout on tablet" into jb-mr1-dev
451da77 Merge "Add getter for animateFirstView property of ViewAnimator" into jb-mr1-dev
e671cce Merge "Shared OBB storage across users." into jb-mr1-dev
07cb030 Fix keyguard layout on tablet
201501f Add getter for animateFirstView property of ViewAnimator
c0c1c94 Merge "Avoid thrashing the glyph cache during the precache phase" into jb-mr1-dev
f942cf1 Avoid thrashing the glyph cache during the precache phase
63f2fca Merge "Fix bug with Fbo layer clipping" into jb-mr1-dev
392bfab merge in jb-mr1-release history after reset to jb-mr1-dev
9211b13 Watchdog: Improvement of debuggability
8655e90 onSavePassword dialog can leak when WebViewClassic is destroyed.
428f539 Merge "Locking when clearing VPN source rules." into jb-mr1-dev
580dd31 Locking when clearing VPN source rules.
a99e4ca Merge "Bind to screenshot service for current user." into jb-mr1-dev
7808581 Merge "Pre-multiply color components for 2-stop gradients Bug #7033344" into jb-mr1-dev
d679b57 Pre-multiply color components for 2-stop gradients Bug #7033344
05a1e1f Use focal point for scrolling in GestureDetector
8601e8b Merge "Expand the navbar dead zone briefly after touches elsewhere." into jb-mr1-dev
7bb5745 Failing uchar4->int4 test
5b81de4 Merge "Fix Camera and GoogleNow launching in keyguard" into jb-mr1-dev
5f75aa1 Fix Camera and GoogleNow launching in keyguard
b07e89f Merge "Integrate overscroll into KeyguardWidgetView." into jb-mr1-dev
8b9df6c Import translations. DO NOT MERGE
694121c Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev
317046a Fix an NPE in PackageManager when getting the AppInfo for an app
d0dd63d Tweak overlay display adapter scaling.
f2dfc35 Integrate overscroll into KeyguardWidgetView.
c452a40 am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp
12631ec Merge "Start implementing concept of "running" users." into jb-mr1-dev
044a9b9 resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp
d48885a Fix bug with Fbo layer clipping
c26185b Expand the navbar dead zone briefly after touches elsewhere.
ffc45b7 Merge "UsbDebuggingManager: Fix restart when toggling USB debugging" into jb-mr1-dev
f404d10 Merge "Fix build for some javac compilers." into jb-mr1-dev
29d8d26 Fix build for some javac compilers.
5a05f2b Merge "Fix MENU key in keyguard." into jb-mr1-dev
95b005c Fix MENU key in keyguard.
b35e4d7 Fix CDMA decoding of multipart UTF-16 SMS messages.
9e3045c Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev
8ea0dc6 Shared OBB storage across users.
a28c18f Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev
402206b Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev
b2c94ec Merge "Change default setting for dreams to 'when docked'" into jb-mr1-dev
3b6214f Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
d5ea3b4 Merge "Add initial multi-display support." into jb-mr1-dev
509bf2d UsbDebuggingManager: Fix restart when toggling USB debugging
0552cbc Merge "UsbDebuggingManager: add missing break in switch" into jb-mr1-dev
731b899 Merge "Run with scissors." into jb-mr1-dev
8506ce1 Merge "Provide referer to browser on download request." into jb-mr1-dev
6bfc888 Fix DHCP handling at disconnect/reconnect
bd6e150 Add initial multi-display support.
f63029b merge in jb-release history after reset to jb-dev
f0340d1 Merge "Don't overwrite accessibility delegates in AbsListView items." into jb-mr1-dev
4e724c8 Change default setting for dreams to 'when docked'
d45e5f6 Merge "Enable new keyguard" into jb-mr1-dev
37ce5c5 UsbDebuggingManager: add missing break in switch
9c7e630 Enable new keyguard
6dd530f Doc update: Fix typo.
69626da am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
4a4edbb am 7fecf5f4: Merge "Make addAddress locale safe"
c134885 Merge "Replace keyguard with new implementation" into jb-mr1-dev
c7c8729 merge in jb-release history after reset to jb-dev
dcb3d84 Replace keyguard with new implementation
7fecf5f Merge "Make addAddress locale safe"
38f1978 am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
14c0c98 am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
a36dcfd Provide referer to browser on download request.
4ba4cae Merge "Fix SkBitmap::fPixels not being locked correctly"
a798b95 Use smoothstep to eliminate branches in AA shader
c88a80a am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"
d5a1074 am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery"
15e099c am 0e0942c7: Merge "Default WiFi sleep policy setting"
c5f34bd am 48c45d0e: Merge "Fix join scenario with provision discovery"
0e0942c Merge "Default WiFi sleep policy setting"
48c45d0 Merge "Fix join scenario with provision discovery"
127efc4 Fix join scenario with provision discovery
35ef567 Fix SkBitmap::fPixels not being locked correctly
ed47b92 merge in jb-mr1-release history after reset to jb-mr1-dev
c53abc4 Run with scissors.

   * frameworks/compile/libbcc
e5bc1ed clang fix: TreeIteratorBase is a struct, not a class.
4366a86 libbcc: Don't implement __ashldi3 and __lshrdi3 with current gcc versions
6f3138b Fix missing data for mObjectSlots.
0d6d592 Fix improper cast for pown on CPU/GPU.
ceb4c0f Switch to TargetData::getTypeAllocSize().
74a4b08 Fix pass-by-value when the return type uses pass-by-reference.
4fdec9b Cleanup naming of aprox & half functions. bug 7205089
7ae3a82 Implement expandKernel() for pass-by-value.
1b84ea3 am 2e00e3b8: am 89fb60df: Merge "Fix length(float v) issue"
2e00e3b am 89fb60df: Merge "Fix length(float v) issue"
89fb60d Merge "Fix length(float v) issue"
2fde634 Fix length(float v) issue
a565633 Merge "Fix up libbcc for LLVM upstream merge to r162314." into jb-mr1-dev
3ffc833 Add support for generating .bcinfo files to bcinfo.
2ac4cb1 Merge "Cache element type in allocation." into jb-mr1-dev
561df91 Cache element type in allocation.

   * frameworks/compile/linkloader
0b22587 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/compile/linkloader into 1.1
02ec342 Add missing R_ARM_JUMP24/R_ARM_THM_JUMP24 relocation.

   * frameworks/compile/slang
e829df9 clang and 10.9 assembler fixes: Warnings are treated as errors (-Werror), so do not warn on nested anon types or unused private fields. gcc does not, so that is why gcc does not error out.
dc061bc Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/compile/slang into 1.1
f7f66c5 am 68c072cf: Fix overly strict check for float3 in structures.
68c072c Fix overly strict check for float3 in structures.
76572c6 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
5fe5081 merge in jb-mr1-release history after reset to jb-mr1-dev
28d60bc Only generate getFieldID_*() for non-Pointer (bind) types.
394bb45 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
75fa8f6 merge in jb-mr1-release history after reset to jb-mr1-dev
9e06c52 Merge "Add support for getting arbitrary kernel and field IDs." into jb-mr1-dev
f908225 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
15a02d0 merge in jb-mr1-release history after reset to jb-mr1-dev
11274a7 Validate FS (and RS) ASTs.
cf9a73a Fix teardown bug for multiple files without pragma.
b81a993 Add support for getting arbitrary kernel and field IDs.
7006f99 merge in jb-mr1-release history after reset to jb-mr1-dev
bcae1fe Switch to FieldPacker for signed sub-integer types.
14d5555 merge in jb-mr1-release history after reset to jb-mr1-dev
9ca96e7 Support for pass-by-value kernels.
918fd46 merge in jb-mr1-release history after reset to jb-mr1-dev
58fcd13 Merge "Fix up slang for merge through LLVM r163557." into jb-mr1-dev
0375227 merge in jb-mr1-release history after reset to jb-mr1-dev
d293693 Simpler ScriptC constructors
1dfc415 Fix up slang for merge through LLVM r163557.
e94fff5 merge in jb-mr1-release history after reset to jb-mr1-dev
529e07e Merge "Fix up slang for LLVM upstream merge to r162314." into jb-mr1-dev
50d2882 merge in jb-mr1-release history after reset to jb-mr1-dev
b13b85e Structs containing vectors of dimension 3 cannot be exported before ICS.

   * frameworks/ex
aff1242 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/ex into 1.1
a918fec Merge "Eliminate jank when the user deletes a character thereby removing all contact results in the popup." into jb-mr1.1-dev
09bb480 Eliminate jank when the user deletes a character thereby removing all contact results in the popup.
7d7b83b Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-dev
8f7bdab Fix problem where part of wrong photo shows
3665fb7 Scroll when result of a contacts lookup appear
18bc55d Merge remote-tracking branch 'goog/jb-ub-mail' into gmailmerge
f5ac328 SMS text messaging omits numbers in parentheses
99ea997 Reduce time until first revision of a chip is drawn.
e719fc8 dont replace the text in the text field when editing a fake or generated entry
a34f711 Reconcile with jb-mr1-release - do not merge
8adb8f0 merge in jb-mr1-release history after reset to jb-mr1-dev
6297b87 Reconcile with jb-mr1-release - do not merge
439fbca merge in jb-mr1-release history after reset to jb-mr1-dev
519f791 am 797b22f9: Merge changes to chips from unbundled branch: update behavior to match new ux spec
d00c91b am 06208d07: cherrypick: Reset maxlines when the user expands text
797b22f Merge changes to chips from unbundled branch: update behavior to match new ux spec
bc8820f Make sure that we take the existng temporary contact, where available.
dab17fc Make sure that the last "fake entry" chip is correctly committed
d5f7739 Update chips to follow new ux spec for replacement
06208d0 cherrypick: Reset maxlines when the user expands text
7af7b65 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
c270a16 Reset maxlines when the user expands text
b6d089e merge in jb-mr1-release history after reset to jb-mr1-dev
5f0470b Fix for panorama icon not always showing up in photo viewer.
939ce1b Restart loader on attachment cursor updates
ec72821 Show old results
a1bdcf1 Fix for panorama icon not always showing up in photo viewer.
690abee Show old results
48a26c9 Show old results
b1b8fc2 Restart loader on attachment cursor updates
843063c merge in jb-mr1-release history after reset to jb-mr1-dev
b32dd40 SMS text messaging omits numbers in parentheses
09a864a merge in jb-mr1-factory-release history after reset to jb-mr1-dev
cfe8332 merge in jb-mr1-release history after reset to jb-mr1-dev
14a4df6 Load preview first
28c2b3b Load preview first
ad8b3bf merge in jb-mr1-factory-release history after reset to jb-mr1-dev
f8f0dfa merge in jb-mr1-release history after reset to jb-mr1-dev
da4cfee Set the scale type for the default image icon
917f53e Set the scale type for the default image icon
d44d191 merge in jb-mr1-release history after reset to jb-mr1-dev
c16fb2a cherrypick: Make sure we check the most up to date text for the token offsets.
17c9229 Make sure we check the most up to date text for the token offsets.
fcf5557 merge in jb-mr1-release history after reset to jb-mr1-dev
afca369 Add comments to the recipientedittextview replace code.
0c6fe7e cherrypick: Fix crashes associated with new logic to replace entire address with name + address
d5f17a8 Fix crashes associated with new logic to replace entire address with name + address
99f7f4f merge in jb-mr1-release history after reset to jb-mr1-dev
3817205 am 215b1c80: The "original text" is just what we are putting in the text view, which is displaytext
215b1c8 The "original text" is just what we are putting in the text view, which is displaytext
3a539a3 am 5211e468: Add Exif parser
0df9c05 merge in jb-mr1-release history after reset to jb-mr1-dev
5211e46 Add Exif parser
65a0f02 am b6641931: Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
b664193 Make sure when we reverse lookup a recipient, we replace the underlying text string as well.
0440138 merge in jb-mr1-release history after reset to jb-mr1-dev
88d18b9 am 4054bd6d: Use gesture detector from support lib
4054bd6 Use gesture detector from support lib
efc5b69 merge in jb-mr1-release history after reset to jb-mr1-dev
da78c1d am c907eecd: Prevent NPE while viewing photo from attachment.
b590c0f merge in jb-mr1-release history after reset to jb-mr1-dev
c907eec Prevent NPE while viewing photo from attachment.
d990421 am bd64181d: Integrate copy of GestureDetector into photoviewer
312783d merge in jb-mr1-release history after reset to jb-mr1-dev
bd64181 Integrate copy of GestureDetector into photoviewer
4030071 am 697c046e: Prevent NPE in Gmail while viewing photo from attachment
697c046 Prevent NPE in Gmail while viewing photo from attachment
f7d8d3f merge in jb-mr1-release history after reset to jb-mr1-dev
7ef1f6e am 6c668476: We add the separator ourselves later if it wasnt specified in append.
6c66847 We add the separator ourselves later if it wasnt specified in append.
168c284 am 3aa118e7: Be extra careful with commas in recipient chips
3aa118e Be extra careful with commas in recipient chips
83f80eb merge in jb-mr1-release history after reset to jb-mr1-dev
45faaf4 am 2b4059cd: Allow action bar to be updated
2b4059c Allow action bar to be updated
da79838 am a7e22413: Fix NullPointerException when tapping attachment.
a7e2241 Fix NullPointerException when tapping attachment.
6ae12a5 merge in jb-mr1-release history after reset to jb-mr1-dev
c645df0 am 4f38cc16: Attachment image viewer should not scale images larger than original size.
4f38cc1 Attachment image viewer should not scale images larger than original size.
b74a42d merge in jb-mr1-release history after reset to jb-mr1-dev

   * frameworks/native
437084c libutils: get ride of debug trace file errors
56d9734 provide overrides for hwui memory limits for xxhdpi phones
143d05a Abort surface composition if hw surface is invalid
ba27ea4 fix mem leak on error handling
36a29a6 Add heap configuration for 1080p phones with 2048m
ab5fe40 native: add flag to disable legacy sensors fusion
8310b9d build/phone-xhdpi-1024-dalvik-heap.mk Revert AOSP heapgrowthlimit change from 64 to 96
8c4be65 Merge "sensorservice: Add legacy sensors fusion." into cm-10.1
6eebd8b Gfx-3d: fix GetProcAddress in egl extention
b64d670 DisplayDevice: initialize mDisplayToken correctly
0309f00 Forward-port surface dithering from CM10
a84f5dc SurfaceFlinger: Removal of NO_RGBX_8888 flag for OMAP3
8721f83 native: Add custom 32-aligned NV12 colorformat
79e87ed Don't use fence sync for qcom legacy
f4080b4 ui: Allocate the custom buffer size in the failure case also
bbef295 libgui: Add support to update buffer geometry.
31152b9 Add support for custom buffer sizes.
aed9f3c Revert "SurfaceFlinger: Change to support framebuffer flip for 2D blitters"
82f6831 Reset the FrameNumber for dropped frame in async mode
dc8c5a3 GC triggering performance optimizations
4cd7227 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native into 1.1
ab764de sensorservice: Add legacy sensors fusion.
be1b753 libgui: Use fences for all QCOM targets
f13a380 Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1
c9d395f SurfaceComposerClient: bring back getDisplayWidth, Height & Orientation
f442ef1 SurfaceFlinger: Change to support framebuffer flip for 2D blitters
73f454c FM Radio: Add support for FM Radio in Android
5d0e128 JB_MR1: native/libs/ui: Adding fix for conf 2.0 seg faults
588f173 sensordevice: Dummy ALS: Solve fortified libc warning
3ace5d2 sensors: Add dummy light sensor
77ddb65 ui/sf: Add support for exynos HDMI
778777a Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/native into aosp
d262585 Add setOrientation back
18aefe9 dumpstate: Squash fixes from CM 10.0
6efc967 Revert "remove support for HWC < 1.0"
0a70c9c Merge "surfaceflinger: odd hw rotation (90/270) patch for swapping width/height" into mr1-staging
49e4bcb Merge "binder: Add MemoryHeapBaseIon" into mr1-staging
9a3063e binder: Add MemoryHeapBaseIon
5bb8917 surfaceflinger: odd hw rotation (90/270) patch for swapping width/height
529cb9e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f53f9c6 [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
a0a706b DisplayDevice: Backwards compatibility with old EGL
4f9fb2b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
72c3f7d Revert "ConsumerBase: free buffers outside the lock"
2e59d2c DO NOT MERGE GraphicBufferAllocator: make frees async
2fef5c4 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b21a4e3 ConsumerBase: free buffers outside the lock
a1aa229 Sensor: Add RotationVectorSensor2
9cdde0d libui: exynos4: apply FIMC usage flag on format HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED
d98ae61 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
efd614b Merge "make transform hint multi-display aware" into jb-mr1.1-dev
282b79d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
762a6d8 Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
f792059 GraphicBuffer: exynos4: set FIMC1 usage bit on samsung specific formats
c49d996 Merge "exynos4: ui: define USAGE_HW_FIMC1 to support gralloc" into mr1-staging
7db063a ui: exynos4: getphys is common
378787c DO NOT MERGE - native_fence_sync: fix an enum name
1b1e320 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
7d28343 surfaceflinger: Reimplement hwrotation
e657227 libgui: Add ICS/MR0-compatible client::createSurface constructors
c0f52aa Revert "Revert "Compatibility work around for bad graphics driver dependency.""
1e5774b exynos4: ui: define USAGE_HW_FIMC1 to support gralloc
2b77c3e exynos4: getphys implementation on buffermanager for samsung omx
f2108ee Revert "Revert "A vendor ril depends on a native screen shot code.""
8430095 make transform hint multi-display aware
11b423f Revert "get rid of MemoryHeapPmem"
a9a4cd4 gltrace: Make sure device is debuggable.
05dbbb9 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
764c197 fix typo that broke all the builds
87fe15c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
93f838b workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
3e095b2 workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
74a474e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2a8c49e fix an out-of-bounds memory access
ee932d0 Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
2d3d9d1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3fdeb48 Reduce emulator logspam
0b2c926 bugreport: Add /proc/interrupts dump
c11f56e bugreport: Add wlan FW counters dump for bcmdhd
d8e8e66 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
42118c7 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f676236 merge in jb-mr1-release history after reset to jb-mr1-dev
02b9510 fix transitions from hwc to GLES composition
f9218b8 merge in jb-mr1-release history after reset to jb-mr1-dev
2281af9 dumpstate: add kernel memory fragmentation unusable index
1b10e25 partially implement external display clipping
faece69 merge in jb-mr1-release history after reset to jb-mr1-dev
f45c510 partially implement external display clipping
0407556 Revert "Revert "put back the unused virtuals in Vector<>""
12f2c39 merge in jb-mr1-release history after reset to jb-mr1-dev
d17e3b5 prevent a client from crashing surfaceflinger
ba7dc2d Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
dd3cb84 SurfaceFlinger: add support for secure displays
4ea5d65 Always set vertex alpha when drawing screenshot layers
92f89bd merge in jb-mr1-release history after reset to jb-mr1-dev
620685c Fix emulator vsync
7e7150f merge in jb-mr1-release history after reset to jb-mr1-dev
60393d4 Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
16928bf Add runtime debugging capabilities to OpenGL
7b2b577 merge in jb-mr1-release history after reset to jb-mr1-dev
99991c9 merge in jb-mr1-release history after reset to jb-mr1-dev
7c41bf7 SurfaceFlinger: change the animation timeout
7f79a2b Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
b28efde merge in jb-mr1-release history after reset to jb-mr1-dev
529efdf SurfaceFlinger: add animation transactions
825a9a2 Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
af49b5e merge in jb-mr1-release history after reset to jb-mr1-dev
db9b41f fix a corruption in blank/unblank
3365c56 Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
be3c3e4 Update comments to reflect what the code actually does
2d5e230 SurfaceFlinger: add animation transactions
b96fe08 Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
1cffc80 Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
837d2f9 Always set vertex alpha when drawing screenshot layers
eec9e64 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
286d5fa merge in jb-mr1-release history after reset to jb-mr1-dev
9bdaa60 Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
58b6a67 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
37e0f65 merge in jb-mr1-release history after reset to jb-mr1-dev
dd57d55 Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
cdbaecb SurfaceFlinger: make the num FBs a board config
3de9cd2 Add TEMP_FAILURE_RETRY around open and write calls
2d358c2 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1efe099 BufferQueue: alloc without holding the lock
a58b6a4 merge in jb-mr1-release history after reset to jb-mr1-dev
8b4053a merge in jb-mr1-factory-release history after reset to jb-mr1-dev
0c1c394 merge in jb-mr1-release history after reset to jb-mr1-dev
b763d5f Assume LayerScreenshot has pre-multiplied alpha
f0c89b2 Merge "Fix HDMI unblank behavior" into jb-mr1-dev
9e9689c Fix HDMI unblank behavior
a9e3004 merge in jb-mr1-release history after reset to jb-mr1-dev
8d5d201 Revert "Add GL Error logs (temporary)"
2de86a4 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
a4927ae merge in jb-mr1-release history after reset to jb-mr1-dev
0acb00c Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
c5b5816 Merge "don't automatically unblank external displays" into jb-mr1-dev
b8fc00b fix typo that prevented proper loging of EGL error code
4577899 Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev
3292cae don't automatically unblank external displays
b5c9dcd Fence didn't manager sync_wait error codes properly
c0609a2 merge in jb-mr1-release history after reset to jb-mr1-dev
2a09bb3 Add blankDisplay/unblankDisplay to SurfaceComposerClient.
cb55857 fix dumpsys Layer name when using multiple displays
60b974f merge in jb-mr1-release history after reset to jb-mr1-dev
1b3aeb4 fix SurfaceFlinger DDMS debugging
6e218ed merge in jb-mr1-release history after reset to jb-mr1-dev
6d24eef Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev
0bed1f5 Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"
3e9f3b6 ugly, temporary, workaroung for a problem where a binder thread spins forever
dba919c Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev
0845d02 ugly, temporary, workaroung for a problem where a binder thread spins forever
9504eb9 Fix race condition in ConsumerBase::addReleaseFence()
0f326b9 merge in jb-mr1-release history after reset to jb-mr1-dev
0e8fcc2 Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev
e835976 Merge "Tone down a fatal assert" into jb-mr1-dev
d920670 Fix missing parens in CleanSpec.mk.
27b28fd Merge "Add GL Error logs (temporary)" into jb-mr1-dev
5a8f901 Tone down a fatal assert
3fbbd07 Fix broken CleanSpec.mk in libs/gui
947abbd make sure we don't call into the HWC HAL when not needed
2da2c15 Add GL Error logs (temporary)
9a14392 Ignore display state changes for disconnected displays
81cd5d3 make sure we don't call into the HWC HAL when not needed
eb1caae Fix crashes after HDMI disconnect
5031729 merge in jb-mr1-release history after reset to jb-mr1-dev
27ec573 Fix crashes after HDMI disconnect
078da14 Fix issue #7271589: Cannot set Ocean HD live wallpaper
a573945 libgui: enable fence support for exynos5
3fd12e4 libgui: fix up compile options
3538792 Merge "Fix issue #7271589: Cannot set Ocean HD live wallpaper" into jb-mr1-dev
7f3096c Fix issue #7271589: Cannot set Ocean HD live wallpaper
5ff5d16 merge in jb-mr1-release history after reset to jb-mr1-dev
ba607d5 Add Fence::waitForever which logs a warning timeout, and use it
0b08131 merge in jb-mr1-release history after reset to jb-mr1-dev
2ae7bec Revert "improve sensor fusion" -- DO NOT MERGE
0c2a25c Merge "Include Global table in bugreports." into jb-mr1-dev
719b8aa Include Global table in bugreports.
d30b36d SurfaceFlinger: reset the FB_TGT acquire fence
ec0f5e5 Merge "Fix issue #7257947: Need to fix heap limits on Mako" into jb-mr1-dev
988ae77 merge in jb-mr1-release history after reset to jb-mr1-dev
135e589 save/restore viewport properly when taking screenshot
c84e984 Fix issue #7257947: Need to fix heap limits on Mako
ed9af48 merge in jb-mr1-release history after reset to jb-mr1-dev
bae92d0 reset GL viewport and project when caputring the screen
c01a79d Pass display arg to blank/unblank
4c27327 Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
589e2e7 Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev
e8b0fac Re-enable FAST_TLS in gl2 code
7682a9c Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
88b0605 merge in jb-mr1-release history after reset to jb-mr1-dev
51af710 Revert "Compatibility work around for bad graphics driver dependency."
a4310c8 SurfaceFlinger: don't always set HWC_GEOM_CHGD
cb094a7 Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev
38b6572 Revert "Compatibility work around for bad graphics driver dependency."
f12fe43 New compile-time flags to make debugging easier for us poor souls Bug #7195815
6c729ef merge in jb-mr1-release history after reset to jb-mr1-dev
1e83690 Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
455e360 assert -eng builds when calling a GL function without a context
e206549 Merge "Recompute visible regions more vigorously" into jb-mr1-dev
ab10c58 Recompute visible regions more vigorously
a8026d2 Stop using transparent region for computing visible regions
08351c8 merge in jb-mr1-release history after reset to jb-mr1-dev
c4a8daa Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev
e272b25 only abort when errors happen on the main display
3234138 only abort when errors happen on the main display
722b98f add support for EGL_FRAMEBUFFER_TARGET_ANDROID
7b19051 fix a crasher when running out of memory
bb53b0e When "show visible regions" is enabled we were missing a call to HWC
f68c825 Merge "Show build config in dumpsys SurfaceFlinger" into jb-mr1-dev
ad90144 Merge "Configure GC free to be 8MB for devices with >512MB RAM." into jb-mr1-dev
4803b74 Show build config in dumpsys SurfaceFlinger
52d3d4d merge in jb-mr1-release history after reset to jb-mr1-dev
a046dd9 fix Layer croping in SurfaceFlinger
e96e9e1 fix a crasher in SurfaceTexture's setFilteringEnabled
13de369 Merge changes I47cd25c9,I7638ffe8 into jb-mr1-dev
2f45d74 Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
363847d Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
2a23184 don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
52e2148 handle EGL errors
500407a log an error when eglCreateContext() fails in an inconsistant way
3ff48e5 EGL: add the EGL_ANDROID_framebuffer_target enum
09b1143 EGL: expose the EXT_create_context_robustness ext
ff5c4aa Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
7aff4a5 ConsumerBase: make fence names meaningful
7fd6694 merge in jb-mr1-release history after reset to jb-mr1-dev
720501c Configure GC free to be 8MB for devices with >512MB RAM.
33baee5 Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
e958227 Add android.hardware.camera.any feature to camera permissions.
0615c8a merge in jb-mr1-release history after reset to jb-mr1-dev
9e2463e add/remove displays properly on hotplug events
ff28e20 Display events now always carry the display id they happened on
b4d18ed fix an issue where hotplug events were not dispatched
16cfa2e Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
e0606e2 Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
d1b330d SurfaceTexture: fix an out of bounds array write
aaf421c Add a spec for EGL_ANDROID_framebuffer_target.
ae18e61 merge in jb-mr1-release history after reset to jb-mr1-dev
4c0751a return an error, as expected, when querying a disconnected display
38e623b fix a typo preventing pre hwc-1.1 devices from booting
f5a3392 we now correctly set-up connected screens during boot
148994e We now report hotplug events to the framework
1604f77 one more step toward HDMI support
eba8c68 calculate wether we filter on a per-display basis
f33e4b6 GraphicBufferAlloc class was declared twice
70f93fb Merge "Disable the use of clock_gettime for now." into jb-mr1-dev
67b9de1 Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev
e8d09f8 merge in jb-mr1-release history after reset to jb-mr1-dev
1887af4 Merge "Allow 16-bit color EGLConfigs" into jb-mr1-dev
2a60824 am 516efc1b: am 8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
f21cffa Allow 16-bit color EGLConfigs
516efc1 am 8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
8a2b542 Merge "libagl: Transform the vertex if using eye space lighting with point lights"
3a24e8f Merge changes I561c198c,Id4865f3c into jb-mr1-dev
d56eff2 fix typo in DisplayDevice logs
971f7e9 Disable the use of clock_gettime for now.
dbaaa38 frameworks/native: Amend HDCP API
8e517cb merge in jb-mr1-release history after reset to jb-mr1-dev
787ac1b improve sensor battery usage tracking
5307d17 track UID with connections
3cdccc6 Merge "fix a typo in SensorService" into jb-mr1-dev
2398bc6 Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev
42223f6 gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
a5b8e8b fix a typo in SensorService
1d12d8a improve logging of external displays
ef27e9c Check that HWC exists before trying to use it
6ab9329 suppress superfluous log
aeb76d1 Merge "Check that HWC exists before trying to use it" into jb-mr1-dev
d3d35f1 Check that HWC exists before trying to use it
3941cb2 SurfaceTexture: default to doing GL sync
8dfa92f Plumb display name into SurfaceFlinger
336768a merge in jb-mr1-release history after reset to jb-mr1-dev
d870703 fix external displays
41cb1b5 Merge changes I53d70510,If34a05f3 into jb-mr1-dev
da27af9 add support hwc 1.1
f0f56f3 Merge "EGL: fix an extension string bug" into jb-mr1-dev
a08cf6e EGL: fix an extension string bug
cde87a3 refactor things a bit
c8cff90 Merge "Use a named constant rather than a magic number." into jb-mr1-dev
5f87b31 Use a named constant rather than a magic number.
86ca50d am e917bfbd: am 09a22fc2: Merge "Allow disable of dumpstate vibrate"
e917bfb am 09a22fc2: Merge "Allow disable of dumpstate vibrate"
09a22fc Merge "Allow disable of dumpstate vibrate"
1f794c4 Allow disable of dumpstate vibrate
eb1844f merge in jb-mr1-release history after reset to jb-mr1-dev
07e8134 Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev
8dc7c6e Print warnings when backwards timestamps are detected.
71f683a New test
6905205 Fix transform hints
d76dba4 merge in jb-mr1-release history after reset to jb-mr1-dev
6e220a6 Fix display projections when translated.
ae2cfb5 Minor tweaks
5eb434e merge in jb-mr1-release history after reset to jb-mr1-dev
a4383fd Merge "Initialize new HWC 1.2 fields" into jb-mr1-dev
fa32888 Merge "Fix display projection transforms" into jb-mr1-dev
a5be0cd Merge "don't call hwc with non-empty layer lists for blanked displays" into jb-mr1-dev
9ca6491 Region::validate() cannot be called from addRectUnchecked()
8df840a Merge "strengthen region validation" into jb-mr1-dev
ce3a0a5 don't call hwc with non-empty layer lists for blanked displays
068d47f strengthen region validation
e45b01f Merge "EGL: make max cache key size BoardConfig-able" into jb-mr1-dev
db27621 Initialize new HWC 1.2 fields
6360ec4 Fix display projection transforms
2c7c8ba Merge "Fix emulator" into jb-mr1-dev
c272430 Merge "Watch for SurfaceFlinger death" into jb-mr1-dev
babba18 Fix emulator
f478e6d EGL: make max cache key size BoardConfig-able
a0931d6 Merge "SurfaceTexture: eglDestroySync after duping its fd" into jb-mr1-dev
a77f0fe merge in jb-mr1-release history after reset to jb-mr1-dev
92def36 Merge "fix typo in LayerBase::dump()" into jb-mr1-dev
791da60 fix typo in LayerBase::dump()
43601a2 Reduce failure uncertainty
b0d1dd3 Reshuffle FramebufferSurface
4a94ea7 merge in jb-mr1-release history after reset to jb-mr1-dev
1fc4f80 Add stack dump from drmserver process to bugreports
98ff059 SurfaceTexture: eglDestroySync after duping its fd
61e04b9 SurfaceTexture: use eglWaitSync
98625e6 merge in jb-mr1-release history after reset to jb-mr1-dev
010dd4f EGL: Add the EGL_ANDROID_wait_sync extension
605f90d Merge "SurfaceTexture: use EGL-created native fences" into jb-mr1-dev
01dbf55 SurfaceTexture: use EGL-created native fences
ab75098 merge in jb-mr1-release history after reset to jb-mr1-dev
4c05dd1 Ensure that viewport and frame are initialized.
4fb3999 Fix display projection.
6652b3e Watch for SurfaceFlinger death
b272541 libgui: move fence handling into ConsumerBase
331841b EGL: add the native_fence_sync extension
911d485 merge in jb-mr1-release history after reset to jb-mr1-dev
8893d5b EGL_ANDROID_native_fence_sync: fix the version
02de802 Always reset layer acquireFenceFd after commit
2cf855f fix a problem where  all hwc layers would have the SKIP flags set
55882de fix a problem where  all hwc layers would have the SKIP flags set
fe4c745 Merge "Always reset layer acquireFenceFd after commit" into jb-mr1-dev
f42449e Merge "EGL_ANDROID_fence_sync: make it more generic" into jb-mr1-dev
e25d005 Always reset layer acquireFenceFd after commit
c3026f7 merge in jb-mr1-release history after reset to jb-mr1-dev
1501d54 minor cleanup
762d011 Merge "display projection API now has a single function instead of 3" into jb-mr1-dev
71e83e1 the visibleRegion was never set in hwcomposer
a1d49ce EGL_ANDROID_fence_sync: make it more generic
00e8c7a display projection API now has a single function instead of 3
da8d0a5 implement display viewport and frame
493db47 Merge "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev
e84ec39 Merge "libgui: add BufferQueue test infrastructure" into jb-mr1-dev
374850c Merge "libgui: disable CpuConsumer tests" into jb-mr1-dev
13e1257 Merge "Add support for "-rtl" in resources" into jb-mr1-dev
c68f2ec BufferQueue: add a setMaxAcquiredBufferCount check
6b09f28 Merge "Add timeout when waiting for HW vsync" into jb-mr1-dev
d56d8c3 merge in jb-mr1-release history after reset to jb-mr1-dev
63f165f add libsurfaceflinger_ddmconnection for PDK build
c397360 the visible region sent to HWC was garbage
50f262f minor SharedBuffer clean-up
2401ead Add a way to retrieve a Region as a SharedBuffer
3ab6855 change how we store Region data internally
4c0a170 don't generate a new Region when translating by 0,0
2098517 make sure Parcel handles 0-sized LightFlatenables
9e75ddd libgui: add BufferQueue test infrastructure
6bf552e Add timeout when waiting for HW vsync
fdb6b49 libgui: disable CpuConsumer tests
8210185 No longer need "original calling uid".
9ca4891 If there is no hwc, call eglSwapBuffers for the main display
f90883d Merge "HWC 1.1: hook up hotplug event, use new display config queries" into jb-mr1-dev
1bd20e0 HWC 1.1: hook up hotplug event, use new display config queries
4697528 SurfaceTexture: fix a few tests
d69097f libgui: add some error checks
5e5efde BufferQueue: add a check for the max acquired bufs
72f096f BufferQueue: use max acquired buffer count
1847f7f Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev
2b97769 Merge "BufferQueue: clean up buffer counting" into jb-mr1-dev
f196b56 Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev
ec34af4 Merge "Handle new device api version encoding" into jb-mr1-dev
94f2615 Revert "A vendor ril depends on a native screen shot code."
edf7ba4 merge in jb-mr1-release history after reset to jb-mr1-dev
93997a8 fix a crasher when setting a display to a null surface
6338654 we were sometimes not setting fences properly
c9ea4c8 Merge "we were sometimes not setting fences properly" into jb-mr1-dev
85d751c we were sometimes not setting fences properly
e191e6c BufferQueue: simplify max buffer count handling
31a353d BufferQueue: clean up buffer counting
c1396dd Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev
a8fc772 initial checkin of a preliminary HDCP API for vendors to implement.
9eb1eb5 Handle new device api version encoding
37a32cb merge in jb-mr1-release history after reset to jb-mr1-dev

   * frameworks/opt/calendar
a30f9f3 Merge commit '501c5d48' into manualmerge

   * frameworks/opt/mms
b43774a merge in jb-mr1-release history after reset to jb-mr1-dev
4c80e1a Crash trying to save a draft with a picture from the gallery
a3cd36c merge in jb-mr1-release history after reset to jb-mr1-dev
34d50cb Empty draft created on deleting a group MMS message
055ac95 merge in jb-mr1-release history after reset to jb-mr1-dev
e1f17ce MMS creates a new thread when receiver is not in the Message thread
2323424 merge in jb-mr1-release history after reset to jb-mr1-dev
2f87268 merge in jb-mr1-release history after reset to jb-mr1-dev
b259859 merge in jb-mr1-release history after reset to jb-mr1-dev
ab17014 Support group mms setting
5c9b0b2 merge in jb-mr1-release history after reset to jb-mr1-dev
23480fb Group MMS flickers between white square and received message when initially checking
a67e395 Optionally create threadid
0045f1c Unable to receive MMS on Mako
1ed1a26 Unable to receive MMS on Mako

   * frameworks/opt/photoviewer
76120ad Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/opt/photoviewer into 1.1
9c3046a Merge 'goog/jb-ub-now-carmello' into frameworks/opt/photoviewer
dccd6d9 Support data URIs in photoviewer.
535ffb1 Need one more initLoader in a runnable.
fc3a6f4 call initLoader in a runnable
bf77f3b Make some static members protected
934bd9e Make some members protected
399fe3d Remove PhotoViewFragment's dependency on PhotoViewActivity
8746927 Make PhotoViewer use the support library
cb5b7f2 Merge "Fix scale popping by disabling zoom on thumbnails"
3102e82 Remove unused imports and variables
edad0e0 Fix scale popping by disabling zoom on thumbnails
599730c Rename module names to avoid name conflicts.
7aabd79 Temporary fix for image viewer crash
dccfbd0 am c930ef0a: (-s ours) Reconcile with jb-mr1-release - do not merge
c21368d Reconcile with jb-mr1-release - do not merge
67ab89d merge in jb-mr1-release history after reset to jb-mr1-dev
237ded1 resolved conflicts for merge of b3f0f056 to master
5d3e0bf am 3a539a30: am 5211e468: Add Exif parser
a7c92fe am 5211e468: Add Exif parser
9323b13 Add Exif parser
a4c0ad0 am e5913938: (-s ours) Reconcile with jb-mr1-release - do not merge
f8b2fd3 Reconcile with jb-mr1-release - do not merge
e27b930 merge in jb-mr1-release history after reset to jb-mr1-dev
4131853 am 29c041a3: am 88d18b9f: am 4054bd6d: Use gesture detector from support lib
5e41710 am 88d18b9f: am 4054bd6d: Use gesture detector from support lib
f9005aa am 4054bd6d: Use gesture detector from support lib
bdf13fd Use gesture detector from support lib
2aadb54 Merge "Add option to permenantly show ProgressBar"
0c689c4 am b060fe28: (-s ours) Reconcile with jb-mr1-release - do not merge
8c541b1 Reconcile with jb-mr1-release - do not merge
075e093 am 05783789: am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.
dc21244 merge in jb-mr1-release history after reset to jb-mr1-dev
e38232b am da78c1dc: am c907eecd: Prevent NPE while viewing photo from attachment.
ae78bbd Add option to permenantly show ProgressBar
2795f43 Merge "Cursor listeners can use setPhotoIndex meaningfully"
d00f71f am c907eecd: Prevent NPE while viewing photo from attachment.
85b33b3 Merge "Specify minimum SDK version of 11 in the manifest"
5a7cb43 merge in jb-mr1-release history after reset to jb-mr1-dev
b9c1770 Specify minimum SDK version of 11 in the manifest
4a6a718 Cursor listeners can use setPhotoIndex meaningfully
2539f2e Prevent NPE while viewing photo from attachment.
da471e7 am dd2a57c4: am d9904217: am bd64181d: Integrate copy of GestureDetector into photoviewer
d423d51 am d9904217: am bd64181d: Integrate copy of GestureDetector into photoviewer
f49be32 am bd64181d: Integrate copy of GestureDetector into photoviewer
e411d8e merge in jb-mr1-release history after reset to jb-mr1-dev
190f6bd Integrate copy of GestureDetector into photoviewer
524ac65 am 34672da4: am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attachment
8cf57a5 am 4030071b: am 697c046e: Prevent NPE in Gmail while viewing photo from attachment
951d392 am 697c046e: Prevent NPE in Gmail while viewing photo from attachment
c4d9382 Prevent NPE in Gmail while viewing photo from attachment
1389ae2 Do not show loading bar after thumbnail has loaded
86531b6 am c2533e15: (-s ours) Reconcile with jb-mr1-release - do not merge
3b16fb6 Merge "Make setLightsOutMode protected"
b462d1b Fix double-tap to restore from fullscreen
c9faf6d Reconcile with jb-mr1-release - do not merge
7e69956 Make setLightsOutMode protected
0ab3e0c Scope changes and removal of unnessecary variable
91dbfd2 Add parameter for max initial scale factor
88bdea6 merge in jb-mr1-release history after reset to jb-mr1-dev
d4a7a6c am 7d920938: am 45faaf4d: am 2b4059cd: Allow action bar to be updated
b5c6556 am 45faaf4d: am 2b4059cd: Allow action bar to be updated
4092bb3 am 2b4059cd: Allow action bar to be updated
2989cf0 Allow action bar to be updated
f24e709 resolved conflicts for merge of f688fc95 to master
c95453f am da79838d: am a7e22413: Fix NullPointerException when tapping attachment.
aa3243b am a7e22413: Fix NullPointerException when tapping attachment.
0f7d150 Fix NullPointerException when tapping attachment.
ea14641 merge in jb-mr1-release history after reset to jb-mr1-dev
11661de am 97992e59: am c645df0a: am 4f38cc16: Attachment image viewer should not scale images larger than original size.
4c2cd7a am c645df0a: am 4f38cc16: Attachment image viewer should not scale images larger than original size.
9e6c34d am 4f38cc16: Attachment image viewer should not scale images larger than original size.
3a14814 Attachment image viewer should not scale images larger than original size.
43ca587 merge in jb-mr1-release history after reset to jb-mr1-dev

   * frameworks/opt/telephony
da0db0b HTCQualcommRIL: fix data drops when switching state
f0e75f8 Merge "Introduce HTCCDMAQualcommRIL for HTC CDMA devices" into cm-10.1
0ae5729 Merge "Properly notify of precise call state change after connection hangup." into cm-10.1
7fd8d66 Introduce HTCCDMAQualcommRIL for HTC CDMA devices
332fb18 Properly notify of precise call state change after connection hangup.
23bd607 SamsungQualcommRIL: fix NPE
a0ca848 Samsungqualcommril: fix parser
9b879a1 Merge "Revert "SamsungQualcommRIL: always convert hex to int."" into cm-10.1
94987a5 Revert "SamsungQualcommRIL: always convert hex to int."
61aa925 Fix NRE on sending multipart texts.
7b04982 SamsungQualcommRIL: Add Operators class
082b5bc Fix RIL_UNSOL_CDMA_PRL_CHANGED constant typo (2/2)
0797705 SamsungQualcommRIL: fix HD voice
b8df474 SamsungQualcommRIL: add more carrier numbers
1c37d0a SamsungQualcommRIL: fix showing gsm operator numbers.
ef61f36 SamsungQualcommRIL: always convert hex to int.
6a8675a Merge "SamsungQualcommRIL: fix passing isgsm flag" into cm-10.1
ae78785 SamsungQualcommRIL: fix passing isgsm flag
cd143d0 SMS Broadcast result receiver fix: Fix bug where sentIntents is pulled from the wrong bundle key.
b20f4c9 Merge "Refactor SMS Middleware and SMS Send path." into cm-10.1
6cc153e Merge "Revert "PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM"" into cm-10.1
47712d0 Revert "PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM"
af06916 Refactor SMS Middleware and SMS Send path.
b7abe4e Merge "Store phone blacklist in content provider (1/4)" into cm-10.1
af90c1e Merge "CallTracker: Add additional check for pendingMO to verify that a dial is happening and we are expecting a call to appear when repeated polling of GET_CURRENT_CALLS." into cm-10.1
f5114b4 Merge "Revert "CallTracker: Add delay to reduce cpu load"" into cm-10.1
3be9b07 Merge "PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM" into cm-10.1
8595cc4 SamsungExynos4RIL: cleanup for use with opensource libril
2934e19 Store phone blacklist in content provider (1/4)
abae5e7 CallTracker: Add additional check for pendingMO to verify that a dial is happening and we are expecting a call to appear when repeated polling of GET_CURRENT_CALLS.
11e0766 Revert "CallTracker: Add delay to reduce cpu load"
57f67b4 CallTracker: Add delay to reduce cpu load
5e0983b PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM
06dcba0 CallTracker: Add back-off and retry toggle to getCurrentCalls
3dba658 Add SMS Middleware layer.
769f93c SamsungQualcommRIL: support google play edition blobs
2d29503 Merge "HTCQualcommRIL: optionally ignore IccCard states greater than 2" into cm-10.1
c4cfa94 HTCQualcommRIL: handle more unsolicited states
0c5a4d9 HTCQualcommRIL: optionally ignore IccCard states greater than 2
5d2cd80 SamsungQualcommRIL: support exynos RIL radio states.
aee7b82 SamsungQualcommRIL: fix errors and replaces it with known values
a8dd7a0 HTCQualcommRIL: clean up unused functions and responses
61406f1 SamsungQualcommRIL: evaluate samsungDriverCall in responseCallList()
fdddaed SamsungQualcommRIL: fix race condition when starting phone type.
cbe7c3f SamsungQualcommRIL: use the advantage of static type.
72ec18b Merge "ril: Add Samsung-specific unsolicited commands" into cm-10.1
df7c34d ril: Add Samsung-specific unsolicited commands
3b838b6 SamsungQualcommRIL: fix logic order
873f5a8 SamsungQcomRIL: New class and get rid of old and outdated codes
8f5a380 Merge "Fix a typo bug." into cm-10.1
a10af6b Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch" into cm-10.1
c38bc05 Fix a typo bug.
06519f3 RIL: Correct the RIL_REQUEST_DIAL api missmatch
757cd69 frameworks telephony - add DCHSPAP value
4bacfdf HTCQualcommRIL: re-add force LTE modes
f93cdea HTCQualcommRIL: remove unused responseIccCardStatus function
1196b35 Revert "libril: HTC8960RIL: add flag to force CDMA+LTE network mode"
fad8882 HTCQualcommRIL: allow skipping of initial radio power off message
e17912c HTCQualcommRIL: adaptable signal strength format
492c365 HTCQualcommRIL: squashed set of updates
c70b94e telephony: Remove SamsungQualcommD2RIL
6f8007b SamsungQualcommUiccRIL: fix responseCallList for v7 RIL
1b90606 Revert "RIL.java - add DCHSPAP"
bfdfa12 RIL.java - add DCHSPAP
eacffc5 Allow disabling radio with property persist.ril.enable.
e243626 RIL: Add compatibility with qcom's DSDS
aeacbb9 RIL: Add SEMC 7x30 RIL
5448115 Merge "telephony: add SamsungQualcommM3RIL for samsung m3 devices" into cm-10.1
f0ddc6a PhoneProxy: fix key.length > 31 characters
97cabb4 PhoneProxy: Add a prop to enable always creating of CDMALTEPhone
a34c63e Revert "PhoneProxy: On v6 or greater RIL, when LTE_ON_CDMA is TRUE,"
ad45859 Merge "QualcommSharedRIL: allow skipping pin/puk count" into cm-10.1
49db539 Merge "telephony: Support for Virgin Mobile MMS" into cm-10.1
1e7f0df QualcommSharedRIL: allow skipping pin/puk count
95dbfaf Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/opt/telephony into 1.1
4792c9f telephony: add SamsungQualcommM3RIL for samsung m3 devices
91c9151 Merge "Update the SMS sending limit instantly (1/2)" into cm-10.1
bca8506 Qualcomm LTE RILs: do not make mLteRsrp negative
785f7a2 SamsungExynos4RIL: fix emergency dialing
61ce07c Update the SMS sending limit instantly (1/2)
bc36886 LGEQualcommUiccRIL: New subclass to deal with the latest qcom RIL
417458b telephony: Support for Virgin Mobile MMS
5343f09 PhoneProxy: On v6 or greater RIL, when LTE_ON_CDMA is TRUE,
b929c2c Telephony: Correct the typo in RIL.java
f428be2 Reset data stall watch dog after doing recovery
cc96289 Merge "SamsungExynos3RIL: fix unable to swtich 2G/3G while connected to wifi" into cm-10.1
fa2c24a SamsungExynos4RIL: provide a fallback solution if signalstrength is invalid
db8816c SamsungExynos3RIL: fix unable to swtich 2G/3G while connected to wifi
75d2663 SamsungExynos4RIL: Allow signal strength to be handled for GB modems
ba6e312 Merge "SamsungExynos4RIL: fix signal strength" into cm-10.1
663424d Merge "Fix restoring network mode preference on reboot" into cm-10.1
430d47e Mms auto-retrieval (2/3): framework
3e69213 Merge "Telephony: Unregister from UiccController when disposed" into cm-10.1
b733419 Merge "Telephony: Start DataStallAlarm only on Data CONNECTED state" into cm-10.1
4514f3f CatService: Alpha ID fix for OPEN_CHANNEL and other p-commands (2/2)
7cc1db8 SamsungExynos4RIL: fix signal strength
b925be8 Merge "SamsungExynos3RIL: don't send IccStatus notification on CDMA devices" into cm-10.1
f657c25 SamsungExynos3RIL: don't send IccStatus notification on CDMA devices
d44895a Fix restoring network mode preference on reboot
3be8945 Make ringing audio focus handling work with 'Speed up audio on MT call' flag enabled.
e670d6e Telephony: Unregister from UiccController when disposed
e7fb25c Telephony: Start DataStallAlarm only on Data CONNECTED state
ead9e62 Merge "SMSDispatcher: Add option for sending pseudo-multipart SMSes" into cm-10.1
0e4a524 telephony: set additional audio parameters for incall audio (2/2)
2d562bd SMSDispatcher: Add option for sending pseudo-multipart SMSes
00bd78d Some changes added to compile and run with Java 6 and Java 7.
aa6c52e d2ril: change readint offset of one
d698e8a SamsungCDMAQualcommRIL: add icc handler to run when radio on
5fa827c Fixed FC on calling unregisterReceiver with non registered receiver arg.
dac9376 Merge "telephony: CdmaServiceStateTracker: Get cdma sub. when ruim ready." into cm-10.1
60a7d2e Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/opt/telephony into aosp
b09b929 Fix ringing audio focus handling.
c08256a Set audio mode after accepting the call
63bfa73 telephony: CdmaServiceStateTracker: Get cdma sub. when ruim ready.
04c728a Allow registering for supplementary service notifications.
2c3b1a8 Add notification type constants.
e17a7f9 SamsungQualcommCDMARIL : fix cdma/lte signal strength implimentation
844111f CdmaLteServiceStateTracker: simultaneous voice and data support on CDMA (e.g: SVDO)
065dd13 SamsungQcomCDMARIL: Add support for SIM.
1fd6a63 Telephony: Forward port National data roaming and make it optional (1/2)
243830f Merge "Prevent NPE on some CDMA devices" into mr1-staging
f08c4c8 Turn auto attach on/off when we attach/detach.
6cbccb7 RIL: add HTC radio state and RIL class
2210f6e Prevent NPE on some CDMA devices
2730d39 Merge "Samsung STK: Fix SMS-based STK" into mr1-staging
844bb01 Samsung STK: Fix SMS-based STK
f2a22db Set audio mode after accepting the call
fc45f27 patch responseSignalStrength
cc5c0e9 Merge "	RIL for Samsung v6 RIL CDMA devices, based on SamsungRIL." into mr1-staging
0ed7210 core and telephony: Additional HSPAP support
db939b0 Samsung STK: Add USSD support
e7111f6 Add Samsung STK support (telephony part)
e15ecd0 Merge "SamsungExynos3RIL: buffer CAT Proactive Command" into mr1-staging
424c865 fix for Samsung CDMA incoming SMS bug
0070001 Merge "Telephony: Add getLteOnGsmMode() method (2/2)" into mr1-staging
9ed3196 Telephony: Add getLteOnGsmMode() method (2/2)
3e02868 simcard: With Kazakh Beeline SIM card, there isn't STK menu
ca3962c telefony: Custom RIL for Sony 8x60 baseband
859f7a9 Assume LTE location info is base 10 but allow 16 or 8.
d34549b RIL: Add SamsungCDMAQualcommRIL
205a901 telephony: Add custom QC RILs from CM10
5ff7389 SamsungExynos3RIL: buffer CAT Proactive Command
dc4e9df SamsungExynos4RIL: fixup radio states, notify on PIN-unlock
16c247d Merge changes I8833fe3e,I546c939f,I11fff596 into mr1-staging
e7fd4f7 Raise threshold for detecting excessive SMS usage.
29f045b 	RIL for Samsung v6 RIL CDMA devices, based on SamsungRIL.
550448d SamsungExynos4RIL: set number of elements returned from QAN response
241652a RIL: Underp DataCall
e75478d Merge changes I06ee05b5,I2eb23ab5 into mr1-staging
8c14bef Telephony: Support for LTE network modes
f822c02 Telephony: Look for CSS indicator for voice+data
f478f43 Initialize RIL with the correct CDMA subscription mode setting
9824462 Allow a device to include its own RIL subclass
301196a telephony: add SamsungExynos3RIL
6db524c RIL: squashed support for old RIL
a59c406 telephony: add SamsungExynos4RIL class
8d0f918 telephony: Reintroduce the old ICS RadioStates
dba8c39 telephony: Use reflection to create command interface (RIL class)
c8c9af0 RIL: Make RIL subclassable
d48f14f Reconcile with jb-mr1-release - do not merge
b211e83 merge in jb-mr1-release history after reset to jb-mr1-dev
6af3665 am 2bc7f2e1: Use proper check for spn for operator name display
2bc7f2e Use proper check for spn for operator name display
bcf5c6f Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
f1feffe merge in jb-mr1-release history after reset to jb-mr1-dev
44be3fc Telephony: Distinguish GSM vs ETWS bc by message id
060a623 merge in jb-mr1-release history after reset to jb-mr1-dev
708cb89 Allowing to change the poll state even if only PS is avairable on the network.
de0835f merge in jb-mr1-release history after reset to jb-mr1-dev
a2985af Validate call forwarding indicator status from SIM.
01ffdac merge in jb-mr1-release history after reset to jb-mr1-dev
5aa2282 When retrying disassociate an ApnContext from a DC only when failed or idle.
20659cc Retry connections that are in SCANNING.
e4444b4 merge in jb-mr1-release history after reset to jb-mr1-dev
27814a2 When retrying disassociate an ApnContext from a DC only when failed or idle.
6da2708 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ab34080 merge in jb-mr1-release history after reset to jb-mr1-dev
f7a8133 Handle no IccRecords in updateSpnDisplay differently.
9a8ca5e merge in jb-mr1-release history after reset to jb-mr1-dev
175442f Revert "Revert "Act on no-prefered-apn-on-connect config option.""
7fbee78 Revert "Act on no-prefered-apn-on-connect config option."
859e774 Revert "Act on no-prefered-apn-on-connect config option."
62bb795 Act on no-prefered-apn-on-connect config option.
79ba052 merge in jb-mr1-release history after reset to jb-mr1-dev
3ff47ff Act on no-prefered-apn-on-connect config option.
682428c Merge "Fake sim status changed appropriately" into jb-mr1-dev
f860a3f Fake sim status changed appropriately
205e3cb Merge "Change the dir used for the sms policy." into jb-mr1-dev
58c8356 Change the dir used for the sms policy.
be3dc4b Fix 7255789
d070d1c Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev
ac1e58b Merge "Fix issue #7274813: A few sticky broadcasts aren't being sent to all users" into jb-mr1-dev
10270d2 Fix bug in subsequent premium-sms detections.
7eff443 Fix issue #7274813: A few sticky broadcasts aren't being sent to all users
78e1a45 Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev
6ce6af4 Migrate telephony settings to Global.
81ddb88 fallback to res-based premium-sms detection info
f5aea70 Merge "Fix the premium-SMS UI." into jb-mr1-dev
a770079 Use a gservices provided file for premium-sms data
04160ae Merge "Update references to migrated global settings." into jb-mr1-dev
b8d0e59 Update references to migrated global settings.
78df2f4 Fix the premium-SMS UI.
c90b7d2 Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)
f4bfdd2 Merge "Handle mmi dialing number ending with #." into jb-mr1-dev
9225578 Handle mmi dialing number ending with #.
1b5c213 Merge "Make updateSpnDisplay cover out various scenarios." into jb-mr1-dev
60e7f68 Make updateSpnDisplay cover out various scenarios.
ee7b609 Add gservices-controllable rules policy.
5d87579 Fix string in sms_short_code confirm dialog.
167a784 am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"
ed6a91f am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"
7b5e41b am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"
54cadb7 Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"
ba06d1b Telephony: Fix npe in IccPhoneBookInterfaceManager
4a6e52f am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"
3895332 am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"
5d9a7e4 am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"
f667af2 Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"
f48d70f Telephony: Add null pointer checks in UiccCardApplicaton.update
4658a1a Add support for per-package policy for sending premium SMS.
a72f945 Merge "Use the same logic in isDataPossible as GSM." into jb-mr1-dev
aa81054 am f5082fd1: am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"
f5082fd am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"
38a7ed0 am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"
4a84405 Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"
22e3d13 Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
7159244 Merge "Add event logging for SMS" into jb-mr1-dev
2029d86 Add event logging for SMS
f022aff am 29b5d8e4: resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
abd5973 Use the same logic in isDataPossible as GSM.
29b5d8e resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
b840987 Use Settings.Global instead of Settings.Secure in a few places.
e08bcc9 am f8a1f90c: am 511d4b68: am 713a658e: Merge "Telephony: Log parameters for facility lock operations."
f8a1f90 am 511d4b68: am 713a658e: Merge "Telephony: Log parameters for facility lock operations."
511d4b6 am 713a658e: Merge "Telephony: Log parameters for facility lock operations."
713a658 Merge "Telephony: Log parameters for facility lock operations."
88e9c97 Telephony: Log parameters for facility lock operations.
565013a Merge commit '599f207f' into fix-merge-conflict
599f207 am db1b0c54: am 1d40e34c: Merge "Telephony: Remove CdmaLteUicc objects"
db1b0c5 am 1d40e34c: Merge "Telephony: Remove CdmaLteUicc objects"
1d40e34 Merge "Telephony: Remove CdmaLteUicc objects"
7a299a4 Fix build
e287fea Telephony: Remove CdmaLteUicc objects
2f81ec6 am 3d5e9bd1: am 8566fabf: am e9260aec: Merge "Omitting Big Endian caused corrupt characters"
3d5e9bd am 8566fabf: am e9260aec: Merge "Omitting Big Endian caused corrupt characters"
8566fab am e9260aec: Merge "Omitting Big Endian caused corrupt characters"
e9260ae Merge "Omitting Big Endian caused corrupt characters"
9f1860d Omitting Big Endian caused corrupt characters
dec905e am b66683d8: am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"
b66683d am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"
5af6cdd am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"
7ac8d80 Merge "Telephony: Fixed problem with short operator name"
b142fa0 am ad10642b: am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"
ad10642 am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"
380be4a am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"
6fe2a8a Merge "Handle the case when TP-PI reserved bits are set"
56c949d Handle the case when TP-PI reserved bits are set
9386a53 Telephony: Fixed problem with short operator name
dfc287a am ea36fc2a: am 08a57a4c: am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."
ea36fc2 am 08a57a4c: am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."
08a57a4 am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."
5b7a88e Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."
b2deb7e Fix CDMA decoding of multipart UTF-16 SMS messages.
ac1701b am 115632cc: Fix CDMA decoding of multipart UTF-16 SMS messages.
115632c Fix CDMA decoding of multipart UTF-16 SMS messages.
7f7d82a am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"
50b1206 am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"
cc0e545 Merge "WspTypeDecoder: fixed decoding of content parameters"
cbbf6de Update to send sticky broadcasts to all users.
0fcf209 WspTypeDecoder: fixed decoding of content parameters

   * frameworks/opt/vcard
3f05cb6 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/opt/vcard into 1.1
8370926 Allow clients to use alternative name ordering.
7a2ac04 Store encoding in upper case.
8aa2ab8 Allow importer to handle missing encoding attribute for FN.
d5a731f Fix missing encoding attribute on FN field.

   * frameworks/rs
452bb34 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/rs into 1.1
9e01066 YUV(NV21) to RGBA function NEON optimizations.
36f07d8 Fix kernel bounds for ColorMatrix intrinsic.
c4b6b3a Fix kernel launch clipping.
fb6dfa6 Remove hard coded limit on intrinsic blur buffer size.
8575a2b Fix convolve3x3 off-by-one error.
cef5fe9 Fix single-CPU/thread case.
3ea5b9c Fix performance when reading or writing large buffers.
c5b34c6 Thread launch latency improvements.
99a2df7 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
f5cf4a5 merge in jb-mr1-release history after reset to jb-mr1-dev
f598811 Fix use of rs_script_call_t.
0da5d71 merge in jb-mr1-release history after reset to jb-mr1-dev
78b050e Fix bugs in scriptGroup.
8832b50 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
b7d506d merge in jb-mr1-release history after reset to jb-mr1-dev
15ff402 Fix potential null dereference in RS SG
826b9c0 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
4e8d848 merge in jb-mr1-release history after reset to jb-mr1-dev
b801b94 Check for invalid configuration for Intrinsics.
bd726b2 Fix bug in script groups.
a68fd56 merge in jb-mr1-release history after reset to jb-mr1-dev
a32de2d Merge "Add "debug.rs.default-CPU-driver" property for RS driver." into jb-mr1-dev
c83dd0b Add "debug.rs.default-CPU-driver" property for RS driver.
e78c14b Ensure that the cache directory exists before calling compiler.
06e1372 merge in jb-mr1-release history after reset to jb-mr1-dev
fa17cda Implement fast version of blend intrinsics.
36889a0 Implementations of various blend intrinsics.
882652a merge in jb-mr1-release history after reset to jb-mr1-dev
64591a0 merge in jb-mr1-release history after reset to jb-mr1-dev
7c355cc Implement optimized kernel kickoff for T30
9c7d4c4 Implement FS compatible getElementAt_*
d0ff6c0 merge in jb-mr1-release history after reset to jb-mr1-dev
cf9ea9f Implement backend of blend intrinsic
4651f5f Merge "Performance fix for Intrinsic 5x5 convolve." into jb-mr1-dev
a1b08e2 Performance fix for Intrinsic 5x5 convolve.
6112638 merge in jb-mr1-release history after reset to jb-mr1-dev
ded7afc Merge "yuv performance opts." into jb-mr1-dev
915aa96 yuv performance opts.
4550a67 merge in jb-mr1-release history after reset to jb-mr1-dev
08695a9 Mark getAllocation as deprecated.
ab4b0ef Fix approx function naming. bug 7205089
5cfb8da merge in jb-mr1-release history after reset to jb-mr1-dev
2207ab7 bug 7190126 FS intrinsic perf work. Fix correctness issue with convolve 3x3.
74310fa merge in jb-mr1-release history after reset to jb-mr1-dev
e78e514 Fix blur intrinsic performance. bug 7190126
eca8760 Checkin optimized Convolve3x3 with input from ARM.
01f03a0 Implement YUV intrinsic. bug 7190126
f2f9361 merge in jb-mr1-release history after reset to jb-mr1-dev
ba808d7 Fix intrinsic threading.
dbe66d6 Add backed for script groups.
f7f83fe merge in jb-mr1-release history after reset to jb-mr1-dev
3d5a9be Remove circular dependency.
ad81975 merge in jb-mr1-release history after reset to jb-mr1-dev
d85e283 Implement intrinsics.
9151950 Merge "Provide an easy way to drop in a different RS driver." into jb-mr1-dev
31da039 am 5359ef67: am 2f6d7e5a: Merge "Fix symbol table for libRS MatrixTranspose"
5359ef6 am 2f6d7e5a: Merge "Fix symbol table for libRS MatrixTranspose"
2f6d7e5 Merge "Fix symbol table for libRS MatrixTranspose"
c84b56e Fix symbol table for libRS MatrixTranspose
0e953aa merge in jb-mr1-release history after reset to jb-mr1-dev
91dfcdb Provide an easy way to drop in a different RS driver.
2085eb0 Merge "Fix bugs in optimized colorMatrix." into jb-mr1-dev
40945e0 Fix bugs in optimized colorMatrix.
414a461 Attempt to create libRSDriver as shared library.
17de8e2 am 0687cec6: am cb341688: Merge "Correctly align mSendBuffer to contain doubles."
0687cec am cb341688: Merge "Correctly align mSendBuffer to contain doubles."
cb34168 Merge "Correctly align mSendBuffer to contain doubles."
a05e8dd Correctly align mSendBuffer to contain doubles.
78ec069 merge in jb-mr1-release history after reset to jb-mr1-dev
3a8b9c7 merge in jb-mr1-release history after reset to jb-mr1-dev
537c441 Implement ColorMatrix intrinsic.
e1e08b4 Continue intrinsic development
6d958bc Revert "Fix intrinsic performance."
49202fb Fix intrinsic performance.
820c466 merge in jb-mr1-release history after reset to jb-mr1-dev
6146238 Cache element type in allocation hal.

   * frameworks/support
5ec7a8e Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/support into 1.1
0bb301e Remove cruft from ViewPager
d267c93 Fix a bug that could cause ViewPager to select the wrong page
16991ca Tweak ViewPager behavior for more DWIM goodness
7124941 Fix build.
ab85436 Merge "SDK only: improve SearchViewCompat" into jb-mr1.1-dev
44e3a52 SDK only: improve SearchViewCompat
81ba406 am 82956802: LOCAL_SDK_VERSION=17 for android-support-v4-jellybean-mr1
8295680 LOCAL_SDK_VERSION=17 for android-support-v4-jellybean-mr1
37a7c5d Fix use of removeView() during layout
6cdc4f5 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/support into HEAD
0675f15 am ad651749: am b6ede974: am 884c97b0: Javadoc: API level support for NotificationCompat
ad65174 am b6ede974: am 884c97b0: Javadoc: API level support for NotificationCompat
b6ede97 am 884c97b0: Javadoc: API level support for NotificationCompat
ffa91c3 Reconcile with jb-mr1-release - do not merge
f0e22f9 merge in jb-mr1-release history after reset to jb-mr1-dev
c6e1bcb am 215e3168: Updating the support library to user SDK version integer.
215e316 Updating the support library to user SDK version integer.
48cc6fc Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
884c97b Javadoc: API level support for NotificationCompat
f31d1db DO NOT MERGE Fix bug #7297028 Settings app crash when swiping between Downloaded / Running / All for Apps
f5a1fdd merge in jb-mr1-release history after reset to jb-mr1-dev
126c190 Remove unused dreams support libary (again) bug: 7376063 dependency cls: I51c6a730e8663586153750a1cda6ea65aad592e8 I87370e8dc7f3159182dac9f650223ce010d6286b
3fd01c6 Revert "Remove unused dreams support libary"
d842d04 Remove unused dreams support libary
51d7e03 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
9a9e75b merge in jb-mr1-release history after reset to jb-mr1-dev
8cfc154 Merge "FS Support library update." into jb-mr1-dev
9c10dc7 merge in jb-mr1-release history after reset to jb-mr1-dev
3044b9c DO NOT MERGE - Hide SlidingPaneLayout
af295ff merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ca29b8c FS Support library update.
56abcd6 merge in jb-mr1-release history after reset to jb-mr1-dev
661eaf5 Properly respect padding when drawing PagerTabStrip's underline.
89eac42 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
a407b81 merge in jb-mr1-release history after reset to jb-mr1-dev
71d5473 Fix bug #7297028 Settings app crash when swiping between Downloaded / Running / All for Apps
091a72a merge in jb-mr1-release history after reset to jb-mr1-dev
a862399 Fix for bug 7000638: ISE crash in Gmail.
2f4b91c merge in jb-mr1-release history after reset to jb-mr1-dev
4ccc001 Maybe fix issue #7132432: com.android.vending: java.lang.IllegalStateException...
faf0f6a merge in jb-mr1-release history after reset to jb-mr1-dev
3a75710 Work on issue #7232641: ISE crash when rotating phone in label list mode
4c016bd merge in jb-mr1-release history after reset to jb-mr1-dev
5ee9c1d Merge "Fix how fragment/tab interaction works to avoid list view state loss." into jb-mr1-dev
74c671b Fix how fragment/tab interaction works to avoid list view state loss.
0c2c696 Merge "Set thread priority to background in Volley." into jb-mr1-dev
98b742c Set thread priority to background in Volley.
735aea3 merge in jb-mr1-release history after reset to jb-mr1-dev
e68f24c Refactoring in ViewPager for more descriptive names
bea2fc7 Supply the full set of make* methods in IntentCompat
fba8c1b Merge "DO NOT MERGE: Delete appcompat dirctory" into jb-mr1-dev
f19cb1f Port TaskStackBuilder fixes and features from frameworks/base
0af001b This is revert of a reverted patch to wait for some build system changes.
636b46a Merge "Revert "This is revert of a reverted patch to wait for some build system changes."" into jb-mr1-dev
96c8829 Revert "This is revert of a reverted patch to wait for some build system changes."
a0390c9 Merge "This is revert of a reverted patch to wait for some build system changes." into jb-mr1-dev
86fe2b9 Track which PagerAdapter a PagerTitleStrip is watching
f959f51 This is revert of a reverted patch to wait for some build system changes.
5d6251c Track which PagerAdapter a PagerTitleStrip is watching
c1c799c Merge "Add GestureDetectorCompat" into jb-mr1-dev
6ada6e4 DO NOT MERGE: Delete appcompat dirctory
1ce805e Add GestureDetectorCompat
d708885 The build system already includes AndroidConfig.h for all native code.
f0ff808 Merge "Do not upscale images in Volley library." into jb-mr1-dev
b047962 Adds new AccessibilityEvent types to the support lib.
c21893e Do not upscale images in Volley library.
64f4935 Handle "windup" motion in ViewPager
83df688 Temporary revert until unbunded builds are configured porperly to either use a prebuilt of the framework and the support lib or none.
7cf0b33 Compatibility support for new accessibility APIs in View.
0adacc1 Nested fragments.
84ff882 Merge "ActionBarCompat: Remove non-implemented APIs from ActionMenuView.java" into jb-mr1-dev
4c2b604 Merge "ActionBarCompat: Remove non-implemented API calls" into jb-mr1-dev
c6feef1 ActionBarCompat: Remove non-implemented API calls
fd2f3fc Merge "ActionBarCompat: Remove API calls not present on SDK 7" into jb-mr1-dev
d9e663b Merge "ActionBarCompat: Remove non-implemented APIs in BaseMenuPresenter" into jb-mr1-dev
d5327b7 Merge "ActionBarCompat: Fix imports for ActionMenuItem" into jb-mr1-dev
d173527 Merge "ActionBarCompat: Removed Animation references and MATCH_PARENT" into jb-mr1-dev
42cd6ed Remove bcinfo dependency from libRSSupport.
2635788 am be5b75c3: am 080df8ff: Use correct version code for ICS, and update doc strings.
be5b75c am 080df8ff: Use correct version code for ICS, and update doc strings.

   * frameworks/testing
e404ad7 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/testing into 1.1
c23cd41 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
506016a Merge "Make debug logging configurable via the logging setprop properties." into jb-mr1.1-dev
bc9f391 Make debug logging configurable via the logging setprop properties.
c0314db merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
73cb2d0 Merge "Added simplified output to UiAutomator tests." into jb-mr1.1-dev
d053117 Added simplified output to UiAutomator tests.
bc81b38 Added support for dynamic test discovery.
e5697cc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3d3e43b am 720f95b6: am b64737f2: (-s ours) am b00e7012: DO NOT MERGE: Add proper @hide\'s for mismatched released APIs
720f95b am b64737f2: (-s ours) am b00e7012: DO NOT MERGE: Add proper @hide\'s for mismatched released APIs
54a98f5 am 43261fa6: updates to released API level 16 method list
b64737f am b00e7012: DO NOT MERGE: Add proper @hide\'s for mismatched released APIs
43261fa updates to released API level 16 method list
b00e701 DO NOT MERGE: Add proper @hide's for mismatched released APIs
15dad8b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f406deb Added tracing of UiAutomator calls.
d785e9a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1893cae Fixes lint errors in ui automator.
9ad052d Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/testing into HEAD
bba96f6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
891e95d Support apicheck for uiautomator.
4d47c84 am 79693ede: fix API Level annotations, add pre-req for api change detection
f403dee merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
79693ed fix API Level annotations, add pre-req for api change detection
7b66383 Reconcile with jb-mr1-release - do not merge
7565d33 am dbba7136: more Java doc tweaks
dbba713 more Java doc tweaks
853b460 merge in jb-mr1-release history after reset to jb-mr1-dev
1ff527a Reconcile with jb-mr1-release - do not merge
f43fa1f Merge from jb-mr1-dev
b02e8f5 am be6e9948: API record keeping for UI Automator
025adc0 merge in jb-mr1-release history after reset to jb-mr1-dev
ebc5898 small tweaks to Java doc
18ff8f7 Merge "Fix scrollable start and end detection in ui automator." into jb-mr1.1-dev
be6e994 API record keeping for UI Automator
8feb575 am 0bb49719: Release API prep
0bb4971 Release API prep
49df1bf Fix scrollable start and end detection in ui automator.
4eff84a Reconcile with jb-mr1-release - do not merge
89abd61 merge in jb-mr1-release history after reset to jb-mr1-dev
5ff0990 am 08f500a9: And add support for multi events sync
3df9f1f Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
08f500a And add support for multi events sync
fa463d0 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f051794 merge in jb-mr1-release history after reset to jb-mr1-dev
1c03a44 Fix click pressure
92b7205 merge in jb-mr1-release history after reset to jb-mr1-dev
1991636 Fix getCurrentPackageName and getCurrentActivityName in UiAutomator
fcadb06 merge in jb-mr1-release history after reset to jb-mr1-dev
ee4b48c Updates to UiAutomator library API
2a8cbbc merge in jb-mr1-release history after reset to jb-mr1-dev
1057055 clickAndWaitForNew window fix
d30faab clickAndWaitForNew window fix
d116098 merge in jb-mr1-release history after reset to jb-mr1-dev
14adde0 Make clickAndWaitForNewWindow, wait for an additional event
ee83773 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
b4475ad merge in jb-mr1-release history after reset to jb-mr1-dev
462d28d Fix for NodeInfoDumper child NAF checks
f0aae47 UiDevice pressMenu should sync
545cea5 merge in jb-mr1-release history after reset to jb-mr1-dev
82a559a merge in jb-mr1-release history after reset to jb-mr1-dev
8684e6c Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/frameworks/testing into aosp-merge
65430f2 UiDevice pressMenu should sync
72eab85 merge in jb-mr1-release history after reset to jb-mr1-dev
6088c8f Automator Sync for click and sendkey operations
72e4a8e merge in jb-mr1-release history after reset to jb-mr1-dev
46d9444 Round 2 of java doc clean up
1e9b723 merge in jb-mr1-release history after reset to jb-mr1-dev
336d1a8 Added UiSelector Long-Clickable selector
fb7028c merge in jb-mr1-release history after reset to jb-mr1-dev
517824a fix help messages for uiautomator
4f68d87 Fix the AccessibilityNodeInfoDumper's NAF check
5af5939 merge in jb-mr1-release history after reset to jb-mr1-dev
af81b44 Merge "Improved the AccessibilityNodeInfoDumper's NAF check" into jb-mr1-dev
6c66df5 Improved the AccessibilityNodeInfoDumper's NAF check
a46ac35 Add java docs comments
5c71267 merge in jb-mr1-release history after reset to jb-mr1-dev
784337a explicitly log an errorr in case of null root node
6cfe70f merge in jb-mr1-release history after reset to jb-mr1-dev
9fe7f8d Add screenshot function
a43b44f Follow framework ContentProvider change.
ece68d2 merge in jb-mr1-release history after reset to jb-mr1-dev
7f38ef0 Clipped widget bounds reported outside screen bounds
b1b40f6 Don't use UiDevice in dump command
6a6ac2e Don't use UiDevice in dump command
59b4c82 record rotation of display in XML dump, fix use of obsolete API
16522ab Add support for annotation and notAnnotation args.
d80b91d Use new display manager API.

   * frameworks/wilhelm
4a4c728 Fix race condition when streaming MP2TS to media server
f8d147d playbq's use of playback rate interface optional

   * hardware/broadcom/wlan
6863a0b dhd: add missing interface command fini
3298909 Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/broadcom/wlan into cm-10.1
7ada57e Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/broadcom/wlan into HEAD
9b2646b bcmdhd: Update bcm43241 firmware to version 6.10.170.4
15ad5db bcmdhd: Update bcm43241 firmware to version 6.10.170.3
3c4155b bcmdhd: Update bcm43241 firmware to version 6.10.170.2 (improved 27)
522b14a bcmdhd: Update bcm43241 firmware to version 6.10.116.27
8e2958b bcmdhd: Update bcm43241 firmware to version 6.10.116.25
34c21cd bcmdhd: Update bcm4324 FW to Version 6.10.116.23
e28598d bcmdhd: Update bcm4324 FW to Version 6.10.116.22
1be100a bcmdhd: Update bcm4330b2 FW to Ver 5.90.195.107
ac5e20e bcmdhd: Update bcm4324 FW to Version 6.10.116.17
fbd7762 Merge "bcmdhd shouldn't include kernel headers directly." into jb-mr1-dev
a6498ff bcmdhd shouldn't include kernel headers directly.
ac2bc7e bcmdhd: Update dhdutil to version 1.28.9-2
b5876d7 bcmdhd: Update bcm4324 FW to Version 6.10.116.14
5a58612 Merge "bcmdhd: Update bcm4324 FW to Version 6.10.116.12" into jb-mr1-dev
f648720 bcmdhd: Update bcm4324 FW to Version 6.10.116.12

   * hardware/invensense
33ce91b MotionApps 5.1.1 release, with MA 5.1.0 for further merge review.
64ca18f Revert "Official MA 5.1.2 - RC11 Release"
6a4d9a4 Official MA 5.1.2 - RC11 Release

   * hardware/libhardware
c41a16b Merge "Add psc field to AGpsRefLocationCellID struct" into cm-10.1
652a228 Add psc field to AGpsRefLocationCellID struct
bece415 libhardware: Enable broadcast stream for audio hardware with  SAMSUNG_STE
86fc299 Add camera parameters for htc evo 3D. (2/2)
347e172 lights: Adding keypad alt/shift LED light IDs
689743c Fix the QCOM_BSP ifdef
5b70e9b Revert "hwcomposer: Add HWC_BLIT compositiontype value"
5948c06 libhardware: Remove unused sourceTransform field
1c7976f audio: Subsystem Restart Changes
af11587 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/hardware/libhardware into 1.1
09c0110 Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1
ba98737 hwcomposer: Add HWC_BLIT compositiontype value
1db6026 Add gralloc_perform enums definitions
f67c5b4 FM Radio: Add support for FM Radio in Android
07af9b9 Revert "Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9"
bae0a96 audio: add support for VOIP
1966e40 Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9 libhardware-qcom: disable a set of qcom api that don't exist
a89649f exynos4: gralloc: add camera and nonecache usage
f0bc5b5 Extend ICS_AUDIO_BLOB back-compat to the 4.2 API
48697f6 Fix HWC documentation.
90b17dc Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/libhardware into HEAD
bdcf825 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
c55d7ac merge in jb-mr1-release history after reset to jb-mr1-dev
90b0fbd Shutdown audio pipe when closing input stream
c280584 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
b97ae06 merge in jb-mr1-release history after reset to jb-mr1-dev
20c7f50 Support querying active record sources
4ba4655 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
41ef60e merge in jb-mr1-release history after reset to jb-mr1-dev
97e4ca0 merge in jb-mr1-release history after reset to jb-mr1-dev
a644b63 merge in jb-mr1-release history after reset to jb-mr1-dev
c754518 hwcomposer: Specify set() call error behavior.
e037cfb merge in jb-mr1-release history after reset to jb-mr1-dev
3fb2be6 Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
96e003e merge in jb-mr1-release history after reset to jb-mr1-dev
4d7640a Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
d441303 bug 7253033 Add "exiting" state to remote audio submix module
442752a NFC HAL: Use a separate callback for data.
67dde9a merge in jb-mr1-release history after reset to jb-mr1-dev
cecacd4 Camera2: Change JPEG transport header
bb992a8 libhardware: Add new APIs to support effects with DirectTrack
855d9ca libhardware:Fix for memory leak by get_parameters call
96a2223 power: Add POWER_HINT_CPU_BOOST
6d3ab64 merge in jb-mr1-release history after reset to jb-mr1-dev
3a90d59 Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
4af49c6 merge in jb-mr1-release history after reset to jb-mr1-dev
6f3fda3 power: Extend power module definition.
919e1c4 Merge "Document reentrancy and error conditions" into jb-mr1-dev
d91697a Document reentrancy and error conditions
ada3a97 Camera2: Add JPEG transport header
9ffeb15 merge in jb-mr1-release history after reset to jb-mr1-dev
05f4954 Initial Bluetooth open source release
b9bfffc gralloc: added exynos4 specific usage bits
3612753 merge in jb-mr1-release history after reset to jb-mr1-dev
97c262f Remote submix: fix sink/source reference count handling
35a2c16 Turn off logs in remote submix audio module
eec8770 Remote audio submix: blocking writes and sleeping reads.
61edfe3 merge in jb-mr1-release history after reset to jb-mr1-dev
4fbd199 Delete headers that have been moved
7f9067f Merge "Layer flags won't change between prepare and set" into jb-mr1-dev
6b01e2e Layer flags won't change between prepare and set
a5c667d merge in jb-mr1-release history after reset to jb-mr1-dev
1c970f1 Initial NFC HAL for NCI controllers.
e6152a5 merge in jb-mr1-release history after reset to jb-mr1-dev
9633d50 Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
1df8c7a Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev
6acd966 Remote submix audio module: sleep less, log errors
2a379b3 merge in jb-mr1-release history after reset to jb-mr1-dev
7cb03d7 Add outbuf fields for HWC 1.2 virtual displays
3505792 hardware/libhardware: Added string for handle a2dp device
799ca87 hwcomposer: Add sourceTransform to hwc_layer_t
ff5f0fb merge in jb-mr1-release history after reset to jb-mr1-dev
5d85c53 update audio remote submix API revision
53657f4 merge in jb-mr1-release history after reset to jb-mr1-dev
43110fa Merge "audio: new audio devices enums" into jb-mr1-dev
416d37b Audio remote submix in hardware modules
85e08e2 audio: new audio devices enums
88b79cb Add audio module for remote submix
3f014b9 Merge "audio effects: add audio source indication" into jb-mr1-dev
ff824a1 audio: fix when using ICS audio blobs
1b9684a merge in jb-mr1-release history after reset to jb-mr1-dev
2074663 Merge "Revert "Revert "Add reprocess method, redefine gralloc ZSL usage flag""" into jb-mr1-dev
7f8dd0a Revert "Revert "Add reprocess method, redefine gralloc ZSL usage flag""
47eb07f Merge "Make HWC_MODULE_API_VERSION fit in uint16_t again" into jb-mr1-dev
49b1d6b Merge "Revert "Add reprocess method, redefine gralloc ZSL usage flag"" into jb-mr1-dev
3b98ffb Revert "Add reprocess method, redefine gralloc ZSL usage flag"
fcc5ea2 Merge "Add reprocess method, redefine gralloc ZSL usage flag" into jb-mr1-dev
903811c Make HWC_MODULE_API_VERSION fit in uint16_t again
83a5146 libhardware: Load the MPQ HAL for the MPQ8064 target
9f6e202 merge in jb-mr1-release history after reset to jb-mr1-dev
70d87bf Add reprocess method, redefine gralloc ZSL usage flag
a07ef69 audio effects: add audio source indication
b3f211a Merge "Add new HWC 1.1 queries and hotplug callback" into jb-mr1-dev
2c13759 Add new HWC 1.1 queries and hotplug callback
673a810 Merge "Encode header version in api versions" into jb-mr1-dev
3f5b522 Encode header version in api versions

   * hardware/libhardware_legacy
0addf33 audio_policy: Add EVRCB & EVRCWB formats for msm7x27a
5031825 libhardware_legacy: Increase stream mute time
e38f4ac Primary output check for sonification is removed.
48d9734 wifi: add a new "loading" state
e7b58b2 qcom-fm: audio: add support for FM feature
96a90d8 wifi: add suport for WIFI_EXT_MODULE
0b80bd6 fmradio: cleanup QCOM_FM_ENABLED/STE_FM defs and ifdef
6c8bc31 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/hardware/libhardware_legacy into 1.1
4ab7bb4 STE_FMRDIO:enable STE_FM radio
af6add0 audio policy :Added EVRC and QCELP for 7x30 HAL compilation
7bbb31f audio: Add support for QCOM audio devices, formats, and channels
3c16e23 Merge "audio_policy: Fix volumes for ICS blob compat" into cm-10.1
f701e0c audio_policy: Fix volumes for ICS blob compat
4db603d wifi: fix samsung wifi logic
c4392ef wifi: Add support for AP module args
5d93191 wifi.c: allow devices to specify driver delay
c813f14 wifi: support adding p2p0 when starting wpa_supplicant
04613b8 wifi: Choose correct nvram file on samsung hardware
c31ddfa power: Add DVFS stub
d72b7ba hardware_legacy: allow alternative vibrator implementations
ff8e103 Add support for ICS audio blobs
a7c17de audio policy: notification delay - DO NOT MERGE
fe43d16 audio policy: fix volume problem - DO NOT MERGE
da06cb6 audio policy: fix dynamic parameter - DO NOT MERGE
e912bfd audio policy: direct output fix - DO NOT MERGE
745e7fd Fix stop supplicant api
62fcb21 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
ebc42af merge in jb-mr1-release history after reset to jb-mr1-dev
5a484b7 audio policy: active analog dock force usage
05f5f8d merge in jb-mr1-release history after reset to jb-mr1-dev
06eda4e Merge "Fix native crash when driver commands time out" into jb-mr1-dev
943574a Fix native crash when driver commands time out
89ef58f Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev
672e9ac Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev
fd8cecb audio policy: fix scanning of supported devices
1f5d029 merge in jb-mr1-release history after reset to jb-mr1-dev
0d6490a audio policy: tune voice/video chat volumes
7726863 audio policy: update output delayMs in setPhoneState
ca834a4 merge in jb-mr1-release history after reset to jb-mr1-dev
aac6731 Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev
85ad78f Initialize mStrategyMutedByDevice
b52f373 audio policy: do not route in call audio to HDMI
19ee2e4 merge in jb-mr1-release history after reset to jb-mr1-dev
b707cf2 Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev
90dbdf2 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
71a635d merge in jb-mr1-release history after reset to jb-mr1-dev
c4c58b2 Merge "Fix native crash" into jb-mr1-dev
31363a9 Remote audio submix always has priority for media, only plays media
897f6dd Fix native crash
38b12d8 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
21da712 merge in jb-mr1-release history after reset to jb-mr1-dev
abc55c6 AudioPolicyManager supports querying active record sources
2a8ce83 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
26aa410 merge in jb-mr1-release history after reset to jb-mr1-dev
5f429f8 merge in jb-mr1-release history after reset to jb-mr1-dev
738207d audio policy: add forced uses for system
3aabb26 fix a typo in uevent_next_eventi
76e97d3 audio policy: force device update if disconnected
be13d2e audio policy: fix crash when closing HDMI output
c0ab773 am e0232039: Merge "Restore the ability to use ctrl_interface directory"
e023203 Merge "Restore the ability to use ctrl_interface directory"
6d3a115 Support audio recording while remote submix is active
ed8f62d audio: new audio devices enums
48387b2 Update Audio Policy Manager for remote submix
17a73c3 audio policy: fix ringtone volume on headphones

   * hardware/msm7k
e2d92ef Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/msm7k into HEAD

   * hardware/qcom/audio
12de8f9 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/qcom/audio into aosp
41020ed audio: Don't build if TARGET_QCOM_AUDIO_VARIANT is set
a9f27d9 audio: add flag to only set min buffersize instead of min and max
be993b1 alsa_sound: Fix defaults when low-latency audio is disabled
b469b0e alsa_sound: Make low-latency audio feature optional
014d19f merge in jb-mr1-release history after reset to jb-mr1-dev
9eb1a4f audio: add support for HDMI and speaker combo device
5062cce alsa_sound: change input device for communication
0f5426b alsa_sound: change voice-call stop sequence
9769041 merge in jb-mr1-release history after reset to jb-mr1-dev
89c224e alsa_sound: prevent lowlatency errors triggering WD reset
4fea7c7 merge in jb-mr1-release history after reset to jb-mr1-dev
2c79891 alsa_sound: avoid pcm_open error
bf1c874 alsa_sound: Add support for multichannel hdmi
b357a77 alsa_sound: Add hdmi audio sink capability discovery
87459f0 alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx
a8b7653 audio: fix for mismatched UseCase Type
b7c7b51 merge in jb-mr1-release history after reset to jb-mr1-dev
5f24fd9 alsa_sound: fix watchdog error issue
9f99e38 alsa_audio: route call voice to phone when on HDMI
6ebf0aa alsa_audio: route call voice to phone when on HDMI
1af98a6 alsa_sound: fix for SIP call mute issue.
6ccde10 alsa_sound: fix for SIP call mute issue.
cda1a83 merge in jb-mr1-release history after reset to jb-mr1-dev
604ccc9 Revert "alsa_sound: fix for SIP call mute issue."
80baa42 Revert "alsa_sound: fix for SIP call mute issue."
5481e76 alsa_sound: fix for SIP call mute issue.
466e8a8 audio: reset output device when disconnecting HDMI
f859d3e alsa_sound: fix for SIP call mute issue.
341c060 merge in jb-mr1-release history after reset to jb-mr1-dev
7778038 alsa_sound: Add support for flexible buffer size for recording
453d78c alsa_sound: fix for output device routing during video chat
c669c27 alsa_sound: fix for output device routing during video chat
85f3fc5 merge in jb-mr1-release history after reset to jb-mr1-dev
925596f audio: separate device for voice call
9858010 audio: ucm: Route voice call only after enabling device
ed3c0fd alsa_sound: Correct the input buffer size computation
9a0ca06 merge in jb-mr1-release history after reset to jb-mr1-dev
639ce75 audio: Remove acdb, csd-client dependency
98913ad merge in jb-mr1-release history after reset to jb-mr1-dev
9efed76 audio: enable necessary audio logs for debugging purpose
8b9ec98 merge in jb-mr1-release history after reset to jb-mr1-dev
2aa2507 audio: remove redundant configuration files from audio HAL
e9c7854 alsa_sound: Decrease the lowlatency playback buffersize to 1024 bytes
304e61b Remove audio_policy.conf here
f9e4091 merge in jb-mr1-release history after reset to jb-mr1-dev
5ff7a02 audio: Remove HAL, UCM dependency on acdb and csd client modules
9ea52b2 merge in jb-mr1-release history after reset to jb-mr1-dev
d4f2d06 audio: fix problem of routing device 0 after A2DP play
e42406e alsa_sound: Remove pcm stream close for flushing buffers
308dc9a merge in jb-mr1-release history after reset to jb-mr1-dev
018d1c5 alsa_sound: increase deep-buffer playback buffer size and latency
8861338 alsa_sound: add support for low latency playback and recording
92ce81d merge in jb-mr1-release history after reset to jb-mr1-dev
94de74c audio: avoid latent media server crash during device is booting
0a01991 audio: fix for log spamming from ALSA
8a9785b Reduce debug logs for some normal usecases
f742751 merge in jb-mr1-release history after reset to jb-mr1-dev
7801df9 audio: changes for audio device API 2.0.
39a9790 merge in jb-mr1-release history after reset to jb-mr1-dev
a4e2367 Revert "audio: fix harmoic caused by resampler in high frequency"
13e8749 merge in jb-mr1-release history after reset to jb-mr1-dev

   * hardware/qcom/audio-caf
f1e8165 Merge "alsa_sound: Add support for sound card in Galaxy S4 Mini" into cm-10.1
d0f89cc alsa_sound: Add support for sound card in Galaxy S4 Mini
452a715 audio-caf: Trigger immediate doRouting() on setMode() change to normal
8aebe85 Merge "Revert "alsa_sound: Only route if devices change" breaks in call audio" into cm-10.1
d560975 Revert "alsa_sound: Only route if devices change" breaks in call audio
8995c4a alsa_sound: Fix compile error with BOARD_HAVE_NEW_QCOM_CSDCLIENT
c3a461a msm8660: prevent input routing during VOIP recording
4302f22 alsa_sound: Only route if devices change
14030ec audio/msm7x30: #ifdef HTC audio changes
b3c201a audio/msm7x30: Use kernel headers for 7x30.
d7b6ddc msm8660: fix getInputBufferSize to calculate buffer sizes
fced0ac msm8660: use defines instead of "magic" numbers
0d3ceaf msm8660: add routing for VOIP_CALL input stream
58c7ce4 msm8660: only use voip stream if sample rate is 16k or less
bfafd64 Merge "audio: provide a hook for audio amplifier implementations" into cm-10.1
4fed5f5 alsa_sound: Add support for VR-on-wired-headset device
e912e3e alsa_sound: Add support for seperated headset mic devices
f7b50ca alsa_sound: Add support for seperated VOIP devices
1dba782 msm8660: Fix call/voip audio routing for Samsung audio
ffee8ea msm8660: Fix VoIP device for Samsung Audio
12bca57 alsa-sound: Fix to sound burst on switching from speaker to headset
6f82cba alsa_sound: Fix for short break in music when touch tone plays
170d3eb Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.375' of git://codeaurora.org/platform/hardware/qcom/audio into cm-10.1
102705c Merge branch 'av-test' of git://github.com/CyanogenMod/android_hardware_qcom_audio-caf into cm-10.1
c757e34 audio: provide a hook for audio amplifier implementations
49d7909 Merge remote-tracking branch 'caf/jb_2.5' into HEAD
6479193 Merge "alsa_sound: Add EC supported Key"
a0c61a4 alsa_sound: Add EC supported Key
a1e3e66 Merge "alsa_sound: change noisy debug statements to verbose" into cm-10.1
062aece Merge "  alsa_sound: Patch to fix Voice call setup"
cb0bad7 Merge "alsa_sound: Get FM volume control from UCM"
3130937 Merge "alsa_sound: Add initial volume setting for USB headset"
9c5c09c Merge "Revert "audio: getNewDevice on primaryOutput for strategy phone and enforced audio""
45277f9 Merge "alsa_sound: Fix for IMS hold issue"
12b58f1 Merge "alsa_sound: Fix for sound burst for short duration"
6c8d9ca Merge "alsa_sound: Increase the stop threshold of proxy driver for a2dp"
ed22975 Merge " alsa_sound: Fix to avoid mute of an already muted stream."
9e7657f   alsa_sound: Patch to fix Voice call setup
f2a261f  alsa_sound: Fix to avoid mute of an already muted stream.
d347e37 audio: modify the SPEAKER_RX_ACDB to support both MONO and STEREO speaker
9dd43ae audio: modify the SPEAKER_RX_ACDB to support both MONO and STEREO speaker
8e548a3 audio-caf: fix dbg message derp
0719732 Merge "alsa_sound: add HTC CSD CLIENT board flag for special cases (BT)" into cm-10.1
4027a1e alsa_sound: Kill LPA logspam
75e2a91 alsa_sound: add HTC CSD CLIENT board flag for special cases (BT)
f3f7197 Merge "Revert "alsa_sound: Add metadata mode changes for LPA playback"" into cm-10.1
b37186b Revert "alsa_sound: Add metadata mode changes for LPA playback"
eeb9f79 Merge "alsa_sound: Add metadata mode changes for LPA playback" into cm-10.1
775f9d7 Merge branch 'jb_2.5' of git://codeaurora.org/platform/hardware/qcom/audio into cm-10.1
32352f0 alsa_sound: Support ES325 2Mic and Samsung CSD client
18e59b2 alsa_sound: Add initial volume setting for USB headset
14567ba Merge "  alsa_sound: Fix to route Skype call through HDMI."
7f5bd97 Merge "  alsa_sound: Fix to avoid Ringtone leaks to speaker in Skype MO call"
e5b5bea alsa_sound: Fix for IMS hold issue
6abae3d msm8660: Fix mic in Hangouts
d5fc66e alsa_sound: Fix for sound burst for short duration
6697adb Revert "audio: getNewDevice on primaryOutput for strategy phone and enforced audio"
14b98b0   alsa_sound: Fix to route Skype call through HDMI.
5496a3c alsa_sound: Add metadata mode changes for LPA playback
b443bf1   alsa_sound: Fix to avoid Ringtone leaks to speaker in Skype MO call
802b1d3 alsa_sound : Fix for audio routing speaker though BT is connected
2d3405a alsa_sound: Increase delay in temp mute
4780440 alsa_audio:remove the device from device list if open fails
044c432 hardware/qcom/audio: Fix for Crash during Gtalk startup
cfc1430 alsa_sound: Fix corruption in recording over usb.
c62d571 Change to handle A2dp suspend setparameter, which will suspend the thread
12457d6 alsa_sound: Patch to remove delay in second MT call during hold
54f6b52 alsa_sound: Fix for audio loss on switching from BT to AOA
fddccca alsa_sound: set ALSADevice::mInChannels to 0 after voice call finishes
ed775c1 alsa_sound: Fix for Tunnelplayer IOCTL drain block
bc5b4a0 Merge "alsa_sound: Fix for IMS SRVCC and BT issue"
ae249db alsa_sound: Fix for IMS SRVCC and BT issue
fd5ea63 alsa_sound: Get FM volume control from UCM
03e6235 Merge "alsa-sound: Add NULL check for mExtOutStream in switchExtOut"
42e945f Merge "alsa_sound: Fix to enable wired headset mic during VoIP call."
afbe38a alsa_sound: change noisy debug statements to verbose
0177414 audio/msm7x30: fix for SEMC devices with stereo hw speaker
661c5ca Merge "alsa_sound: Avoid routing device 0 to Audio HAL"
4f0f3bb alsa-sound: Add NULL check for mExtOutStream in switchExtOut
e0bc583 Merge "alsa_sound : Fix for audio routing speaker though BT is connected"
070ef6d alsa_sound: Fix to enable wired headset mic during VoIP call.
ca70c8b alsa_sound: Increase the stop threshold of proxy driver for a2dp
a245237 Merge "alsa_sound: Enable independent channel volume control"
2e65630 Merge "alsa_audio:remove the device from device list if open fails"
0c85f77 audio/msm7x30: #ifdef teh things
0de404b Revert "audio/8655: Enabling LPA playback by adding AudioSessionOutLPA class"
d501a1a audio/msm7x30: fix a crash on audio initialize
1fdcc6a audio/msm7x30: Change fallback route to speaker
f0ec98d audio/msm7x30: fix voice volume on first call
223cef2 audio/msm7x30: set mRecordState in AudioInputStreamMSM72xx::set
1844bcd audio/msm7x30: device enum debug
c42eabb audio/msm7x30: perform null checks when calling libhtc_acoustic functions
548b319 audio/msm7x30: port forwarding HTC code from gb
8f883e2 alsa_sound: Avoid routing device 0 to Audio HAL
341c850 alsa_sound: Disable verbose logging
764f8a9 Merge "audio: fix for device not disabled after ending voice call" into cm-10.1
4fb820d Merge "alsa_sound: Fix recording synchronization issue"
9a6c780 audio: conditionally restore session less CSD apis
07eb3c2 alsa_sound: Add option to use seperated speakerphone device
221f374 alsa_sound: Enable independent channel volume control
6771433 alsa_sound : Fix for audio routing speaker though BT is connected
7cead94 Merge "alsa_sound: Increase delay in temp mute"
5accf62 audio: fix for device not disabled after ending voice call
07e612c Merge "alsa_sound: Send FM TX PREPROC data from ACDB to the kernel"
ca11c8b Merge "alsa_ucm: Get volume mixer control and acdb cap from UCM"
46d3f48 Merge "alsa_sound: Fix for voice call to reside on headset when camcording starts."
67a0a0a alsa_sound: Allow SPEAKER_DUAL_MIC_* UCMs with USES_FLUENCE_INCALL
5c70828 Merge "  libalsa_intf: Added Dual Mic Endfire SGLTE devices"
f94edcb audio-caf: fix compressed audio flags
47cddce Merge "alsa: fix platform detection for m7 devices" into cm-10.1
94db555 Add back ifdef QCOM_COMPRESSED_AUDIO_ENABLED for sound/compress_params.h
2cb2791 alsa: fix platform detection for m7 devices
8a17bbe Merge "alsa_sound: Parallelize MDM call sequence with APQ codec setup"
b60faf2 alsa_audio:remove the device from device list if open fails
bebeaeb alsa_sound: Send FM TX PREPROC data from ACDB to the kernel
7fa0f9f alsa_ucm: Get volume mixer control and acdb cap from UCM
dd17056 alsa_sound: Fix for voice call to reside on headset when camcording starts.
a82aa81   libalsa_intf: Added Dual Mic Endfire SGLTE devices
b2901be Merge "  alsa_sound: Fix for crash during open of multiple VoIP streams"
257ccc5 Merge "alsa_sound: Add metadata mode changes for LPA playback"
376e2ab alsa_sound: Add metadata mode changes for LPA playback
41eaae7 audio/msm7x30: Stop the log spam during VOIP calls
ed32cc6 audio/msm7630: Fix for Echo in Gtalk
d04614c audio/msm7x30: Use q5v2_msm_audio_mvs_frame struct
3064498 msm8660: Fix compilation error for 8660
1730000 Fix VOIP audio routing issue and add usb audio hal profile
73554f0 audio/msm8660: Squashed set of updates
672734e audio/msm7630: Fix for back to back VOIP calls failure
07e24e8 audio/msm7630: Add latency support for LPA
9a86b94 audio/msm7630: Fix to enable TTY device
510f9c3 msm8660: Add dependency on kernel headers
bfefbdc Merge "audio: fix for device not disabled after ending voice call"
e50401a   alsa_sound: Fix for crash during open of multiple VoIP streams
41ff904 alsa_sound: Support using legacy CAF input buffersize logic
df9175f alsa_sound: Parallelize MDM call sequence with APQ codec setup
bd30aeb alsa_sound: Changes for adsp restart handling
5ec3314 alsa_sound: Add support for "Voice Earpiece Extra Gain" mode
8fadd47 audio: Dynamic library loading, compilation fixes.
fea0ec1 alsa_sound: Fix recording synchronization issue
40ae587 audio: fix for device not disabled after ending voice call
035c35e Merge "alsa_sound: Add ACDB ID to UCM mapping"
152073a audio: Fix separated audio input support
374afc0 audio: enable fluence incall feature
e5066ed alsa_sound: Add support for Audience A2220
ac92140 Enhance ALSA for USB Dock Audio support
d81f36f import msm7x30/msm8660 audio from CyanogenMod/android_hardware_qcom_audio-caf
4d1f8e0 alsa_sound: Add ACDB ID to UCM mapping
2b0e59b alsa_sound: Increase delay in temp mute
0bd26f2 Merge " alsa_sound: FENS Support for VOIP calls"
f1ee977  alsa_sound: FENS Support for VOIP calls
4711e5b Merge "alsa_sound: Configure period count for pcm recording"
c964018 Merge "alsa_sound: Fix corruption in recording over usb."
c91fa65 Merge "alsa_sound: Patch to remove delay in second MT call during hold"
5b7557a Merge "alsa_sound: set ALSADevice::mInChannels to 0 after voice call finishes"
675fabc alsa_sound: set ALSADevice::mInChannels to 0 after voice call finishes
b4a38a2 Merge "alsa_sound: Fix for audio loss on switching from BT to AOA"
52d5372 Merge "alsa_sound: Fix for Tunnelplayer IOCTL drain block"
671cd2c audio-caf: allow devices to only set min buffer sizes
d8451c4 Merge "hardware/qcom/audio: Fix for Crash during Gtalk startup"
0d458fb hardware/qcom/audio: Fix for Crash during Gtalk startup
a2787ae alsa_sound: Configure period count for pcm recording
c6ef48f Merge tag 'A8064AAAAANLYA161031' into HEAD
d9e9ce8 Merge tag 'A8064AAAAANLYA161030A' into HEAD
1cb9107 alsa_sound: Fix for Tunnelplayer IOCTL drain block
2889a2d Merge "alsa_sound: Patch to fix device switch in skype"
1144c47 alsa_sound: Fix corruption in recording over usb.
74320b4 Merge "Change to handle A2dp suspend setparameter, which will suspend the thread"
36fc3c6 Merge "alsa_sound: Fix for FM volume issue on USB headset"
b681fde Merge "alsa_sound: Use current device to parse edid and configure HDMI device"
58c9893 alsa_sound: Fix for FM volume issue on USB headset
a921baf Merge "Merge commit 'a619cffbf71ed7b2d3244624263b07616a2eff7a' into HEAD"
08bcfdd Merge commit 'a619cffbf71ed7b2d3244624263b07616a2eff7a' into HEAD
70c1271 Merge "Merge commit '317759d230f747879f2fbffb9ed45fe769c9cac6' into HEAD"
1ec562b Merge commit '317759d230f747879f2fbffb9ed45fe769c9cac6' into HEAD
2601141 Change to handle A2dp suspend setparameter, which will suspend the thread
a619cff Merge "alsa_sound: Fix for audio glitch on headset during FM playback"
a762a3a alsa_sound: Fix for audio glitch on headset during FM playback
3469c73 alsa_sound: Patch to remove delay in second MT call during hold
286d1ae alsa_sound: Fix for audio loss on switching from BT to AOA
8ad6c3a alsa_sound: Use current device to parse edid and configure HDMI device
98f68b9 Merge tag 'A8064AAAAANLYA161030' into cm-10.1
317759d Merge "Primary output check for sonification is removed."
bcab792 Merge "audio: refactor HAL to call session id based CSD apis"
c2e34a7 audio: refactor HAL to call session id based CSD apis
63ab11a Primary output check for sonification is removed.
8bf055d Merge "alsa_sound: Add support for new UCM file for SGLTE"
088fbd1 alsa_sound: Add support for new UCM file for SGLTE
81d5667 Merge "alsa_sound: Fix race condition in close and open device"
7daa107 Merge "alsa_sound : Handle sound card detection failures"
b0d34c8 Merge "alsa_sound: Change SGLTE to Voice2 for reusability of code"
ccd5aab alsa_sound: Fix race condition in close and open device
f0a4a6a Merge "libalsa_intf: Add USB acdb IDs for voice over USB"
c14ba79 Merge "Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.184' into HEAD"
b580e90 Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.184' into HEAD
83d616c alsa_sound: Change SGLTE to Voice2 for reusability of code
be66cfe Merge "audio: getNewDevice on primaryOutput for strategy phone and enforced audio"
bdc27ce Merge "alsa_sound: Add missing param.remove(key) in setParameters"
5e92747 alsa_sound: Add missing param.remove(key) in setParameters
c3d5034 alsa_sound : Handle sound card detection failures
40f60e8 Merge "Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.173' into HEAD"
e70ace4 libalsa_intf: Add USB acdb IDs for voice over USB
78cdd9c Merge "alsa-sound: EOS notification if drain ioctl is interrupted"
694d88c audio: getNewDevice on primaryOutput for strategy phone and enforced audio
5efc941 Merge commit 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.173' into HEAD
db974a1 Merge "audio: fix input buffersize for AMR/EVRC formats"
00d162b Merge "libalsa-intf: Add support to handle numerical amix commands"
34125e9 Merge "alsa_sound: Fix for no ringtone heard while playing on WFD"
2683272 Merge "alsa_sound: Add support for VoLTE over USB headset"
eae2d49 libalsa-intf: Add support to handle numerical amix commands
f61e98d alsa_sound: Patch to fix device switch in skype
8e43d92 Merge tag 'A8064AAAAANLYA161023' into HEAD
061f10d alsa_sound: Fix for no ringtone heard while playing on WFD
187fde4 Merge "alsa_sound: Support for applying independent channel volume control"
13d144a Merge "alsa_sound: Initialize the mPfdProxy in constructor"
0c64b41 Merge "libalsa-intf: Fix build warning from ALOGE"
1ea750a Merge "alsa_sound:Resample proxy ouput for other than 48KHz samplerate"
6a3357d Merge "alsa_sound:Fix for Audio leak in LPA while in voice call"
722337a alsa-sound: EOS notification if drain ioctl is interrupted
9c37bad alsa_sound: Initialize the mPfdProxy in constructor
99dfda5 fmradio: enable STE radio
1bac86c audio: cm build fix
e88ae7d Merge "libalsa-intf: Add mono headset support"
b39e39b audio: fix input buffersize for AMR/EVRC formats
3093973 alsa_sound: Add support for VoLTE over USB headset
e3471f4 Merge "alsa_sound: Fix to prevent additioal doRouting call"
614a4e5 alsa_sound: Fix to prevent additioal doRouting call
4010138 Merge "alsa_sound: Fix to prevent additioal doRouting call"
1297a73 alsa_sound: Fix to prevent additioal doRouting call
1b6657f alsa_sound:Fix for Audio leak in LPA while in voice call
3f6c449 Merge "alsa-sound: Avoid use of extra bytes to signal seek processed"
eb56b2d alsa_sound:Resample proxy ouput for other than 48KHz samplerate
ef8a10a Merge "alsa-sound: Use errno to check for error code of ioctl()"
9e244fc alsa-sound: Avoid use of extra bytes to signal seek processed
8c9e621 Merge "alsa_sound: Fix usb headset record noise"
1cfa1ac libalsa-intf: Fix build warning from ALOGE
9d18f45 Merge "alsa-sound: AudioSessionOut optimization"
78e0dde Merge "alsa_sound: Fix for Audio routing to HDMI when BT connected"
5b1a6c4 Merge "alsa_sound: Set tunnel/lpa bit for playback over usb headset"
9e5c3ef alsa-sound: AudioSessionOut optimization
60cc831 Merge "alsa_sound: Fix for no audio when switching between BT headsets"
0ab86af alsa_sound: Support for applying independent channel volume control
8ed7cc1 alsa_sound: Fix usb headset record noise
cb2fa2d alsa_sound: Fix for Audio routing to HDMI when BT connected
3c31cec Merge "alsa_sound: Add Adaptive ANC devices"
d2279da Merge "audio: add support for 8610"
338813c alsa_sound: Set tunnel/lpa bit for playback over usb headset
6b52607 alsa-sound: Use errno to check for error code of ioctl()
a803776 libalsa-intf: Add mono headset support
66b6050 Merge "hardware/qcom/audio: fix memory leak in alsa_ucm.c file"
35802aa Merge "audio: fix to play Skype calltone on earpiece instead of speaker"
10b6ce4 alsa_sound: Add Adaptive ANC devices
c260160 Merge "alsa-sound: Adjustment for tunnel mode buffer size"
9393dbc Merge "AudioSessionOut: Fix to handle a single write() with an empty buffer"
750a848 audio: fix to play Skype calltone on earpiece instead of speaker
029fea4 Merge "libalsa-intf: Include the audcal header path"
10d6f1c Merge "libalsa: Fix voip voice calibration issue"
200b505 Merge " Fix for MT call ringtone on USB headset"
7eb0ad3 Merge "alsa-sound : Fix a deadlock"
3184a32 alsa-sound: Adjustment for tunnel mode buffer size
ae1de0f alsa_sound: Fix for no audio when switching between BT headsets
6db504e AudioSessionOut: Fix to handle a single write() with an empty buffer
d88ffa2 Merge "audio: Update sysfs node in audio daemon"
84ac67a Merge "audio: update device for all outputs in setPhoneState"
88b4903 audio: add support for 8610
6c461b7 libalsa: Fix voip voice calibration issue
9cd649e libalsa-intf: Include the audcal header path
f0acbdf Merge "audio: update voip input buffersize for 8974 target"
58f8def Merge "alsa-sound: AudioSessionOut synchronization fixes"
f131e62 alsa-sound : Fix a deadlock
6f6620b audio: update voip input buffersize for 8974 target
d1b3519 Merge "alsa : check for valid verb index"
12bbc02 Merge "alsa_sound: Add e2e multi-channel support on 8974."
6000eb5 alsa_sound: Add e2e multi-channel support on 8974.
f0792ac audio: Update sysfs node in audio daemon
4678f31 Merge "audio: fix for setting fluence paramter issue"
3b3ffdc alsa-sound: AudioSessionOut synchronization fixes
a30da2e Merge "Merge commit 'android-4.2.1_r1' into Upgrade_branch"
7955ffc audio: update device for all outputs in setPhoneState
fa1cacb hardware/qcom/audio: fix memory leak in alsa_ucm.c file
9f3ab34  Fix for MT call ringtone on USB headset
70831d4 Merge "audio: Add support for audio recording using EC"
07cdbb8 Merge "Update copyright to The Linux Foundation" into jb_2.5
1be95c0 Merge "audio: fix for audio recording"
5282ade audio: fix for audio recording
50938a2 Merge commit 'android-4.2.1_r1' into Upgrade_branch
eb33733 Update copyright to The Linux Foundation
698d03d Merge "audio: enabled SSR in HAL"
f158b28 audio: Add support for audio recording using EC
783a7b9 audio: enabled SSR in HAL
ee1b40b Merge "alsa_sound: Decrease the playback buffer size and latency"
b3f7d30 audio: fix for setting fluence paramter issue
a309f94 alsa_sound: Decrease the playback buffer size and latency
19e43a2 Merge "alsa_sound: Subsystem Restart Changes"
bd29f00 Merge "alsa_sound: Fix audio not routed from Speaker to HDMI device"
fc3addc Merge "alsa_sound: conditionally allow changing of fluence type"
29cebf6 Merge "audio: Add new Audio daemon process"
7050617 Merge "audio: invoke CSD client APIs only for Fusion3 platform"
92abe66 alsa_sound: Subsystem Restart Changes
9b79f6d audio: invoke CSD client APIs only for Fusion3 platform
b7a8ca6 alsa_sound: conditionally allow changing of fluence type
93601e9 alsa : check for valid verb index
1dca4f2 alsa_sound: Fix audio not routed from Speaker to HDMI device
694cf22 Merge "alsa_sound: Miscellaneous fixes BT and USB playback"
a28e0c8 Merge "audio: Fix delay with first voice call and MT voice call"
1ec163f alsa_sound: Miscellaneous fixes BT and USB playback
b8851fa audio: Fix delay with first voice call and MT voice call
b4173c4 Merge "alsa_sound: Collection of fixes in HAL for EOS"
dcc0fc2 Merge "alsa_sound: Decrease the tunnel buffer size to 256Kbytes"
b652d20 Merge "audio: add support for FM feature"
c410e12 audio: Add new Audio daemon process
a5a6a80 alsa_sound: Collection of fixes in HAL for EOS
4526fde alsa_sound: Decrease the tunnel buffer size to 256Kbytes
fddaa94 audio: add support for FM feature
ea44f15 Merge "alsa_sound: Fix for no audio in voice call over USB"
38fa643 Merge "alsa_sound:Fix for no audio while playback on USB headset"
a0c8418 Merge "alsa_sound: Fix for device switch crash"
ebe8557 alsa_sound: Fix for no audio in voice call over USB
9acf3d9 alsa_sound:Fix for no audio while playback on USB headset
2759821 alsa_sound: Fix for device switch crash
3af13f6 Merge "alsa_sound: Add support for 8 channel for HDMI device"
2f99066 Merge "alsa_sound: Miscellaneous fixes for LPA and Tunnel Mode playback"
27c9030 alsa_sound: Add support for 8 channel for HDMI device
ebd7ad8 alsa_sound: Miscellaneous fixes for LPA and Tunnel Mode playback
b144fd8 Merge "audio: Fix for usb headset recording issue"
727610a Merge "audio: compile mm-audio project"
8dacf2a Merge "audio: Fix for TTY mode parameter values in HAL"
76aa4c9 audio: Fix for usb headset recording issue
65860e4 audio: compile mm-audio project
d3d2c86 audio: Fix for TTY mode parameter values in HAL
74f4b09 Merge "alsa_sound: Re-design USB audio solution"
2a079c7 Merge "alsa_sound: update AudioPolicyManagerALSA for QCOM audio features"
b27edcd Merge "alsa_sound: Modify playback and capture period size"
cab5ad8 Merge "HAL: make changes to compile audio hal for 8974."
4d33ffd alsa_sound: Re-design USB audio solution
979666c alsa_sound: update AudioPolicyManagerALSA for QCOM audio features
9d40ec5 alsa_sound: Modify playback and capture period size
6ffb4f9 Merge "alsa_sound: Support LPA Playback"
908253a alsa_sound: Support LPA Playback
2acdb4f Merge "alsa_sound: Support Tunnel mode of playback"
6502311 Merge "mm-audio: intial commit of mm-audio"
868131e mm-audio: intial commit of mm-audio
135a23d HAL: make changes to compile audio hal for 8974.
22d0d6f alsa_sound: Support Tunnel mode of playback
bbd94ad audio: Initial bring up of QCOM added audio feature.
141e489 alsa_sound: fix no TX issue during voice call
048fb19 libalsa-intf: remove UCM files from hardware/qcom/audio
b10e864 libalsa-intf: Add QCOM ucm files
465149f Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into HEAD
014d19f merge in jb-mr1-release history after reset to jb-mr1-dev
9eb1a4f audio: add support for HDMI and speaker combo device
5062cce alsa_sound: change input device for communication
0f5426b alsa_sound: change voice-call stop sequence
9769041 merge in jb-mr1-release history after reset to jb-mr1-dev
89c224e alsa_sound: prevent lowlatency errors triggering WD reset
4fea7c7 merge in jb-mr1-release history after reset to jb-mr1-dev
2c79891 alsa_sound: avoid pcm_open error
bf1c874 alsa_sound: Add support for multichannel hdmi
b357a77 alsa_sound: Add hdmi audio sink capability discovery
87459f0 alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx
a8b7653 audio: fix for mismatched UseCase Type
b7c7b51 merge in jb-mr1-release history after reset to jb-mr1-dev
5f24fd9 alsa_sound: fix watchdog error issue
9f99e38 alsa_audio: route call voice to phone when on HDMI
6ebf0aa alsa_audio: route call voice to phone when on HDMI
1af98a6 alsa_sound: fix for SIP call mute issue.
6ccde10 alsa_sound: fix for SIP call mute issue.
cda1a83 merge in jb-mr1-release history after reset to jb-mr1-dev
604ccc9 Revert "alsa_sound: fix for SIP call mute issue."
80baa42 Revert "alsa_sound: fix for SIP call mute issue."
5481e76 alsa_sound: fix for SIP call mute issue.
466e8a8 audio: reset output device when disconnecting HDMI
f859d3e alsa_sound: fix for SIP call mute issue.
341c060 merge in jb-mr1-release history after reset to jb-mr1-dev
7778038 alsa_sound: Add support for flexible buffer size for recording
453d78c alsa_sound: fix for output device routing during video chat
c669c27 alsa_sound: fix for output device routing during video chat
85f3fc5 merge in jb-mr1-release history after reset to jb-mr1-dev
925596f audio: separate device for voice call
9858010 audio: ucm: Route voice call only after enabling device
ed3c0fd alsa_sound: Correct the input buffer size computation
9a0ca06 merge in jb-mr1-release history after reset to jb-mr1-dev
639ce75 audio: Remove acdb, csd-client dependency
98913ad merge in jb-mr1-release history after reset to jb-mr1-dev
9efed76 audio: enable necessary audio logs for debugging purpose
8b9ec98 merge in jb-mr1-release history after reset to jb-mr1-dev
2aa2507 audio: remove redundant configuration files from audio HAL
e9c7854 alsa_sound: Decrease the lowlatency playback buffersize to 1024 bytes
304e61b Remove audio_policy.conf here
f9e4091 merge in jb-mr1-release history after reset to jb-mr1-dev
5ff7a02 audio: Remove HAL, UCM dependency on acdb and csd client modules
9ea52b2 merge in jb-mr1-release history after reset to jb-mr1-dev
d4f2d06 audio: fix problem of routing device 0 after A2DP play
e42406e alsa_sound: Remove pcm stream close for flushing buffers
308dc9a merge in jb-mr1-release history after reset to jb-mr1-dev
018d1c5 alsa_sound: increase deep-buffer playback buffer size and latency
8861338 alsa_sound: add support for low latency playback and recording
92ce81d merge in jb-mr1-release history after reset to jb-mr1-dev
94de74c audio: avoid latent media server crash during device is booting
0a01991 audio: fix for log spamming from ALSA
8a9785b Reduce debug logs for some normal usecases
f742751 merge in jb-mr1-release history after reset to jb-mr1-dev
7801df9 audio: changes for audio device API 2.0.
39a9790 merge in jb-mr1-release history after reset to jb-mr1-dev
a4e2367 Revert "audio: fix harmoic caused by resampler in high frequency"
13e8749 merge in jb-mr1-release history after reset to jb-mr1-dev

   * hardware/qcom/bt
ad7eab0 libbt-vendor: implementation for Qualcomm chipsets

   * hardware/qcom/camera
17542ba Qualcomm Camera Hal: add 12.8MP and 13MP camera resolutions.
bc283bd camera.$(TARGET_DEVICE): FPSRange gets defined twice for devices which use the qcom camera hal and the QCOM_HARDWARE define. It is also defined in frameworks/av/include/camera/CameraParameters.h . QCameraParameters.h includes that header, so FPSRange should only be defined here if not defined already.
6e9d4bd Merge remote-tracking branch 'aosp/jb-mr1.1-release' into HEAD
82f6e73 Revert "Camera: Fix compile if BOARD_USES_CAMERA_FAST_AUTOFOCUS is not defined"
b19a908 Camera: add TARGET_PROVIDES_CAMERA_HAL
bf994b6 use standard qcom naming for msm7x27a variants
a85902d Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/qcom/camera into aosp
32d9d8f Camera: Fix compile if BOARD_USES_CAMERA_FAST_AUTOFOCUS is not defined
2239fda merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
21fddc5 Camera: Don't run continuous autofocus in startPreview2.
6a93582 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
722c2bb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
a0d9129 camera: disallow opening multiple camera instances
5238736 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
754ddd3 merge in jb-mr1-release history after reset to jb-mr1-dev
f492fa6 camera: Enable low power camcorder mode.
257727b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
0ed7355 merge in jb-mr1-release history after reset to jb-mr1-dev
73dda0d camera: fix stability issue seen on CTS run.
7b6d715 merge in jb-mr1-release history after reset to jb-mr1-dev
5eb5ce5 camera: enable touch af
9587086 merge in jb-mr1-release history after reset to jb-mr1-dev
35145f2 camera: Fix Liveshot image distortion on front camera.
ada3501 camera: changes to provide postview callback.
60af4d6 merge in jb-mr1-release history after reset to jb-mr1-dev
accd62e chmod uga-x
a4fe483 camera: Changes to notify Flash/Focus/AWB/Exposure value to app.
1987a47 merge in jb-mr1-release history after reset to jb-mr1-dev
bf67ddd merge in jb-mr1-release history after reset to jb-mr1-dev
af811bb Merge "Increase max number of EXIF tags." into jb-mr1-dev
68c37b6 camera: changes to fix stability issue seen in CTS run
52cb8ff Increase max number of EXIF tags.
d5676e9 camera: control FD in HAL
fbd4fa5 merge in jb-mr1-release history after reset to jb-mr1-dev
5443b86 camera: changes to fix flash mode issue in HDR mode.
ade5b5c camera: update af algorithm
15dbc10 merge in jb-mr1-release history after reset to jb-mr1-dev
21a525d support video snapshots in in 1080p/720p/480p aspect ratio
945a276 Revert "camera: set metering mode to SPOT for front camera"
dfb402c merge in jb-mr1-release history after reset to jb-mr1-dev
b45ddca camera: enable CAF in hdr mode
f57febc merge in jb-mr1-release history after reset to jb-mr1-dev
9b266ab camera: disable FD by default
719897d merge in jb-mr1-release history after reset to jb-mr1-dev
52fd019 camera: remove log verbosity
ce07c40 merge in jb-mr1-release history after reset to jb-mr1-dev
91697aa camera: update fast af
381791e camera: set metering mode to SPOT for front camera
0a4cbb9 merge in jb-mr1-release history after reset to jb-mr1-dev
a44bb1d camera: stability fixes seen in normal-power mode
43701b5 merge in jb-mr1-release history after reset to jb-mr1-dev
62f6e26 camera: changes to fix CTS issues in normal power-mode
6d05b88 camera: enable FD
658c474 merge in jb-mr1-release history after reset to jb-mr1-dev
fb259ce camera: Handle NPE in data call back.
d871750 camera: changes to fix mediarecord CTS issue
b923726 merge in jb-mr1-release history after reset to jb-mr1-dev
5cf9cf6 camera: Enable Normal power/full size liveshot.
c1d7538 camera: Fix camera test parameters CTS.
ff965f1 merge in jb-mr1-release history after reset to jb-mr1-dev
63ebe6d camera: enhancement af functionality
4f7ee4e still: remove logspam
a3190bc camera: remove logspam
b30e37a camera: enhancement af functionality
cd1042c use pthread_cond_timedwait() in poll thread
dbf226b camera: Changes to match ZSL snapshot match issue.
3defaf2 merge in jb-mr1-release history after reset to jb-mr1-dev
49ae445 use pthread_cond_timedwait() in poll thread
90ffa5d camera: Changes to match ZSL snapshot match issue.
3842027 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
022e7b7 merge in jb-mr1-release history after reset to jb-mr1-dev
3f4deb8 camera: disable face detection in video mode
282f117 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
f3de082 merge in jb-mr1-release history after reset to jb-mr1-dev
5efb701 camera: add stabilization buffering time
8d6aaea merge in jb-mr1-factory-release history after reset to jb-mr1-dev
d8ebd6c merge in jb-mr1-release history after reset to jb-mr1-dev
1ace1e3 camera: override caf/flash settings for change in scene mode.
1ad51cd merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1acc4cd camera: Fix for testRecorderRandomAction CTS test case.
3f7a351 camera: Stop dispatching prev frames when takepicture() is invoked.
6fc095c camera: Fix for testRecorderRandomAction CTS test case.
3795cc9 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1896e14 merge in jb-mr1-release history after reset to jb-mr1-dev
994c0a3 camera: Stop dispatching prev frames when takepicture() is invoked.
135e2a7 camera: change log priority and disable log message except error log
70cd441 camera: adjust the resolution front camera.
039954f camera: Set default metering mode as Center weighted.
b340568 merge in jb-mr1-release history after reset to jb-mr1-dev
9cf33ef camera: change to abort live snapshot.
10d817b mm-camera: change non-HDR frame rate to variable
3aba355 camera: make flash control after changing to non ZSL mode
46a8086 Revert "camera: fix the problem flash does not work in ZSL mode"
1dc58da merge in jb-mr1-release history after reset to jb-mr1-dev
55d2d59 Disable verbose face detection logs.
8a9b4f4 camera: Changes to fix videoLiveSnapshot issue
9c49934 camera: Changes to fix videoLiveSnapshot issue
c2c00b1 merge in jb-mr1-release history after reset to jb-mr1-dev
b856e5d Disable verbose auto focus state log.
dc0f710 camera: enable face detection
cf96c98 camera: add Morpho DNR support
0c9775a camera: add Morpho DNR support
2e58bad camera: adjust framerate in camcorder
c9112a8 camera: adjust framerate in camcorder
04935dd merge in jb-mr1-release history after reset to jb-mr1-dev
f706c93 Disable verbose AF logs.
0096374 Camera: Remove link time depenedencies on proprietary libraries.
f5198bf Camera: Decouple proprietary code from HAL.
f11111b camera: Release Encoded Memory Heap for HDR.
ac24078 camera: Release Encoded Memory Heap for HDR.
a3ef21f merge in jb-mr1-release history after reset to jb-mr1-dev
67ca985 camera: Update Focus distance only in success case
38d540d camera: add exposure-time value in EXIF
9e512d9 Camera: Fix testImmediateZoom CTS test case
ab517bd merge in jb-mr1-release history after reset to jb-mr1-dev
53a9db9 camera: Fix HDR + Zoom + Snapshot crash.
4c1072a camera: Reduce log verbosity.
5baea38 merge in jb-mr1-release history after reset to jb-mr1-dev
16d2262 camera: set auto antibanding as default
659c683 merge in jb-mr1-release history after reset to jb-mr1-dev
53f39c7 silence camera notifier logspam
b89abfa camera: Changes to validate preview/video dimension before recording.
03bed05 camera: reducing af fail range
e086ba8 camera: apply Fast Autofocus algorithm
bd637ff camera: apply Fast Autofocus algorithm
d61c678 camera: reducing af fail range
aa13225 Camera: Changes to avoid stretch in camcorder preview.
3c4c584 Camera: Changes to avoid stretch in camcorder preview.
ed6bb68 merge in jb-mr1-release history after reset to jb-mr1-dev
7e72351 camera: Enable WNR in ZSL mode.
d5be4d5 camera: maintain autolock invariant
889c39f camera: Fix CTS issue i.e. drop thumbnail when size is zero.
1f66e8b Camera: support for CAMERA_MSG_FOCUS_MOVE callback
f75ebaa camera: maintain autolock invariant
42b2aa1 camera: Fix CTS issue i.e. drop thumbnail when size is zero.
badd74a Camera: support for CAMERA_MSG_FOCUS_MOVE callback
e77d537 merge in jb-mr1-release history after reset to jb-mr1-dev
a0c000b camera: call shutter callback after configuring snapshot
58edd96 merge in jb-mr1-release history after reset to jb-mr1-dev
b5a5bae camera: Fix CAF lock after snapshot issue.
dac188d merge in jb-mr1-release history after reset to jb-mr1-dev
cbc2ff6 camera: enable to read ISO value
bcbcf42 camera: Fix the fps issue during video recording in MMS.
80be363 merge in jb-mr1-release history after reset to jb-mr1-dev
f38403d camera: Fix for preview format change CTS issue.
68a2fc8 merge in jb-mr1-release history after reset to jb-mr1-dev
014e957 Merge "Include public rather than private headers." into jb-mr1-dev
a7716f9 Include public rather than private headers.
06dd3d9 camera: fix for testRecordingHint CTS test.
2a75c49 camera: Fix CTS issue for testJpegExif.
3a9d6fd merge in jb-mr1-release history after reset to jb-mr1-dev
839c6a7 camera: fix for first picture taking long time with ZSL
0f5b96e merge in jb-mr1-release history after reset to jb-mr1-dev
35f2440 camera: fix the problem flash does not work in ZSL mode
9c4c5fe Camera: Enable HDR mode
44131c1 Camera: Restart Preview for HDR & NON-HDR transitions
ac1fa4b camera: fix the stripe problem on recording video via mms
f7bed85 camera: fix the problem flash does not work in ZSL mode
9024631 camera: increase q-factor to enhance image quality
8781c91 camera: increase q-factor to enhance image quality
74c719f merge in jb-mr1-release history after reset to jb-mr1-dev
ee2db3c camera: use low power mode as default
968e904 Camera: Reduced log verbosity.
576bf46 camera: Fix the crash issue when switching to 5MP.
4841498 merge in jb-mr1-release history after reset to jb-mr1-dev
f9761fc Camera: Add HAL stub to match header change.
6128921 merge in jb-mr1-release history after reset to jb-mr1-dev
a5f4efe camera: Enable ZSL mode for preview.
a46eb30 Camera: Initial release of camera 2.0 HAL.
5af9aaf merge in jb-mr1-release history after reset to jb-mr1-dev
0bc9b7a camera: Enable HDR processing.
006b6fa merge in jb-mr1-release history after reset to jb-mr1-dev

   * hardware/qcom/display
c962bf8 Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1
7a8a513 hwc: Don't allow downscale with alpha on MDP <= 4.1
fcbef05 display: Use fences for all targets
cbdefbc display: Allow build for all QCOM platforms
51162c0 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/qcom/display into aosp
e9d0f54 Fix a trivial signed vs unsigned comparison for gcc 4.7.
431ebb9 Don't build when variant is requested.
3754228 display: Don't use MDP flip if prerotation is disabled
6445344 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1d21f73 hwc: fix issue with Layercache
bfd0684 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
33ecf33 hwc: use layercache for external display
fbbd376 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6145012 external: memset commit struct
ed84dd1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2279d22 Fix two trivial bugs found by gcc 4.7.
8cc4470 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
53bdba5 hwc: Avoid MDP composition with alpha scaling
3cbc9da display: Add support for flip operation in MDP comp
ff3a5e7 hwc: Check for the validity of the fb layer
49b4777 hardware/qcom/display: Remove glfinish call
2c58802 libgralloc: Fix possible leak of fd
9ee68e2 copybit: Fix crash when copy_image is called with Tile format
1cb4007 libqdutils::Use qcomuiClearRegion for dynamic composition
8e2510a display : Do not use copybit for composition when YUV layer is present.
131dfb5 libqdutils::Add support for qcomuiClearRegion
49bdda6 hwc: Disable mixed mode composition for secure videos
41a47b5 hwc: Use number of app layers from the hwc context.
52a135b hwc: Disable mixed mode composition for secure videos
4d8af1a hwc: Use number of app layers from the hwc context.
7f387f5 hwc: dont return from vsync thread when read fails.
3963e12 overlay: Compile MDSS rotator even when headers not present
7e41762 libgralloc: Discontinue allocating FB buffers from carveout.
2c49d47 libhwcomposer: Add support for 4 layer MDP Comp
167a2c9 hwc/overlay: Dynamic pipe tracking.
83e63e6 libgralloc: Discontinue allocating FB buffers from carveout.
65bb464 libhwcomposer: Add support for 4 layer MDP Comp
d551ebe hwc/overlay: Dynamic pipe tracking.
e5bfdfe merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6bacbb6 hwc: Add support for faking vsync
89f9d5d hwc: cache layers on framebuffer
0a4ed71 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
354278c qcom_display: add TARGET_PROVIDES_LIBLIGHT
aa6a099 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
e87b66d display: Add support for flip operation in MDP comp
f8661e4 merge in jb-mr1-release history after reset to jb-mr1-dev
2edd033 chmod uga-x
d6cc450 merge in jb-mr1-release history after reset to jb-mr1-dev
08212c0 hwc: Open sysfs node when thread is initialized.
2a018d1 merge in jb-mr1-release history after reset to jb-mr1-dev
eaf6791 hwc: Return failure code if hwc_set fails to draw
40a1cc5 hwc: Create releaseFd even if no HWC layers
1a8cda0 hwc: clean up overlay for external from the draw thread only
6f39219 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
94fccaf merge in jb-mr1-release history after reset to jb-mr1-dev
f83d448 HWC: Protect hwc_set from async events
541b59d hwc: external: Add screen-fitting to external panel.
0f9c397 hwc: add some logging
2fc0c84 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
b6aa2f1 merge in jb-mr1-release history after reset to jb-mr1-dev
27c1d65 hwc: utils: Include orientation while screen-fitting.
c5d4822 merge in jb-mr1-release history after reset to jb-mr1-dev
c23b380 overlay: mdprot: Call rotator start only on config change.
a31b4bc merge in jb-mr1-factory-release history after reset to jb-mr1-dev
dbcb4f3 merge in jb-mr1-release history after reset to jb-mr1-dev
150806a hwc: fix for not ignoring framebuffer
7980f10 hwc: don't open sysfs on every iteration
725dd86 hwc/overlay: Add premultiplied alpha support.
f9a7ef2 hwc: external: Cleanup overlay objects on external disconnect.
18bcd14 display/libhwcomposer: fix potential memory leak
4014777 hwc: don't open sysfs on every iteration
91a6a99 hwc/overlay: Add premultiplied alpha support.
e4f3f72 hwc: external: Cleanup overlay objects on external disconnect.
52ca6d2 display/libhwcomposer: fix potential memory leak
8ae9c59 merge in jb-mr1-release history after reset to jb-mr1-dev
ae823e7 hwc: more error checks
6d9d168 hwc: Remove call to glFinish
cd89f8c hwc: Skip secure buffers in non secure mode
d8e715f hwc: move enable disable ioctls to vsync thread
c52b330 hwc: fix some race conditions
cb5f25b hwc: Skip secure buffers in non secure mode
c7faa70 hwc: move enable disable ioctls to vsync thread
eac8965 hwc: fix some race conditions
36345b9 don't call vsync-ctrl ioctl for same enable value
1ef881c don't call vsync-ctrl ioctl for same enable value
84693f0 merge in jb-mr1-release history after reset to jb-mr1-dev
c4d034f hwc: enable dual display on hwc 1.1
d80a52c gralloc:  Send first 2 FB buffers to carveout and next to IOMMU
32aa90f hwc: Use asynchronous commit ioctl for display post
ff4f025 hwcomposer : Use sysfs to read vysnc information
68b88cf hwc: Handle non secure buffers
d6fd637 merge in jb-mr1-release history after reset to jb-mr1-dev
32ff225 hwc: Make blank wait for set to complete
848de19 merge in jb-mr1-release history after reset to jb-mr1-dev
3825f25 libexternal: Call new IOCTL to commit on external display
9dbd53a hwc: Close unused pipes before PAN
23f8309 hwc: Call sync before draw.
3b95b4c hwc: Fix tearing on HDMI. Call glFinish()
aee5e6e hwc: Close unused pipes before PAN
8c8bfd2 hwc: Call sync before draw.
3d2a790 hwc: Fix tearing on HDMI. Call glFinish()
f8f79fb hwc: Check for the validity of the fb layer
65eedd5 hwc: Fix dpi values reported
6282c95 hwc: Check for the validity of the fb layer
7b80d9c hwc: Fix dpi values reported
daaaebc merge in jb-mr1-release history after reset to jb-mr1-dev
86623d7 (TEMP) hwc: external: Enable default mirroring on hwc1.1
3e858eb hwc: hwc 1.1 implementation
52fc4cd hwc: qservice: Pass through binder calls
d6fdfbf merge in jb-mr1-release history after reset to jb-mr1-dev
2dd04a8 hwc: sync-point implementation.
d1bd318 merge in jb-mr1-release history after reset to jb-mr1-dev
0a03dd8 genlock: conditionally enable genlock from Android.mk for msm8960
35712cb hwc: Use overlay for video even during popups.
649cda6 hwc: Minor bug fixes.
56f610d display: Create QService binder interface.
80692ef hwc: add more debug print
bfe0f3a liboverlay: close all the opened pipes after framework reboot.
cb3da0a liboverlay: close all the opened pipes after framework reboot.
c9829cd hwc: Add non-zero checks. Move warning log.
9171ec6 hwc: Add non-zero checks. Move warning log.
e895257 merge in jb-mr1-release history after reset to jb-mr1-dev
e557e6e fb: Remove extra PUT_VSCREENINFO call.
aa537df hwc: Add some debug and warning logs.
127177c libgralloc: remove pid checks
139e162 libgralloc: remove pid checks
799a397 display: Enable MDP pixel repeat on MDP Composition.
1023ce2 hwc: video: Create crop and position structs only once.
ae1044e Overlay: Change MDP format for YV12 buffers
9c876d9 overlay: Remove OVASSERT from getFormatString utility
aedf236 gralloc: Check for HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
79cf7c7 Gralloc: Fall back to HW_CAMERA_WRITE if HW_VIDEO_ENCODER is not set.
661a58f hwc: Do not create copybit.
2e2798c hwc: Fix fps calculation.

   * hardware/qcom/display-caf
a4efdde display: Fix support for MDP 4.1
131ab8e liboverlay : unset basepipe on overlay intialization.
2f64a6b Revert "liboverlay : unset basepipe on overlay intialization."
f97c92e Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.312' of git://codeaurora.org/platform/hardware/qcom/display into cm-10.1
801ea5b Merge "hwc/copybit: Add check for Max layers support."
5616dd6 Merge "hwc: In MDPcomp, set isFg flag for the first layer"
b24b13b hwc/copybit: Add check for Max layers support.
0668f55 Merge "liboverlay : unset basepipe on overlay intialization."
ba955cf hwc: In MDPcomp, set isFg flag for the first layer
92dbd42 hwc: Only enable vsync delay logging for debug builds
47aa5b2 gralloc: Backward compat for devices using older camera heap
9fa99ff Revert "gralloc: Cleanup usage of old API"
7d0abf9 Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.295' of git://codeaurora.org/platform/hardware/qcom/display into cm-10.1
6b83772 liboverlay : unset basepipe on overlay intialization.
9e4eb4c Merge "Fix crash issue arising out of multiple hdmi connect/disconnects"
37cca68 Merge "libcopybit: Fix GPU page fault on c2d use"
113a9de Merge "libexternal: Add support for SPD Information"
100110b Merge "hwc: Do not include Framebuffer area in calculating total area"
29b0de8 libcopybit: Fix GPU page fault on c2d use
c1c4df0 Fix crash issue arising out of multiple hdmi connect/disconnects
1a513cd Merge "libhwcomposer: print a log if there is any delay in vsync read."
8563640 hwc: Do not include Framebuffer area in calculating total area
4e88d96 libhwcomposer: print a log if there is any delay in vsync read.
d4ca973 Merge "libhwcomposer: align rotator source buffers for tile format."
cad020b Merge "hwc: Add property to differentiate the input image format"
e1fb9ac Merge "hwc: Fallback to GPU if source image width or height is less than 2"
4c6b19c Merge "libgralloc: Change CAMERA_HEAP to ADSP_HEAP"
c691dbc hwc: Add property to differentiate the input image format
250d823 libgralloc: Change CAMERA_HEAP to ADSP_HEAP
4ccac4a libexternal: Add support for SPD Information
d2926c7 Merge "hwc: Close Fds in case of errors in openFramebuffer"
074307f hwc: Fallback to GPU if source image width or height is less than 2
d7f7773 Merge "libcopybit: Fix potential memory and surface leaks in c2d"
f41d7e8 hwc: Close Fds in case of errors in openFramebuffer
ba39c0a libhwcomposer: align rotator source buffers for tile format.
c417b64 gralloc: Add workaround for Jellybean camera drivers
310691f libcopybit: Fix potential memory and surface leaks in c2d
1ecaeaa Merge "copybit: Fix type conversion error for GCC 4.7"
8a96b80 Merge "gralloc: Cleanup usage of old API"
aa3f914 display: Use actual kernel headers for all builds
f096252 hwc: Fix the copybit threshold comparison
8ba3f53 Revert "gralloc: Align protected allocations with the spec"
56d7cb5 copybit: Fallback to SF heap when IOMMU isn't available
0291c9b display: Conditionally restore genlock support
f8a6661 gralloc: Let gralloc_priv.h be overloaded by device trees
cf01fce Tiny changes to support media codecs with vanilla driver.
4b73edb qcomBSP:  put check on new ionalloc
00cf5ea Fix ION_IOC_MAP error on old ion api during drm video playback
b1fe6ef gralloc: Add TARGET_USES_QCOM_BSP flag for non-AOSP features
551daf1 display: Add support for MDP 4.1
f84b2bc libcopybit: Use CM standard QCOM naming.
b655c4a liboverlay: Use camera heap for targets without mm heap.
ae45323 hwcomposer: 7x30: disable overlays for video playback
0fd638a overlay: Bring back debug.mdpcomp.maxlayer
1730279 Update include paths
0484b46 Only build CAF display variant when requested.
cfbc285 qcom_display: add TARGET_PROVIDES_LIBLIGHT
9847229 copybit: Fix type conversion error for GCC 4.7
73c7ea1 Merge "hwc: Reset Layer cache on idle timeout"
b519bb2 gralloc: Cleanup usage of old API
92b9ef9 Merge "hwc: Sync for rotator"
ce7b2fe hwc: Sync for rotator
991234d hwc: Reset Layer cache on idle timeout
8d0c446 Merge "hwc: Ensure borderfill pipe is setup only after unblank"
7f65307 hwc: Ensure borderfill pipe is setup only after unblank
3ddd91a Merge "liboverlay: round off rotator downscale factor to nearest integer."
178cddc liboverlay: round off rotator downscale factor to nearest integer.
6a777ce Merge "hwc: Add support for new resolutions"
cfe5267 Merge "libexternal: Add support for vesa format"
5c34c89 Merge "libexternal: clean up HDMI modes"
c6d8f4a Merge "libcopybit: protect all c2d copybit API's"
feeaf5e Merge "hwc: Add DMA pipe support in MDP composition."
9716d1c libcopybit: protect all c2d copybit API's
fe86841 Merge "hwc: clean up overlay on external display blank"
81ab01c hwc: Add support for new resolutions
e9a5dbc libexternal: Add support for vesa format
68da95e libexternal: clean up HDMI modes
3653ecd Merge "hwc: Add debug logging for fps"
89565f6 Merge "hwc: NULL check on buffer handle"
626dd01 hwc: clean up overlay on external display blank
1c2e5d3 hwc: Add debug logging for fps
e851193 hwc: NULL check on buffer handle
437f6c2 Merge "display: Use cache invalidate and clean correctly"
7f889a9 hwc: Add DMA pipe support in MDP composition.
e6f98be display: Use cache invalidate and clean correctly
da9ba6d Merge "hwc: Configure pipe for FB even if we exceed max layers"
2eeee4f Merge "overlay: Use correct downscale for rotator."
f1cb1c0 Merge "hwc: Configure FbUpdate only when needed"
01ddf6f Merge "libcopybit: Remove usage of C2D_NO_BILINEAR_BIT"
e31edd0 Merge "libexternal: disable HPD during initialization."
0be6eac hwc: Configure pipe for FB even if we exceed max layers
3559805 Merge "libcopybit: Use blending parameters passed by HWC"
e129e66 overlay: Use correct downscale for rotator.
5704a5b libcopybit: Use blending parameters passed by HWC
fb65ca6 Merge "hwc: fix dst calculations for right mixer"
d5c404b hwc: Configure FbUpdate only when needed
868102c Merge "libqservice: Change the permission for SCREEN_REFRESH"
35251ff Merge "gralloc: Align protected allocations with the spec"
be8db35 Merge "hwc: Check vsync state before sending it up"
2d01bb5 libexternal: disable HPD during initialization.
6e06654 hwc: fix dst calculations for right mixer
737a536 hwc: Check vsync state before sending it up
bb2f953 Merge "hwc: Add support for clearing with c2d"
460c19f Merge "hwc: Fix alpha downscale check for mdp composition"
eacb117 hwc: Add support for clearing with c2d
d1cff68 Merge "libhwcomposer: add dynamic thresold support for copybit."
e3671d1 libqservice: Change the permission for SCREEN_REFRESH
bfdd333 Merge "qdutils: Retrieve MDP revision and pipes information from driver."
66bac9d Merge "display: Remove framebuffer HAL usage"
77f89be gralloc: Align protected allocations with the spec
1358722 Merge "gralloc: Stride information fix"
1fdf133 Merge "hwc/ov: Fix MDP orientation flags and values."
27e944f display: Remove framebuffer HAL usage
924a7b1 gralloc: Stride information fix
752f4b0 libcopybit: Remove usage of C2D_NO_BILINEAR_BIT
909a598 hwc: Fix alpha downscale check for mdp composition
6ff67bb hwc/ov: Fix MDP orientation flags and values.
697be25 Merge "hwc: qclient: Subscribe to mediaplayer death later."
2c6e0cf hwc: qclient: Subscribe to mediaplayer death later.
8f4f4f1 Merge "hwc: Processing of HDMI connection request when WFD is active"
1a17f11 libhwcomposer: add dynamic thresold support for copybit.
b9d3db0 Merge "hwc: Use correct z-order in video overlay"
a762b96 qdutils: Retrieve MDP revision and pipes information from driver.
8c0b01b hwc: Use correct z-order in video overlay
4d87dc2 hwc: Processing of HDMI connection request when WFD is active
6e38e57 Merge "gralloc: Override gralloc calculated size only if bufferSize is greater."
27c04a0 Merge "hwc/overlay: Video on 4k2k external, 4k2k rotation."
36b9bbe gralloc: Override gralloc calculated size only if bufferSize is greater.
48f3cbe Merge "hwc: Handle WFD Pause/Resume usecase"
9d4358b hwc/overlay: Video on 4k2k external, 4k2k rotation.
53973c6 Merge "display: Remove genlock usage"
bdcf348 display: Remove genlock usage
17641a5 Merge "gralloc: Fix incorrect flag usage on old ion API"
9fcb487 Merge "hwc: Check for correct screen state before enabling vsync"
9993a4e Merge "overlay: Reset allocation on all pipes, if commit fails."
5aa54f0 hwc: Check for correct screen state before enabling vsync
e25c256 Merge "hwc: handle blank/unblank for virtual display explicitly."
e0dff93 overlay: Reset allocation on all pipes, if commit fails.
59e090a gralloc: Fix incorrect flag usage on old ion API
2075047 Merge "hwc: Process only MAX_NUM_LAYERS"
8e125fb Merge "display: Add hook for triggering screen update"
82d2341 Merge "gralloc: Allow IOMMU memory to be uncached"
c59aa2f hwc: Process only MAX_NUM_LAYERS
25dbddf Merge "libexternal: prefix the property name with hw"
e9ccee9 Merge "hwc: Use intermediate buffers for copybit"
6b93e3a hwc: handle blank/unblank for virtual display explicitly.
64b8121 hwc: Use intermediate buffers for copybit
db770e2 Merge "libhwcomposer: MDP composition for Higher Resolution panels"
69d9585 display: Add hook for triggering screen update
d6453ae gralloc: Allow IOMMU memory to be uncached
edddf92 Merge "hwc: Close acquireFenceFds always."
d477cd5 Merge "libcopybit: update the target config_mask for transformation"
b551ce4 libhwcomposer: MDP composition for Higher Resolution panels
747af1e hwc: Close acquireFenceFds always.
037b1e1 hwc: Handle WFD Pause/Resume usecase
93dfb3a Merge "hwc: Get notified on media player death."
9bd380d Merge "hwc: Allow HWC to support Virtual Display"
587b0da libexternal: prefix the property name with hw
b2fc956 libcopybit: update the target config_mask for transformation
11a380d hwc: Allow HWC to support Virtual Display
e8224c1 Merge "overlay: Fix rotator output buffer size."
b6472c2 Merge "overlay: Add support for pipe dumps."
0d0a7cb overlay: Add support for pipe dumps.
3a660a7 Merge "display: Close 0 fds"
6ff05f7 Merge "display: Do not align down input rotator src height"
7128e50 hwc: Get notified on media player death.
1eeabd5 Merge "libgralloc: Get the stride information from libadreno_utils.so"
4ca8f3a display: Do not align down input rotator src height
fc3652f overlay: Fix rotator output buffer size.
01f5c8e libgralloc: Get the stride information from libadreno_utils.so
f53b377 display: Close 0 fds
d80b718 Merge "qdutils: Default to GPU composition"
d8cfc69 Merge "libgralloc: Add Perform function to get the stride."
fccd364 Merge "libqservice: Add a client interface."
f912294 Merge "libhwcomposer: Only 4 pipes can be used per display for MDP Comp."
86c1729 libqservice: Add a client interface.
91dae25 Merge "hwc: Log if vsync read takes more than 2 expected vsyncs"
501cf7b qdutils: Default to GPU composition
a44100c libgralloc: Add Perform function to get the stride.
69f2bb2 libhwcomposer: Only 4 pipes can be used per display for MDP Comp.
ef3efaf Merge "liboverlay: Set mdp src format as rotator output format."
961407f Merge "display: Reconcile display HALs"
24f2005 hwc: Log if vsync read takes more than 2 expected vsyncs
c4ba968 Merge "liboverlay: Fix stride alignment issue for s/w decoded video."
b4d184f liboverlay: Fix stride alignment issue for s/w decoded video.
586ccdc Merge "overlay: Remove unnecessary lock."
87293b7 Merge "hwc: Call MSMFB_DISPLAY_COMMIT even if FB handle is null."
7f29ba1 Merge "hwc: Don't use MDP for buffers of width less than 5"
d46feac Merge "gralloc: Do not set ION_SECURE for non-contiguous heaps"
c645920 Merge "libhwcomposer: Don't count video layers marked for SKIP"
90f8b98 Merge "libexternal: change the order of ioctl call for HDMI"
e4d9fd2 Merge "display: Add support for overscan compensation for ext display"
23f69b2 liboverlay: Set mdp src format as rotator output format.
c18dbc2 hwc: Don't use MDP for buffers of width less than 5
73d36df Update copyright to The Linux Foundation
7421472 display: Reconcile display HALs
7535aba libhwcomposer: Don't count video layers marked for SKIP
3b6d111 Merge "hwc: Pass transform value while cropping dst rect"
d81f9e8 overlay: Remove unnecessary lock.
4b9784e gralloc: Do not set ION_SECURE for non-contiguous heaps
e1cea3e libexternal: change the order of ioctl call for HDMI
4333330 hwc: Call MSMFB_DISPLAY_COMMIT even if FB handle is null.
feb2d8a display: Add support for overscan compensation for ext display
74c8d7c Merge "hwc: Do not set Secure flags for UI layers"
8f7a94f hwc: Pass transform value while cropping dst rect
c94f2f1 Merge "libhwcomposer: Allow 2 YUV layer frames to use MDP composition"
dc01a53 hwc: Do not set Secure flags for UI layers
ef72483 Merge "display: Reset metadata pointer to NULL during unmap."
cf53700 libhwcomposer: Allow 2 YUV layer frames to use MDP composition
7bf31c3 display: Reset metadata pointer to NULL during unmap.
c8a0fc7 Merge "external: use metadata ioctl to set vic"
757b82e Merge "Merge commit 'android-4.2.1_r1' into Upgrade_branch"
f472a8c Merge "libexternal: set hw.hdmiON system property"
7ac2ba4 Merge "liboverlay: Rotator-assisted MDP downscaling of videos."
79f6483 Merge "hwc: Invoke commit ioctl even if there are no app layers"
288f8c7 liboverlay: Rotator-assisted MDP downscaling of videos.
bdc2fdc Merge "gralloc: Remove update rect"
751afc5 Merge commit 'android-4.2.1_r1' into Upgrade_branch
57fbcfe Merge "overlay: mdssRot: Do not reset non-rotation flags."
7b03a95 external: use metadata ioctl to set vic
57e3c81 hwc: Invoke commit ioctl even if there are no app layers
f8bba3b Merge "hwcomposer: In Mdss,secure content policy applies to layer buffer"
029efcb Merge "display: Use GRALLOC_USAGE_PROTECTED to indicate secure content"
2515abf hwcomposer: In Mdss,secure content policy applies to layer buffer
7651a80 display: Use GRALLOC_USAGE_PROTECTED to indicate secure content
6f8ca31 gralloc: Remove update rect
bfc79c2 libexternal: set hw.hdmiON system property
8714496 Merge "libgralloc: force 1M alignment for secure buffers"
95e4c9f overlay: mdssRot: Do not reset non-rotation flags.
3ef9e10 Merge "libcopybit: Merge copybit HAL from jb"
ad2322a Merge "hwc: Add support for copybit(C2D) composition"
92892d5 Merge "libcopybit: Add Async mode support for C2D"
55f775b Merge "Update buffer dimensions with new dimension"
4d0f451 Merge "display: use metadata ioctl to get panel frame rate"
998bdf7 Merge "overlay: mdssRot: Fix the logic for setting Rotator info flags."
6e6f9a9 display: use metadata ioctl to get panel frame rate
d78d153 Merge "display: Add NULL check for metadata"
4e931c1 libgralloc: force 1M alignment for secure buffers
361da4f hwc: Add support for copybit(C2D) composition
eb128aa libcopybit: Add Async mode support for C2D
12b103b display: Add NULL check for metadata
bbca629 overlay: mdssRot: Fix the logic for setting Rotator info flags.
6b353bd libcopybit: Merge copybit HAL from jb
6e04471 Merge "overlay: mdssRot: Fix stale rotation flag values."
f51bfae Merge "libgralloc: Add support for custom buffer size."
018b7d2 Merge "display: Return MDP pipe availability per display type"
8a91d84 Merge "hwc: commit changes for ext display on blank"
ccb4460 display: Return MDP pipe availability per display type
08c65b3 overlay: mdssRot: Fix stale rotation flag values.
ba9eed5 hwc: commit changes for ext display on blank
61f5b30 Merge "libexternal: Add support for changing resolution on HDMI"
a41a79d Merge "hwc: Delay HDMI/WFD connection request by one frame"
b89712e Merge "hwc: mdpcomp: Restructure for 4kx2k displays"
4bafd80 Merge "liboverlay: Mdss Rotator secure buffer needs to be aligned to 1M."
711529a Merge "liboverlay: Enable secure content flag in Mdss Rotator."
d772a47 Merge "liboverlay: Check for target specific flag for older platforms."
37552c5 libexternal: Add support for changing resolution on HDMI
75526f5 hwc: Delay HDMI/WFD connection request by one frame
81c4e7d liboverlay: Check for target specific flag for older platforms.
cbf7ccc hwc: mdpcomp: Restructure for 4kx2k displays
3e3a85e Merge "display: Add display metadata in buffer handle"
47573e2 display: Add display metadata in buffer handle
6e3fab8 liboverlay: Mdss Rotator secure buffer needs to be aligned to 1M.
faae042 liboverlay: Enable secure content flag in Mdss Rotator.
28b1743 Merge "hwc: Handle ext display device conn/disconn requests"
c6be1fe Merge "hwc: Retry vsync on EBUSY"
30362c7 Merge "hwc: Support swap interval zero"
db069ae Merge "hwc: Support 4kx2k FB for Primary and External."
812e368 Merge "mdssRotator:For Venus, rotator buffer size depends on rotated w/h"
6274938 Merge "libgralloc: Calculate aligned width & height using common header"
497f9f3 Merge "libgralloc: Import header for Venus buffer size calculation"
b10971a Merge "display: Add support for Venus color format for newer platforms"
cf053c6 hwc: Support 4kx2k FB for Primary and External.
fbffad7 mdssRotator:For Venus, rotator buffer size depends on rotated w/h
73dcce4 libgralloc: Calculate aligned width & height using common header
e8a0179 libgralloc: Import header for Venus buffer size calculation
c5e6148 display: Add support for Venus color format for newer platforms
3d4c0ac libgralloc: Add support for custom buffer size.
92fc130 hwc: Retry vsync on EBUSY
e37e571 hwc: Handle ext display device conn/disconn requests
94baddc hwc: Support swap interval zero
bd6eea2 Merge "libcopybit: Correct AOSP license marking."
8fb0d32 libcopybit: Correct AOSP license marking.
62f0399 Merge "gralloc: set ION_SECURE to flags instead of heap_mask during ion alloc."
d74f5f3 Merge "gralloc: Mark framebuffer as ION memory"
9f4b113 Merge "display: Standardize log-tags for qcom display logs."
62e3474 Merge "hwc: Fix issue with Layercache"
109ab1e Merge "display: Add target specific flag to support Venus color format"
9b91262 Merge "libgralloc: Change ion_allocation_data fields." into jb_2.5
3b7e997 Merge "libgralloc: Use ION_IOC_CUSTOM instead of MSM-specific ioctls" into jb_2.5
8df2ebf hwc: Fix issue with Layercache
449cd8d Merge "overlay: Do not unset overlay for MSMFB_NEW_REQUEST"
1e461a1 Merge "hwc: User Layercache for external display"
18aafb7 Merge "hwc: Remove buffer_fence definition as it is not used"
9e44256 Merge "external: memset commit struct"
d7f8427 gralloc: Mark framebuffer as ION memory
e78f052 hwc: User Layercache for external display
dec98cc display: Standardize log-tags for qcom display logs.
c6bd6d9 display: Add target specific flag to support Venus color format
ba48b01 overlay: Do not unset overlay for MSMFB_NEW_REQUEST
c180c4e gralloc: set ION_SECURE to flags instead of heap_mask during ion alloc.
3f2323f hwc: Remove buffer_fence definition as it is not used
9da8466 external: memset commit struct
d95c408 libgralloc: Change ion_allocation_data fields.
ece296e libgralloc: Use ION_IOC_CUSTOM instead of MSM-specific ioctls
e97c35f Merge "display: Use fences for all targets"
a23bb55 Merge "overlay: Do not clean up pipes at bootup for MDSS"
f2341e3 Merge "hwc: Implement dump function"
5182a78 hwc: support WFD external display
f6f49a1 hwc: changes for hdmi hotplug and hpd
4ca423e display: Use fences for all targets
1d183f5 hwc: Implement dump function
ff5c530 overlay: Do not clean up pipes at bootup for MDSS
935cb68 Update buffer dimensions with new dimension
74d978a display: Fix includes
018e545 hwc: Avoid MDP composition with alpha scaling
a256748 hwc: Use number of app layers from the hwc context.
76e313c hwc: Disable mixed mode composition for secure videos
768619e libgralloc: Discontinue allocating FB buffers from carveout.
54821fe libhwcomposer: Add support for 4 layer MDP Comp
758bfc5 hwc/overlay: Dynamic pipe tracking.
da10c14 hwc: Add support for faking vsync
b1c7632 hwc: cache layers on framebuffer
09549f6 display: Add support for flip operation in MDP comp
276e9f5 hwc: dont return from vsync thread when read fails.
c21013b overlay: Compile MDSS rotator even when headers not present
4844e43 Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into mybranch
f8661e4 merge in jb-mr1-release history after reset to jb-mr1-dev
2edd033 chmod uga-x
fea70fc Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into HEAD
d6cc450 merge in jb-mr1-release history after reset to jb-mr1-dev
08212c0 hwc: Open sysfs node when thread is initialized.
2a018d1 merge in jb-mr1-release history after reset to jb-mr1-dev
eaf6791 hwc: Return failure code if hwc_set fails to draw
40a1cc5 hwc: Create releaseFd even if no HWC layers
1a8cda0 hwc: clean up overlay for external from the draw thread only
94fccaf merge in jb-mr1-release history after reset to jb-mr1-dev
f83d448 HWC: Protect hwc_set from async events
541b59d hwc: external: Add screen-fitting to external panel.
0f9c397 hwc: add some logging
b6aa2f1 merge in jb-mr1-release history after reset to jb-mr1-dev
27c1d65 hwc: utils: Include orientation while screen-fitting.
c5d4822 merge in jb-mr1-release history after reset to jb-mr1-dev
c23b380 overlay: mdprot: Call rotator start only on config change.
dbcb4f3 merge in jb-mr1-release history after reset to jb-mr1-dev
150806a hwc: fix for not ignoring framebuffer
7980f10 hwc: don't open sysfs on every iteration
725dd86 hwc/overlay: Add premultiplied alpha support.
f9a7ef2 hwc: external: Cleanup overlay objects on external disconnect.
18bcd14 display/libhwcomposer: fix potential memory leak
4014777 hwc: don't open sysfs on every iteration
91a6a99 hwc/overlay: Add premultiplied alpha support.
e4f3f72 hwc: external: Cleanup overlay objects on external disconnect.
52ca6d2 display/libhwcomposer: fix potential memory leak
8ae9c59 merge in jb-mr1-release history after reset to jb-mr1-dev
ae823e7 hwc: more error checks
6d9d168 hwc: Remove call to glFinish
cd89f8c hwc: Skip secure buffers in non secure mode
d8e715f hwc: move enable disable ioctls to vsync thread
c52b330 hwc: fix some race conditions
cb5f25b hwc: Skip secure buffers in non secure mode
c7faa70 hwc: move enable disable ioctls to vsync thread
eac8965 hwc: fix some race conditions
36345b9 don't call vsync-ctrl ioctl for same enable value
1ef881c don't call vsync-ctrl ioctl for same enable value
84693f0 merge in jb-mr1-release history after reset to jb-mr1-dev
c4d034f hwc: enable dual display on hwc 1.1
d80a52c gralloc:  Send first 2 FB buffers to carveout and next to IOMMU
32aa90f hwc: Use asynchronous commit ioctl for display post
ff4f025 hwcomposer : Use sysfs to read vysnc information
68b88cf hwc: Handle non secure buffers
d6fd637 merge in jb-mr1-release history after reset to jb-mr1-dev
32ff225 hwc: Make blank wait for set to complete
848de19 merge in jb-mr1-release history after reset to jb-mr1-dev
3825f25 libexternal: Call new IOCTL to commit on external display
9dbd53a hwc: Close unused pipes before PAN
23f8309 hwc: Call sync before draw.
3b95b4c hwc: Fix tearing on HDMI. Call glFinish()
aee5e6e hwc: Close unused pipes before PAN
8c8bfd2 hwc: Call sync before draw.
3d2a790 hwc: Fix tearing on HDMI. Call glFinish()
f8f79fb hwc: Check for the validity of the fb layer
65eedd5 hwc: Fix dpi values reported
6282c95 hwc: Check for the validity of the fb layer
7b80d9c hwc: Fix dpi values reported
daaaebc merge in jb-mr1-release history after reset to jb-mr1-dev
86623d7 (TEMP) hwc: external: Enable default mirroring on hwc1.1
3e858eb hwc: hwc 1.1 implementation
52fc4cd hwc: qservice: Pass through binder calls
d6fdfbf merge in jb-mr1-release history after reset to jb-mr1-dev
2dd04a8 hwc: sync-point implementation.
d1bd318 merge in jb-mr1-release history after reset to jb-mr1-dev
0a03dd8 genlock: conditionally enable genlock from Android.mk for msm8960
35712cb hwc: Use overlay for video even during popups.
649cda6 hwc: Minor bug fixes.
56f610d display: Create QService binder interface.
80692ef hwc: add more debug print
bfe0f3a liboverlay: close all the opened pipes after framework reboot.
cb3da0a liboverlay: close all the opened pipes after framework reboot.
c9829cd hwc: Add non-zero checks. Move warning log.
9171ec6 hwc: Add non-zero checks. Move warning log.
e895257 merge in jb-mr1-release history after reset to jb-mr1-dev
e557e6e fb: Remove extra PUT_VSCREENINFO call.
aa537df hwc: Add some debug and warning logs.
127177c libgralloc: remove pid checks
139e162 libgralloc: remove pid checks
799a397 display: Enable MDP pixel repeat on MDP Composition.
1023ce2 hwc: video: Create crop and position structs only once.
ae1044e Overlay: Change MDP format for YV12 buffers
9c876d9 overlay: Remove OVASSERT from getFormatString utility
aedf236 gralloc: Check for HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
79cf7c7 Gralloc: Fall back to HW_CAMERA_WRITE if HW_VIDEO_ENCODER is not set.
661a58f hwc: Do not create copybit.
2e2798c hwc: Fix fps calculation.

   * hardware/qcom/gps
ca269d7 GPS: Fixes a problem stopping the engine while an AGPS data is active
48717e9 GPS: Changes to create loc_ni_thread locally
4580ebf GPS: Fixes mFixInterval = 0 issue in gingerbread
9816587 libloc_api: fix status reporting
417373f libloc_api: xtra injection improvements
44bf272 libloc: remove duplicate entry
7776872 qcom gps: Use standalone position mode if no agps servers are set
80a6e9b Add LIBLOC_USE_GPS_PRIVACY_LOCK needed to get GPS to work when AMSS=50000 (like on HTC Pyramid)
db827eb qcom/gps: add TARGET_PROVIDES_GPS_LOC_API
09ce8ac Split API 50000 support
9822b47 Updates to build with JB
442dd14 libloc_api-rpc: retry calls when busy
fedc059 libloc_api: create deferred action thread after client is opened
3380e60 libloc_api: provide a default timeout/accuracy for 1240 fix criteria
aaa6899 libloc_api: do xtra when cb is registered, and retry on fail
caba398 libloc_api: use privacy lock on 1240 too
836146a libloc_api: fix possible use of uninitialized variable
0cbbff7 Convert bearing/heading from 10 bit value to degrees on locapi 20000
905e6e4 locapi: Add support for locapi version 20000/20002
cf14750 locapi: Add support for locapi version 50000
1eda0de gps: Add support for sync ioctls
89bcdd5 Destroy client handles after they're closed
aee6a0e loc_api: Remove support for AMSS 6225
c0b599a gps: Bugfixes and improvements from CodeAurora
b2b1dd6 loc_api: Add support for AMSS 6225
1778842 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/qcom/gps into aosp
63ab38b loc_api: Fix string null termination.
2834865 merge in jb-mr1-release history after reset to jb-mr1-dev
c74962d chmod uga-x
6f1ee47 merge in jb-mr1-release history after reset to jb-mr1-dev
9365bf1 gps: fix for no gps signals after modem reset
fb4152c disabled agps state machine delete in cleanup
d12dd7f gps: report session begin/end on gps start/stop
586a62c Merge "gps: report session begin/end on gps start/stop" into jb-mr1-dev
205590a disabled agps state machine delete in cleanup
56de3d4 gps: report session begin/end on gps start/stop
6f36c0e Silence more gps function tracing logs
ca35382 gps: Fix typo in checking for qmi-framework
197fe08 dynamically build and load adapter libs
ac8fa07 gps: control session state evt from HAL, not modem
0620ede Reduce default logging verbosity to error & warning logs only

   * hardware/qcom/keymaster
46bf12b Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/qcom/keymaster into cm-10.1
fb5cdde keymaster: Add keymaster implementation
3816bf0 Initial empty repository

   * hardware/qcom/media
aaad461 Only build when no media variant is set, and display variant isn't legacy
9b1d0f2 media: Only build when no variant is set
f480d5c mm-video: Use actual kernel headers for all builds
2ec7495 mm-video: vdec: conditionally revert metadata patch
68f95bd Tiny fixes for building on vanilla display driver.
a58dea5 Merge branch 'jb_2.5' of git://codeaurora.org/platform/hardware/qcom/media into d2
eae77fc Merge "mm_video: vidc: Handle consecutive start code in demux table"
1fd423c mm_video: vidc: Handle consecutive start code in demux table
04e65f6 Don't build for qcom legacy
e38cc75 Merge "mm-video: vidc: Close ION_IOC_MAP fd before closing ION device fd"
f2473ff mm-video: vidc: Close ION_IOC_MAP fd before closing ION device fd
462171e Merge "mm-video: Return correct value from extract_rbsp"
bfadb54 mm-video: Return correct value from extract_rbsp
ca904de Merge "mm-video: vidc: Suppress non-fatal error messages"
0a2cf85 Merge "vidc:venc: Reject changing number of B-frames dynamically"
6eb77e8 Merge "mm-video: vidc: allocate color conversion buffers as uncached"
5db7e11 Merge "QCTimedText: Avoid recycling parcel while parsing parcel"
b9e0bb9 Merge "mm-video: vdec: Amend logic to send playback error"
738a6ea media: Better ION version compatibility
08eb38b QCTimedText: Avoid recycling parcel while parsing parcel
271d25d media: Better compatibility with new KGSL
c159212 mm-video: vidc: allocate color conversion buffers as uncached
1600603 mm-video: vidc: Suppress non-fatal error messages
d5a973a vidc:venc: Reject changing number of B-frames dynamically
8514ee8 Merge "dashplayer: Fix to avoid crash during back to back playback"
502bf25 Merge "mm-video: vdec: Notify display about the format of video playback"
4f1e077 Merge "mm-video: vdec: Remove genlock lib dependency"
5dce999 mm-video: vdec: Remove genlock lib dependency
84d5bf5 mm-video: Support for QCOM_BSP define
003bb7d Merge "audio: add wmaLossLess decoder component"
ab1f42b mm-video: vdec: Amend logic to send playback error
41da192 mm-video: vdec: Notify display about the format of video playback
dde8bcd audio: add wmaLossLess decoder component
dbe5573 Merge branch 'jb_2.5' of git://codeaurora.org/platform/hardware/qcom/media into caf
4323d63 Merge "mm-video: vdec: Add additional dependencies in make file"
2fe8931 Merge "dashplayer: Replace ACodec with DashCodec"
a59fb7e dashplayer: Fix to avoid crash during back to back playback
f1532cd Merge "mm-core: Add support to configure ISO or ARIB coefficients"
f262710 dashplayer: Replace ACodec with DashCodec
068a1ce mm-video: vdec: Add additional dependencies in make file
4a32e77 Merge "DashPlayer: Following fixes are added in DashPlayer"
71b29e1 Merge "dashplayer: Memoryleak fix and fps calculation during buffering"
c648e5b Merge "mm-video: Fix coverity errors"
e046014 Merge "mm-video: venc: Add NV21 color format support"
c4e8e17 Merge "mm-video: vidc: Add support for Smooth streaming for secure mode playback."
01bf94f Merge "mm-core: Add support for Smooth streaming for secure mode playback."
5512d95 mm-core: Add support to configure ISO or ARIB coefficients
b0ca2f2 mm-video: venc: always align buffer before ion_map_iommu
1bf64f9 Add back check for msm7x30 that got lost in merge
df61921 vdec: Add ifdefs to featurize extended user metadata
4f24c4a Merge "mm-video: vdec: Remove genlock calls from userspace"
5a20858 DashPlayer: Following fixes are added in DashPlayer
b909888 Add ifdefs for target-specific and optional features
ba9e6c4 Remove dependency on kernel headers
90f2d23 Merge branch 'jb_2.5' of git://codeaurora.org/platform/hardware/qcom/media into cm-10.1
8519534 mm-video: Fix coverity errors
91adb11 mm-video: venc: Add NV21 color format support
a7f5146 mm-video: vidc: Add support for Smooth streaming for secure mode playback.
bf53603 mm-core: Add support for Smooth streaming for secure mode playback.
fee8e6a dashplayer: Memoryleak fix and fps calculation during buffering
7a16b34 Merge "mm-video: vdec: Separate meta buffers support in secure mode"
b8007ab Merge "mm-video: Fix component_init() failed use cases"
b4d445b Update copyright to The Linux Foundation
079b47f Merge "mm-core: Add key for HFR encoding"
c27c650 Merge "Merge "mm-core: Add key for HFR encoding""
e8916cf Merge "mm-core: Add key for HFR encoding"
b1e4356 Merge "dashplayer: add text track support"
b730b07 Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"
798dba5 Merge "mm-core: Add key for HFR encoding"
c87983a mm-video: vdec: Remove genlock calls from userspace
1439b74 Merge "mm-video: Fix API for getting supported profile and level"
877d16b mm-video: Fix API for getting supported profile and level
578b244 mm-video: vdec: Separate meta buffers support in secure mode
4390a84 Merge "Revert "mm-video:vdec: Separate meta buffers support in secure mode""
83c4b41 Merge "vidc: venc: Disable slice mode for unsupported settings"
ae7b692 mm-core: Add key for HFR encoding
f0d7e38 mm-video: Fix component_init() failed use cases
67d7891 Revert "mm-video:vdec: Separate meta buffers support in secure mode"
91a79da Merge "mm-video:vdec: Separate meta buffers support in secure mode"
85ab05c Merge "mm-core: Add registry table for mpeg2 secure playback"
786eac9 Merge "mm-video: Build video test programs with 'debug' tag"
fba49c6 mm-video:vdec: Separate meta buffers support in secure mode
9434492 mm-core: Add registry table for mpeg2 secure playback
cc3ef66 Merge "mm-video: vidc: Broadcasts intent for the start and end of secure playback."
57fc3e9 Merge "mm-video: vidc: Try to open secure video decoder again."
333d0e4 media: allow msm8660 into repo
4dc4945 Merge "audio: add support for amrwb/amrwb_plus"
1cf5e50 Merge "Merge commit 'android-4.2.1_r1' into Upgrade_branch"
c54b0c5 vidc: venc: Disable slice mode for unsupported settings
0730d4e mm-video: vidc: Broadcasts intent for the start and end of secure playback.
f4f91d3 mm-video: vidc: Try to open secure video decoder again.
613757d Merge "dashplayer: add text track support"
432ff70 Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"
ecdd147 Merge "dashplayer: add text track support"
b927b97 Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"
b6e3186 Merge "vidc: Amend output timestamp check condition"
d9443f8 vidc: Amend output timestamp check condition
76bab27 dashplayer: add text track support
45993aa qcmediaplayer: Add qcmediaplayer for supporting DASH
68bbda4 Merge "dashplayer: Add new player for supporting DASH"
b3063f7 Merge "mm-core: Add kKeySmoothStreaming"
fcd69b7 dashplayer: Add new player for supporting DASH
8ff1b99 Merge "mm-video: msm_fb_unset and msm_fb_play should be followed by pan update."
a07f77f mm-core: Add kKeySmoothStreaming
d24f951 Revert "mm-video:vidc: Add the handling of MPEG-2 extension and user data."
9032e62 vidc: Align ion buffer length before allocating it
c1ff52c mm-video: Use CM standard qcom naming
4f18344 mm-video:venc: Add required ION Heap ID for video encoder buffers
48adc90 mm-core: initial video bring-up on 8x55 target
1b999de mm-video:vdec: Video decoder bring-up on 8x55 target
b3cdfe8 Initial 8x55 mr1 bring up
c57133a mm-video: Fix for debug log messages support
9c1cd53 mm_video: vidc: Align input buffer size for vdec.
2e9ee4b mm-core: Add support for display aspect ratio info.
4ab76f2 mm-video: Add support for display aspect ratio info.
49d10de mm-video: vidc: Add support for MPEG-2 sample aspect ratio.
065f982 mm-video: vidc: Add PAR value extradata support for H264.
25fdd6e mm-core: Add MPEG-2 extension and user data types.
76c7c96 mm-video:vidc: Add the handling of MPEG-2 extension and user data.
192c739 mm-video: msm_fb_unset and msm_fb_play should be followed by pan update.
4046ee4 Merge "mm-video: Fix for debug log messages support"
fa5b0b2 Merge commit 'android-4.2.1_r1' into Upgrade_branch
d05d8b1 mm-video: Build video test programs with 'debug' tag
1ad646c mm-video: Fix for debug log messages support
955cba4 Merge "mm_video: vidc: Align input buffer size for vdec."
7ce8cc7 Merge "mm-core: Add support for display aspect ratio info."
7f225b2 Merge "mm-video: Add support for display aspect ratio info."
1b51762 Merge "mm-video: vidc: Add support for MPEG-2 sample aspect ratio."
e43f4fd Merge "mm-video: vidc: Add PAR value extradata support for H264."
d484095 Merge "mm-core: Add MPEG-2 extension and user data types."
248ac07 Merge "mm-video:vidc: Add the handling of MPEG-2 extension and user data."
c77d08e audio: add support for amrwb/amrwb_plus
420b4bf mm_video: vidc: Align input buffer size for vdec.
12920de mm-core: Add support for display aspect ratio info.
ec54f3a mm-video: Add support for display aspect ratio info.
4b9413f mm-video: vidc: Add support for MPEG-2 sample aspect ratio.
800440a mm-video: vidc: Add PAR value extradata support for H264.
570ca52 mm-core: Add MPEG-2 extension and user data types.
c050b50 mm-video:vidc: Add the handling of MPEG-2 extension and user data.
240cae0 Merge "mm-video: Change kernel headers search path"
7dce647 mm-video: Change kernel headers search path
83f3e34 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/qcom/media into aosp
c22d97c media: Compensate for alternate display variant
ee6318b mm-core: Adds support for encryption type request.
aed6a71 DivxDrmDecrypt: Export the header\include file
889bef0 mm-core: Add QC specific MetaData and MediaDefs
b83b6bc mm-core: remove duplicate color format enum
4625656 Merge "omx_vdec: default case for get profile levels"
b094822 omx_vdec: default case for get profile levels
80fddc1 Merge "mm-video: set ION_SECURE to flags instead of heap_mask during ion alloc."
0c3c248 mm-video: set ION_SECURE to flags instead of heap_mask during ion alloc.
4795692 mm-video: port heap mask change to ion.
47b6a6c Merge "mm-core: remove duplicate color format enum"
8965db1 mm-core: Adds support for encryption type request.
07d951c Merge "DivxDrmDecrypt: Export the header\include file" into jb_2.5
13af3b9 DivxDrmDecrypt: Export the header\include file
0345321 mm-core: Add QC specific MetaData and MediaDefs
f21cb9f Revert "mm-video: use only IOMMU heap for non-secure playback"
62d7fc2 mm-core: remove duplicate color format enum
3a0f454 Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into mybranch
7a716fd merge in jb-mr1-release history after reset to jb-mr1-dev
62f3c8e chmod uga-x
3635183 Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into HEAD
9b65cd6 merge in jb-mr1-release history after reset to jb-mr1-dev
e77c68a vdec: Use proper message identifier during input flush
f4a01b1 merge in jb-mr1-release history after reset to jb-mr1-dev
bea3944 Merge "mm-video: use only IOMMU heap for non-secure playback" into jb-mr1-dev
a370c15 mm-video: use only IOMMU heap for non-secure playback
3145f89 mm-video: vidc: Allow client to request inband video header
6798a13 merge in jb-mr1-release history after reset to jb-mr1-dev
fcb1a02 mm-video: secure/unsecure display calls
804ba2c merge in jb-mr1-release history after reset to jb-mr1-dev
40f34d8 mm-video: Add support for ouput buffers color conversion.
a01b803 colorconvert: YUV420 Planar support
19afafb Add Tile4x2 support to color convertor
7aefb02 merge in jb-mr1-release history after reset to jb-mr1-dev
2d1936c libc2dcolorconvert: Avoid excessive logging
3241b5a libc2dcolorconvert: Add flag for RGBA8888 endianness correctness
35720aa libc2dcolorconvert: Add flag for RGBA8888 endianness correctness
7783f07 vidc: Support for secure encoding session.
73da82a mm-core: Support for secure encoder component.
2a914b3 Buffer size calculation corrections for NV12_2K
45b5b3b vidc: handle incorrect buffer size from c2d.
2fd0565 mm-video: venc: Align the buffer size to 4K for ION memory.

   * hardware/qcom/media-caf
f6378da mm-video: Fix compile error on 7x30.
5234181 Fix compilation issues.
a86473d Merge "mm-video: Get current performance level of video driver"
ee30fca mm-video: Get current performance level of video driver
b9e9e48 Merge "DashPlayer: Notify seek position to dash source"
fcab07f Merge "Fix for the flicker while changing the resolution in DashPlayer"
0b85163 Merge "DashCodec: keep cache of formats to support b2b format change"
8f83aaa Merge "dashplayer: Fix green frame issue on session timeout"
b07ed92 Merge "DashPlayer: Add support for dumpsys in DashPlayer"
0da8138 Merge "mm-video: vdec: Allow client to set TURBO mode"
0affacc DashPlayer: Notify seek position to dash source
2033893 DashPlayer: Add support for dumpsys in DashPlayer
db94834 Merge "DashPlayer: Notify position for video EOS buffer immediately"
f517d96 Merge "mm-video: Adjust 3 byte start code address, if multiple DMX entries found"
d8b1827 DashPlayer: Notify position for video EOS buffer immediately
70fa326 mm-video: Adjust 3 byte start code address, if multiple DMX entries found
30ab257 Fix for the flicker while changing the resolution in DashPlayer
0e97ae3 DashCodec: keep cache of formats to support b2b format change
8955875 Merge "mm-video: vidc: Enable data corrupt flag for MPEG2 & VC1 only"
e9cc88d mm-video: vdec: Allow client to set TURBO mode
6b42b49 mm-video: vidc: Enable data corrupt flag for MPEG2 & VC1 only
abe384b Merge "mm-video: Add data corrupt flag on output buffers when required"
d785dfb Merge "mm-video: vdec: Fix movie studio crash"
9f2697c mm-video: vdec: Fix movie studio crash
8d6d0e3 Merge "mm-video: vdec: Handle OMX_IndexConfigCommonOutputCrop in test app"
7dc2b9a mm-video: vdec: Handle OMX_IndexConfigCommonOutputCrop in test app
5c8a68e Merge "mm-video: vdec: Suppress unnecessary event callbacks"
e490702 Merge "mm-video: vdec: Add size and buffer info to platform private"
dc661af mm-video: vdec: Add size and buffer info to platform private
1b5df12 Merge "QCTimedText: Avoid recycling parcel while parsing parcel"
6ee5088 mm-video: Add data corrupt flag on output buffers when required
55b2d1a QCTimedText: Avoid recycling parcel while parsing parcel
de198b6 dashplayer: Fix green frame issue on session timeout
0708cbc mm-video: vdec: Suppress unnecessary event callbacks
abe35c2 Merge "dashplayer: Adjust buffer count for native window"
f001537 Merge "DashPlayer: enable secure output buffers for drm use cases"
676175a Merge "mm-video: vdec: Convey crop information from driver to client"
1bf495c DashPlayer: enable secure output buffers for drm use cases
6b2f85d Merge "DashPlayer:call unregisterHandler in DashPlayer, avoid memory leak"
6c9a549 mm-video: vdec: Convey crop information from driver to client
a48bc3f Merge "dashplayer: Fix seek bar jump during seek"
1f217f9 Merge "mm-video: vidc: Set max resolution when smooth streaming enabled"
3e36959 dashplayer: Adjust buffer count for native window
4e3f0d7 Merge "vidc: venc: Add support for setting QP range parameter"
c127c55 Merge "mm-core: Add support for setting QP range parameter"
7d6eebf mm-video: vidc: Set max resolution when smooth streaming enabled
db3016f Merge "mm-video: Fix issue with port reconfiguration specific clip"
72ae194 Merge "mm-video: vidc: parse extradata in video component"
67db381 Merge "mm-video: vidc: parse extradata in video component"
fa9e018 vidc: venc: Add support for setting QP range parameter
62ba738 mm-core: Add support for setting QP range parameter
c910afd mm-video: Fix issue with port reconfiguration specific clip
42df58d mm-video: vidc: parse extradata in video component
66103f1 dashplayer: Fix seek bar jump during seek
34a7759 Merge "mm-video: Handle input/output flush done events appropriately"
3ebd2c4 mm-video: Handle input/output flush done events appropriately
eae77fc Merge "mm_video: vidc: Handle consecutive start code in demux table"
1fd423c mm_video: vidc: Handle consecutive start code in demux table
e38cc75 Merge "mm-video: vidc: Close ION_IOC_MAP fd before closing ION device fd"
f2473ff mm-video: vidc: Close ION_IOC_MAP fd before closing ION device fd
462171e Merge "mm-video: Return correct value from extract_rbsp"
6d19b34 DashPlayer:call unregisterHandler in DashPlayer, avoid memory leak
bfadb54 mm-video: Return correct value from extract_rbsp
ca904de Merge "mm-video: vidc: Suppress non-fatal error messages"
0a2cf85 Merge "vidc:venc: Reject changing number of B-frames dynamically"
6eb77e8 Merge "mm-video: vidc: allocate color conversion buffers as uncached"
5db7e11 Merge "QCTimedText: Avoid recycling parcel while parsing parcel"
b9e0bb9 Merge "mm-video: vdec: Amend logic to send playback error"
08eb38b QCTimedText: Avoid recycling parcel while parsing parcel
c159212 mm-video: vidc: allocate color conversion buffers as uncached
1600603 mm-video: vidc: Suppress non-fatal error messages
d5a973a vidc:venc: Reject changing number of B-frames dynamically
8514ee8 Merge "dashplayer: Fix to avoid crash during back to back playback"
502bf25 Merge "mm-video: vdec: Notify display about the format of video playback"
4f1e077 Merge "mm-video: vdec: Remove genlock lib dependency"
5dce999 mm-video: vdec: Remove genlock lib dependency
003bb7d Merge "audio: add wmaLossLess decoder component"
ab1f42b mm-video: vdec: Amend logic to send playback error
41da192 mm-video: vdec: Notify display about the format of video playback
dde8bcd audio: add wmaLossLess decoder component
4323d63 Merge "mm-video: vdec: Add additional dependencies in make file"
2fe8931 Merge "dashplayer: Replace ACodec with DashCodec"
a59fb7e dashplayer: Fix to avoid crash during back to back playback
f1532cd Merge "mm-core: Add support to configure ISO or ARIB coefficients"
f262710 dashplayer: Replace ACodec with DashCodec
068a1ce mm-video: vdec: Add additional dependencies in make file
4a32e77 Merge "DashPlayer: Following fixes are added in DashPlayer"
71b29e1 Merge "dashplayer: Memoryleak fix and fps calculation during buffering"
c648e5b Merge "mm-video: Fix coverity errors"
e046014 Merge "mm-video: venc: Add NV21 color format support"
c4e8e17 Merge "mm-video: vidc: Add support for Smooth streaming for secure mode playback."
01bf94f Merge "mm-core: Add support for Smooth streaming for secure mode playback."
5512d95 mm-core: Add support to configure ISO or ARIB coefficients
4f24c4a Merge "mm-video: vdec: Remove genlock calls from userspace"
5a20858 DashPlayer: Following fixes are added in DashPlayer
8519534 mm-video: Fix coverity errors
91adb11 mm-video: venc: Add NV21 color format support
a7f5146 mm-video: vidc: Add support for Smooth streaming for secure mode playback.
bf53603 mm-core: Add support for Smooth streaming for secure mode playback.
fee8e6a dashplayer: Memoryleak fix and fps calculation during buffering
7a16b34 Merge "mm-video: vdec: Separate meta buffers support in secure mode"
b8007ab Merge "mm-video: Fix component_init() failed use cases"
b4d445b Update copyright to The Linux Foundation
079b47f Merge "mm-core: Add key for HFR encoding"
c27c650 Merge "Merge "mm-core: Add key for HFR encoding""
e8916cf Merge "mm-core: Add key for HFR encoding"
b1e4356 Merge "dashplayer: add text track support"
b730b07 Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"
798dba5 Merge "mm-core: Add key for HFR encoding"
c87983a mm-video: vdec: Remove genlock calls from userspace
1439b74 Merge "mm-video: Fix API for getting supported profile and level"
877d16b mm-video: Fix API for getting supported profile and level
578b244 mm-video: vdec: Separate meta buffers support in secure mode
4390a84 Merge "Revert "mm-video:vdec: Separate meta buffers support in secure mode""
83c4b41 Merge "vidc: venc: Disable slice mode for unsupported settings"
ae7b692 mm-core: Add key for HFR encoding
f0d7e38 mm-video: Fix component_init() failed use cases
67d7891 Revert "mm-video:vdec: Separate meta buffers support in secure mode"
91a79da Merge "mm-video:vdec: Separate meta buffers support in secure mode"
85ab05c Merge "mm-core: Add registry table for mpeg2 secure playback"
786eac9 Merge "mm-video: Build video test programs with 'debug' tag"
fba49c6 mm-video:vdec: Separate meta buffers support in secure mode
9434492 mm-core: Add registry table for mpeg2 secure playback
cc3ef66 Merge "mm-video: vidc: Broadcasts intent for the start and end of secure playback."
57fc3e9 Merge "mm-video: vidc: Try to open secure video decoder again."
4dc4945 Merge "audio: add support for amrwb/amrwb_plus"
1cf5e50 Merge "Merge commit 'android-4.2.1_r1' into Upgrade_branch"
c54b0c5 vidc: venc: Disable slice mode for unsupported settings
0730d4e mm-video: vidc: Broadcasts intent for the start and end of secure playback.
f4f91d3 mm-video: vidc: Try to open secure video decoder again.
613757d Merge "dashplayer: add text track support"
432ff70 Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"
ecdd147 Merge "dashplayer: add text track support"
b927b97 Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"
b6e3186 Merge "vidc: Amend output timestamp check condition"
d9443f8 vidc: Amend output timestamp check condition
76bab27 dashplayer: add text track support
45993aa qcmediaplayer: Add qcmediaplayer for supporting DASH
68bbda4 Merge "dashplayer: Add new player for supporting DASH"
b3063f7 Merge "mm-core: Add kKeySmoothStreaming"
fcd69b7 dashplayer: Add new player for supporting DASH
8ff1b99 Merge "mm-video: msm_fb_unset and msm_fb_play should be followed by pan update."
a07f77f mm-core: Add kKeySmoothStreaming
192c739 mm-video: msm_fb_unset and msm_fb_play should be followed by pan update.
4046ee4 Merge "mm-video: Fix for debug log messages support"
fa5b0b2 Merge commit 'android-4.2.1_r1' into Upgrade_branch
d05d8b1 mm-video: Build video test programs with 'debug' tag
1ad646c mm-video: Fix for debug log messages support
955cba4 Merge "mm_video: vidc: Align input buffer size for vdec."
7ce8cc7 Merge "mm-core: Add support for display aspect ratio info."
7f225b2 Merge "mm-video: Add support for display aspect ratio info."
1b51762 Merge "mm-video: vidc: Add support for MPEG-2 sample aspect ratio."
e43f4fd Merge "mm-video: vidc: Add PAR value extradata support for H264."
d484095 Merge "mm-core: Add MPEG-2 extension and user data types."
248ac07 Merge "mm-video:vidc: Add the handling of MPEG-2 extension and user data."
c77d08e audio: add support for amrwb/amrwb_plus
420b4bf mm_video: vidc: Align input buffer size for vdec.
12920de mm-core: Add support for display aspect ratio info.
ec54f3a mm-video: Add support for display aspect ratio info.
4b9413f mm-video: vidc: Add support for MPEG-2 sample aspect ratio.
800440a mm-video: vidc: Add PAR value extradata support for H264.
570ca52 mm-core: Add MPEG-2 extension and user data types.
c050b50 mm-video:vidc: Add the handling of MPEG-2 extension and user data.
240cae0 Merge "mm-video: Change kernel headers search path"
7dce647 mm-video: Change kernel headers search path
4625656 Merge "omx_vdec: default case for get profile levels"
b094822 omx_vdec: default case for get profile levels
80fddc1 Merge "mm-video: set ION_SECURE to flags instead of heap_mask during ion alloc."
0c3c248 mm-video: set ION_SECURE to flags instead of heap_mask during ion alloc.
4795692 mm-video: port heap mask change to ion.
47b6a6c Merge "mm-core: remove duplicate color format enum"
8965db1 mm-core: Adds support for encryption type request.
07d951c Merge "DivxDrmDecrypt: Export the header\include file" into jb_2.5
13af3b9 DivxDrmDecrypt: Export the header\include file
0345321 mm-core: Add QC specific MetaData and MediaDefs
62d7fc2 mm-core: remove duplicate color format enum
3a0f454 Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into mybranch
7a716fd merge in jb-mr1-release history after reset to jb-mr1-dev
62f3c8e chmod uga-x
3635183 Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into HEAD
9b65cd6 merge in jb-mr1-release history after reset to jb-mr1-dev
e77c68a vdec: Use proper message identifier during input flush
f4a01b1 merge in jb-mr1-release history after reset to jb-mr1-dev
bea3944 Merge "mm-video: use only IOMMU heap for non-secure playback" into jb-mr1-dev
a370c15 mm-video: use only IOMMU heap for non-secure playback
3145f89 mm-video: vidc: Allow client to request inband video header
6798a13 merge in jb-mr1-release history after reset to jb-mr1-dev
fcb1a02 mm-video: secure/unsecure display calls
804ba2c merge in jb-mr1-release history after reset to jb-mr1-dev
40f34d8 mm-video: Add support for ouput buffers color conversion.
a01b803 colorconvert: YUV420 Planar support
19afafb Add Tile4x2 support to color convertor
7aefb02 merge in jb-mr1-release history after reset to jb-mr1-dev
2d1936c libc2dcolorconvert: Avoid excessive logging
3241b5a libc2dcolorconvert: Add flag for RGBA8888 endianness correctness
35720aa libc2dcolorconvert: Add flag for RGBA8888 endianness correctness
7783f07 vidc: Support for secure encoding session.
73da82a mm-core: Support for secure encoder component.
2a914b3 Buffer size calculation corrections for NV12_2K
45b5b3b vidc: handle incorrect buffer size from c2d.
2fd0565 mm-video: venc: Align the buffer size to 4K for ION memory.

   * hardware/qcom/msm8960
1527a7f Initial empty repository

   * hardware/qcom/power
53cc747 qcom_power: add TARGET_PROVIDES_POWERHAL
c0973ca chmod uga-x
b59998f clean up and pass touch boost on interactive-on
868f763 initial msm8960 power HAL implementation
4feec74 Initial empty repository

   * hardware/qcom/sensors
07c5bcd Initial empty repository

   * hardware/ril
73aea09 Merge "Rild: Ril should try to write again to the socket EAGAIN error" into cm-10.1
3be105e Rild: Ril should try to write again to the socket EAGAIN error
a46eeb1 Fixes typo in logging string.
e5c01c0 ril.h: sync RIL_RadioTechnology with framework
bf6e0cb Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/hardware/ril into 1.1
ae67953 Update documenation for DATA_REGISTRATION_STATE
88aed70 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/ril into HEAD
ea51a9d Add LTE location information to DATA_REGISTRATION_STATE
d456f40 am a1d41fea: Merge "Add CDMA and multimode support to reference-ril"
a1d41fe Merge "Add CDMA and multimode support to reference-ril"
e964504 Add CDMA and multimode support to reference-ril
9889af0 am d5580e18: Merge "Fix logging for setup_data_call response"
d5580e1 Merge "Fix logging for setup_data_call response"
5638415 Fix logging for setup_data_call response

   * hardware/samsung
20dd0df NFC refactoring
41f25f4 samsung: ril: fix inclusion of secril-client
9a80ef7 samsung: Remove multiple inclusion of RIL
a010d52 Merge "samsung: move ril client out of exynos4" into cm-10.1
ea4af61 samsung: libril: some code cleanup
40b7838 samsung: libril: cleanup debugging code
c0e536a samsung: move ril client out of exynos4
601dc85 samsung: add libril for xmm626x modems
6b226ad Exynos4x12: liblights: ifdef exynos4x12 tabs
41e1d1a exynos4: SecBuffer: add missing c++ ifdefs
09e7e82 exynos4412: update fimg4x
76ea68e Fix macloader buffer overflow
cfaad78 exynos4: hal: include: Exif.h: always keep two decimal places in macros
2b8a73f macloader: add 5C:F8:A1 to murata
7800b3b exynos4210: lights: add missing brightness check
ee21f4b exynos4: Add open source libsecion.
de4b10b exynos3: power: Tuning and cleanups
79b8917 exynos4: update media headers
a7d49af gralloc: Remove hacks
f9f985d gralloc: Add missing GRALLOC_USAGE_HW_FIMC1 logic
1c3297a include ril for exynos4210
84f8d1d macloader: add new murata value
d052b70 Merge "hwc: Pull in updates from exynos3 hwc" into mr1-staging
e6a23d7 hwc: Pull in updates from exynos3 hwc
04470b7 Merge "gralloc: Back out hacks now that Mali-derping is fixed" into mr1-staging
6ab6c16 exynos4: libhwcomposer: disable debugging
19e59a7 gralloc: Back out hacks now that Mali-derping is fixed
6aab55a exynos4: gralloc: fix fimc1/ion logic
3e73708 exynos4: gralloc: Do FIMC1 memory allocations from ION instead of FIMC1
2f662dd gralloc_priv: Remove unused yaddr member
3fc2ca9 gralloc: Let } rejoin its people
1400c15 gralloc: add HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED for video
5125ccc gralloc: avoid using framebuffer
00b0625 gralloc: do it the android way
c5b109b gralloc: hello }, welcome back at your new home
0a4bdb5 gralloc: hello }, what are you doing there?
d288deb gralloc:  Send first 2 FB buffers to carveout and next to UMP
4b20a95 Revert "exynos4: gralloc: higher number of buffers for page flipping"
39aefd0 libhwcomposer: keep window 2 open
8b9deaf exynos4: gralloc: higher number of buffers for page flipping
abfed77 exynos4: hwcomposer: add uevent vsync handling
34f9d5d exynos4: libhwcomposer: update for new api version
1030fe0 exynos4: update gralloc from insignal, modify it to work with libsecion
d573d9b exynos4: add missing pixel format definitions
1503aad Merge "s5pc110: hwcomposer: update to hwcomposer HAL v1 api" into mr1-staging
2c81822 exynos5: remove sources
b9ae8e0 s5pc110: hwcomposer: update to hwcomposer HAL v1 api
c928814 exynos3: libhdmi: initial commit
1386f44 exynos3: hwc: add hdmi support
41b00c3 exynos3: fimc: fix
5b604fa exynos4x12: add nfc package
79e21ef exynos3: omx: moar love for p1
88fda93 exynos3: power HAL: add support for interactive governor
81c2e05 Move macloader to hardware/samsung
76a153a Power HAL: Remove sampling rate change
5bff9ac s5pc110: Add Power HAL (userspace CPU boosting)
3c938a7 exynos3: Implement custom VSYNC IOCTL

   * hardware/samsung_slsi/exynos5
320c939 Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/samsung_slsi/exynos5 into cm-10.1
e1b99ca exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.
5280dde Merge "hwc: Hide layer1 if the FB_TAGET layer is not needed" into jb-mr1.1-dev
0183af7 Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev
a7fc593 exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
0996d9d omx: basecomponent: signal abendStateEvent if componentInit fails
18893a3 hwc: Hide layer1 if the FB_TAGET layer is not needed
f97103b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
7219980 merge in jb-mr1-release history after reset to jb-mr1-dev
d881a0c Allocate enough memory for HAL_PIXL_FORMAT_YV12
32d8a9b merge in jb-mr1-release history after reset to jb-mr1-dev
34d2b94 hardware: samsung_slsi: libcamera2: Fix flash torch mode
7431305 merge in jb-mr1-release history after reset to jb-mr1-dev
c48f017 hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
ca71423 hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
ef5aa71 merge in jb-mr1-release history after reset to jb-mr1-dev
5620845 hwc: Add properties to control hdcp and color range
fdc1efa merge in jb-mr1-release history after reset to jb-mr1-dev
a0648fc hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
6a87e47 hardware: samsung_slsi: libcamera2: clipping fd score to the max score
3a36067 merge in jb-mr1-release history after reset to jb-mr1-dev
3c17a3f hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
69ab516 merge in jb-mr1-release history after reset to jb-mr1-dev
92b0aad hwc: adjust protected content scaling for gscaler width constraints
3e32225 merge in jb-mr1-release history after reset to jb-mr1-dev
d08bf0b Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev
0757ed8 hardware: samsung_slsi: libcamera2: Add 15fps mode support
2f9c21c Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into jb-mr1-dev
d9966f6 Added error handling in the state change from "Load state" to "Idle state".
be10be7 merge in jb-mr1-release history after reset to jb-mr1-dev
2821a82 mobicore: update daemon to handle MobiCore halt status
6ba9ef6 hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode
a9b5ce6 merge in jb-mr1-release history after reset to jb-mr1-dev
5d99ec5 hwc: set Gscaler to narrow RGB for YUV surfaces
bcd3f11 libgscaler: add csc range field
9960fe8 merge in jb-mr1-release history after reset to jb-mr1-dev
af4568d OMX encode component has problem on "idle->execute->idle state change" without input data. This patch fixes the state change (Execute to Idle) bug.
2df010e Merge "CleanSpec.mk should sit at the root of a git project." into jb-mr1-dev
b54c514 Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev
7bb14e2 CleanSpec.mk should sit at the root of a git project.
5403f3c Merge "Don't call my-dir" into jb-mr1-dev
6f81a61 Don't call my-dir
f046c50 mobicore: McClient: add cleanspec so include exports are picked up
6cf5cc6 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
de6a087 hwc: protect on-screen gscaler buffers
63d37df merge in jb-mr1-release history after reset to jb-mr1-dev
7defd0f merge in jb-mr1-factory-release history after reset to jb-mr1-dev
a37db02 hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done
4f31545 merge in jb-mr1-release history after reset to jb-mr1-dev
33aa35f libgscaler: enable/disable hardware content protection during drm playback
05e7676 hardware: samsung_slsi: exynos5: add secure path configure API
cff20e5 merge in jb-mr1-release history after reset to jb-mr1-dev
cb4ed2f hwc: Implement blank per display
1fa868b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
c5e5828 merge in jb-mr1-release history after reset to jb-mr1-dev
3f32ce5 exynos5: hwc: add dst's crop size alignment.
14cfaec merge in jb-mr1-release history after reset to jb-mr1-dev
18c4df9 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
028bf50 merge in jb-mr1-release history after reset to jb-mr1-dev
07ed035 hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method
abf7533 merge in jb-mr1-release history after reset to jb-mr1-dev
5f909cd merge in jb-mr1-release history after reset to jb-mr1-dev
3db6fe6 libcamera2: Round instead of truncate GPS Coords
9c046e3 hardware: samsung_slsi: libcamera2: Change square aspect resolution
a038aa8 hardware: samsung_slsi: libcamera2: Fixed release stream bug.
32cf940 hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress
2ed2aec Revert "STOPSHIP libcamera2: remove device metadata"
bd4aea1 Revert "STOPSHIP libcamera2: remove device metadata"
ab73a88 Align secure video surfaces to 1 MB
ef5f57a Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev
3d63220 merge in jb-mr1-release history after reset to jb-mr1-dev
5e45d46 libgscaler: Fix acquireFenceFd leak with m2m gscalers
ec13dea hwc: always make forward progress in fimd set()
de5fb8e libgscaler: Fix acquireFenceFd leak with m2m gscalers
e43660b libcamera2: Prevent multiple camera open calls
e2068c9 libcamera2: Clean up scary looking dequeue_request returned NULL log message.
4cc86ec gralloc: pad RGB buffers by a minimum of 2 extra lines
5a92fc6 merge in jb-mr1-release history after reset to jb-mr1-dev
3ac7581 Merge "hwc: Use sync fences with m2m gscalers" into jb-mr1-dev
2badde5 Merge "libgscaler: Add support for sync fences" into jb-mr1-dev
b7b6c03 merge in jb-mr1-release history after reset to jb-mr1-dev
7ef20f4 hardware: samsung_slsi: libcamera2: Enable 3DNR
36fe3a1 merge in jb-mr1-release history after reset to jb-mr1-dev
181e92b hwc: Use sync fences with m2m gscalers
9f6d828 libgscaler: Add support for sync fences
ddf663f hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)
ca31bf2 hardware: samsung_slsi: libcamera2: Supports AE region
6caa0c8 hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error
87423e5 hardware: samsung_slsi: libcamera2: Support JPEG quality
71f3bb3 hardware: samsung_slsi: libcamera2: Fix screen blinking on start
0066b2c hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates
faa8826 Merge "hardware: samsung_slsi: libcamera2: Correct front and rear camera info" into jb-mr1-dev
73c6337 hardware: samsung_slsi: libcamera2: Correct front and rear camera info
7b4c132 hardware: exynos5: hwc: add gsc's width alignment constraint.
f5cffcd merge in jb-mr1-release history after reset to jb-mr1-dev
89bb574 hwc: don't logspam about unexpected formats
5258c21 Fix bug in gralloc
fdf73d2 Merge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev
4eaff15 hwc: keep gscaler streaming on between frames
db91191 merge in jb-mr1-release history after reset to jb-mr1-dev
1aebf6d hardware: samsung_slsi: libcamera2: Change FD filtering method
cdd53a9 hardware: samsung_slsi: libcamera2: make sync between pre and main flash
408f616 hardware: samsung_slsi: libcamera2: Fixed crop region mismatch
ce77365 hardware: samsung_slsi: libcamera2: VDIS disable bug fix
d0a2bb6 hardware: samsung_slsi: libcamera2: Protection from re-releasing stream
69d1e6e hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF
572470e hardware: samsung_slsi: libcamera2: Fix black frame after night shot
e9b4224 Merge "Don't map gralloc buffers when you allocate them" into jb-mr1-dev
c605342 hardware: samsung_slsi: libcamera2: Use quirk for metering regions
b7baa98 Don't map gralloc buffers when you allocate them
e2426aa libgscaler: don't reconfigure m2m gscaler every frame
43b5926 libgscaler: split stop operation into discrete wait and stop operations
e98c61a hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
b1fefe4 hwc: Fix video layer colors
a673a0c hwc: Add support for video overlay
07b3ad1 hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
efd9853 hwc: reuse gscaler device between frames
d674382 hwc: reserve one gscaler each for FIMD and HDMI
59acf95 Merge "hwc: Fix video layer colors" into jb-mr1-dev
60b9fbf Merge "hwc: Add support for video overlay" into jb-mr1-dev
6155ddd Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks" into jb-mr1-dev
c68cd00 hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks
c03533b clean kernel headers
36b1ce5 merge in jb-mr1-release history after reset to jb-mr1-dev
d60d7b7 hwc: Fix video layer colors
b550190 hwc: Add support for video overlay
bc5ac35 merge in jb-mr1-release history after reset to jb-mr1-dev
cf59331 hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header
93f9f5d hwc: Use graphic layer and no gscaler for FB TARGET
995bbd5 Merge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb-mr1-dev
58163f2 Merge "hardware: samsung_slsi: libcamera2: Modify FPS range static metadata" into jb-mr1-dev
7ccc361 Merge "hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment" into jb-mr1-dev
2932ace Merge "hwc: enforce minimum window width" into jb-mr1-dev
8b5b807 hardware: samsung_slsi: libcamera2: AE lock bug fix
b814687 hardware: samsung_slsi: libcamera2: Modify FPS range static metadata
4a3f182 hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment
6cc676b gralloc: change align of stride for EXYNOS_YV12
67b2c31 hwc: enforce minimum window width
c06b329 hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL
14dce02 hardware: samsung_slsi: libcamera2: Fix AE state for night mode
48728d4 hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL
40acdcc hardware: samsung_slsi: libcamera2: AF stalling bug fix
83bc290 hardware: samsung_slsi: libcamera2: Supports FPS range metadata
d5b58b0 merge in jb-mr1-release history after reset to jb-mr1-dev
a46f3ff hwc: fix gscaler color order for 565 surfaces
644919a Merge "hwc: switch HDMI gscaler input to RGBX" into jb-mr1-dev
1a0659a merge in jb-mr1-release history after reset to jb-mr1-dev
5d993c3 mobicore: remove useless kernel header
decd610 exynos: mobicore: update Mobicore userspace daemon and libraries
08ab4d0 Merge "exynos_omx: Do not call memset on object to be freed" into jb-mr1-dev
45709e7 hwc: switch HDMI gscaler input to RGBX
2ebe89a exynos_omx: Do not call memset on object to be freed
6b236ec Merge "hwc: reduce blank ioctl EBUSY from error to info" into jb-mr1-dev
7023156 hwc: reduce blank ioctl EBUSY from error to info
405cc12 mobicore: remove useless kernel header
7b143ed exynos: mobicore: update Mobicore userspace daemon and libraries
22b52af merge in jb-mr1-release history after reset to jb-mr1-dev
3943317 Revert "Double the memory in any blob allocations"
3c006f8 hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size
f0708d2 hardware: samsung_slsi: libcamera2: Modify stream release condition
bf96172 hardware: samsung_slsi: libcamera2: ion_map buffers for required case only
1952fb3 Merge "hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP" into jb-mr1-dev
10e122b hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP
2a19eb1 hwc: enforce X-coordinate alignment constraints
dcf2c47 merge in jb-mr1-release history after reset to jb-mr1-dev
080a4c9 hardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug
499c410 hardware: samsung_slsi: libcamera2: Change ISP streamoff sequence
eccb0b8 hardware: samsung_slsi: libcamera2: update meta data region
571d0f1 hardware: samsung_slsi: libcamera2: Fix frame completion scheme
7148436 hardware: samsung_slsi: libcamera2: Preserve SCC info on res change.
2b1fa62 hardware: samsung_slsi: libcamera2: change min fd score value for meta data
70d9c06 hardware: samsung_slsi: libcamera2: support face priority scene mode
90236c4 hardware: samsung_slsi: libcamera2: support flash off mode with ZSL
46bbff7 Merge "clean kernel headers" into jb-mr1-dev
9eb2a02 hwc: support HAL_PIXEL_FORMAT_BGRA_8888
db7d80d clean kernel headers
105be0b hwc: Return a release fence for the FRAMEBUFFER_TARGET layer
133c71a Merge "libgscaler: Add support for sync" into jb-mr1-dev
8a3fc5d hardware: samsung_slsi: libcamera2: bug fix of single AF
1e73adb hardware: samsung_slsi: libcamera2: modify CAF sequence for flash
ddc1ed2 hwc: enable gscaler on RGBX surfaces
5f54c51 libgscaler: Add support for sync
4f43996 hwc: Remove force_fb flag, there's always content for HDMI
48a6954 hwc: Ignore content for HDMI when it is not enabled
8742434 Merge changes I970f5995,I2cf7120a,I2118dee2,Ib6082faa,Iad063164,If454186d,If189904f,I261e454e into jb-mr1-dev
b5c759a Merge "hwc: enable gscaler on RGBX surfaces" into jb-mr1-dev
de48e36 hardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug
2d5655e hardware: samsung_slsi: libcamera2: Change ISP streamoff sequence
7ecf248 hardware: samsung_slsi: libcamera2: update meta data region
041f38d hardware: samsung_slsi: libcamera2: Fix frame completion scheme
f9a0660 hardware: samsung_slsi: libcamera2: Preserve SCC info on res change.
09c45c2 hwc: enable gscaler on RGBX surfaces
c725091 hardware: samsung_slsi: libcamera2: change min fd score value for meta data
275c974 hardware: samsung_slsi: libcamera2: support face priority scene mode
47d3a1e hardware: samsung_slsi: libcamera2: support flash off mode with ZSL
fb0c3b3 Revert "hardware: samsung_slsi: libcamera2: update meta data region"
bb2401f hardware: samsung_slsi: libcamera2: update meta data region
d91918a merge in jb-mr1-release history after reset to jb-mr1-dev
53efd24 Double the memory in any blob allocations
d15fb8b Fix bug in allocation of HAL_PIXEL_FORMAT_BLOB
fe346bb merge in jb-mr1-release history after reset to jb-mr1-dev
a85ec38 hardware: samsung_slsi: libcamera2: Add safety code for frame drop
1c5e692 hardware: samsung_slsi: libcamera2: Increase request queue size
4017b08 hardware: samsung_slsi: libcamera2: Support for disabling thumbnail
90e439c hardware: samsung_slsi: libcamera2: Support reverse order of ZSL setup
f7f8d32 hardware: samsung_slsi: libcamera2: modify CAF sequence for flash
79a06e5 merge in jb-mr1-release history after reset to jb-mr1-dev
5b46229 exynos_omx: multi_thread: Remove hardcoded limit on the max of number of input buffers allowed in video encoders
60d84e8 merge in jb-mr1-release history after reset to jb-mr1-dev
f38570d Merge "hwc: Call hotplug on HPD" into jb-mr1-dev
25eb25f libcamera2: Enable video stabilization
a86f87c libcamera2: Enable video stabilization
ddc2e5a merge in jb-mr1-release history after reset to jb-mr1-dev
a93919c hwc: Call hotplug on HPD
15c8782 exynos5: libhwc: support the directFB for RGB565.
922abbf hwc: Implement prepare and set for HDMI
b5efffe Merge "hardware: samsung_slsi: libcamera2: add classification of FD meta data" into jb-mr1-dev
ebfee24 Merge "hardware: samsung_slsi: libcamera2: Touch AF and WB exif bug fix" into jb-mr1-dev
05cbd79 exynos5: libhwc: support the directFB for RGB565.
e689c02 Merge "hwc: send non-gscaler fence fds to kernel" into jb-mr1-dev
bb3bd9e hwc: send non-gscaler fence fds to kernel
f3312f8 hardware: samsung_slsi: libcamera2: add classification of FD meta data
4a9565a hardware: samsung_slsi: libcamera2: Touch AF and WB exif bug fix
f855239 Update gralloc to use new ion flag
6d6fbb7 Merge "getDisplayAttributes now returns an error code" into jb-mr1-dev
54aa0d2 getDisplayAttributes now returns an error code
73ae067 Merge "hardware: samsung_slsi: libcamera2: Change timing of stream notification" into jb-mr1-dev
2028f6d Merge "hardware: samsung_slsi: libcamera2: ZSL Bug fixes" into jb-mr1-dev
0abca18 Merge "hardware: samsung_slsi: libcamera2: Supports VDIS static metadata" into jb-mr1-dev
53fc8e7 merge in jb-mr1-release history after reset to jb-mr1-dev
8157514 hwc: fixup windows configurations that extend past screen edge
2f4d175 hardware: samsung_slsi: libcamera2: Change timing of stream notification
a8be001 hardware: samsung_slsi: libcamera2: ZSL Bug fixes
fac627c hardware: samsung_slsi: libcamera2: Supports VDIS static metadata
e0b393a merge in jb-mr1-release history after reset to jb-mr1-dev
d524220 Merge changes I83981ce2,I352ca1a1 into jb-mr1-dev
d01b834 Merge "hwc: add system property to force gpu composition" into jb-mr1-dev
4e56307 Merge "hardware: samsung_slsi: libcamera2: Add a signal buffer to threads" into jb-mr1-dev
afc13d8 Merge "hardware: samsung_slsi: libcamera2: Fix mode switch bug and log msgs" into jb-mr1-dev
ecf071e Merge "hardware: samsung_slsi: libcamera2: Modify thread creators" into jb-mr1-dev
6e0f76d hwc: add system property to force gpu composition
ce73ba1 hardware: samsung_slsi: exynos5: Seperate Secure memory region
9e3c34b mobicore : Added external variable for DRM library
b0b3bdd hwc: implement HWC HAL 1.1
0c1ba82 HACK: hwc: hard-code screen resolution
d92fe21 hwc: read display configuration directly from fb device
2f76084 Merge "hwc: increase gscaler ring buffer size to 3" into jb-mr1-dev
f183cf4 hardware: samsung_slsi: libcamera2: Add a signal buffer to threads
0eb27a9 hardware: samsung_slsi: libcamera2: Fix mode switch bug and log msgs
053d38c hardware: samsung_slsi: libcamera2: Modify thread creators
53b3e1c Merge "STOPSHIP libcamera2: remove device metadata" into jb-mr1-dev
3b4e516 Merge "hardware: samsung_slsi: libcamera2: Adjust exposure time in metadata" into jb-mr1-dev
df7e74a Merge "hardware : samsung_slsi: libcamera2: pre-capture metering bug fix" into jb-mr1-dev
c36d041 Merge "hardware: samsung_slsi: libcamera2: manual focus mode bug fix" into jb-mr1-dev
44a6d42 hwc: increase gscaler ring buffer size to 3
9a77d67 hardware: samsung_slsi: libcamera2: Adjust exposure time in metadata
4d1c1ee Merge "exynos5: libkeymaster: add keymaster HAL for Exynos5" into jb-mr1-dev
8eff0eb exynos5: libkeymaster: add keymaster HAL for Exynos5
a279afd merge in jb-mr1-release history after reset to jb-mr1-dev
29da681 exynos5: Add V4L2_CID_TV_MAX_AUDIO_CHANNELS
73f5ad6 hardware : samsung_slsi: libcamera2: pre-capture metering bug fix
fdbaf5d hardware: samsung_slsi: libcamera2: manual focus mode bug fix
3f729f9 merge in jb-mr1-release history after reset to jb-mr1-dev
70f7a63 Merge "hardware: samsung_slsi: libcamera2: pre-capture metering bug fix" into jb-mr1-dev
d91c026 hardware: samsung_slsi: libcamera2: pre-capture metering bug fix
69b4557 Merge "hardware: samsung_slsi: libcamera2: support AE and AWB state" into jb-mr1-dev
297c367 Merge "hardware: samsung_slsi: libcamera2: Use FORMAT_ZSL for stream setup" into jb-mr1-dev
6e33cc8 hardware: samsung_slsi: libcamera2: support AE and AWB state
b8d41ae hardware: samsung_slsi: libcamera2: Use FORMAT_ZSL for stream setup
9bd4529 Merge "exynos_omx: multi_thread: Change bitrate setting in encode component." into jb-mr1-dev
4b2245a Merge changes I054eba95,I833315b5 into jb-mr1-dev
d4819ad exynos_omx: multi_thread: Change bitrate setting in encode component.
ed4ad5f hardware: samsung_slsi: libcamera2: Modify Debug Message
37f6956 merge in jb-mr1-release history after reset to jb-mr1-dev
3d5ab44 mobicore: remove useless Android.mk files
9081ca6 mobicore: update MobiCore userspace daemon and libraries
66422b5 hardware: samsung_slsi: libcamera2: remove redundant code at CAF video
311d52e hardware: samsung_slsi: libcamera2: support infinity focus mode
63be2da hardware: samsung_slsi: libcamera2: update metadata header
5c88d1f hardware: samsung_slsi: libcamera2: Modify to support video stabilization(VDIS)
f85c3f0 hardware: samsung_slsi: libcamera2: Modify max count of face detection
ac8c206 hardware: samsung_slsi: libcamera2: Fix memory leak on exit
ce8e830 hardware: samsung_slsi: libcamera2: Remove HACK used for frame sync
5f643a7 hardware: samsung_slsi: libcamera2: Fix video snapshot crash
0d220b4 hardware: samsung_slsi: libcamera2: Fix the preview callback bug.
6bf36b6 hardware: samsung_slsi:libcamera2: Fix Night scene mode crash
e117f75 hardware: samsung_slsi: libcamera2: support pre-capture metering
53f62ad hardware: samsung_slsi: libcamera2: support wb exif info
5506ceb hardware: samsung_slsi:libcamera2: Enable ZSL and frame sync
52607b9 merge in jb-mr1-release history after reset to jb-mr1-dev
7dddd2a hwc: clear cached gscaler info after failed allocation
6c7b0ad STOPSHIP libcamera2: remove device metadata
3088b97 hwc: store gscaler configuration in correct slot
72d1c40 Revert "hwc: enforce bandwidth limitations on each memory interface"
9119243 Revert "hwc: enable gscaler on RGBX8888 surfaces"
f9509d3 Revert "hwc: enforce bandwidth limitations on each memory interface"
9e6b8ca Revert "hwc: enable gscaler on RGBX8888 surfaces"
bd27986 merge in jb-mr1-release history after reset to jb-mr1-dev
e76fa94 Revert "libgscaler: rework configuration checking and alignment"
23cd595 Revert "hwc: rewrite supports_gscaler() to use libgscaler"
cbfe951 Merge changes Ia20f32e5,I8adb05ca into jb-mr1-dev
e8f55d7 Merge "hardware: samsung_slsi: libcamera2: Bug fix for stop sequence" into jb-mr1-dev
2adfa42 hardware: samsung_slsi:libcamera2: enable frame sync
aa14c9f hwc: enforce bandwidth limitations on each memory interface
f3416d3 hwc: rewrite supports_gscaler() to use libgscaler
a9ea534 libgscaler: rework configuration checking and alignment
36530ec hwc: enable gscaler on RGBX8888 surfaces
2c87280 hardware: samsung_slsi: libcamera2: Bug fix for stop sequence
52f5430 hardware: samsung_slsi: libcamera2: decrease the number of request entry
29c0dc7 Merge "hwc: moved GSC dst's drmmode checking." into jb-mr1-dev
6c195c5 hwc: moved GSC dst's drmmode checking.
4aa4d73 hardware: samsung_slsi: libcamera2: Add log level for camera debug
a776338 Remove compiler warning from gralloc, fix some white space
7d5efee hardware: samsung_slsi: gralloc: Support HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
e00f659 hardware: samsung_slsi: Add fnumber item for metadata
9257e29 hardware: samsung_slsi: libcamera2: change flash sequence
2bbbf0c hardware: samsung_slsi: libcamera2: Recording bug fix
8e7bb84 merge in jb-mr1-release history after reset to jb-mr1-dev
0b7b757 device: samsung_slsi: libcamera2: Add support video resolutions.
caea49e hardware: samsung_slsi: libcamera2: modify flash function
c21bcf9 hardware: samsung_slsi: libcamera2: Fix preview delay and recording bugs
a346353 hardware: samsung_slsi: libcamera2: update flash function
f8c24e5 hwc: warn about unexpected formats
9a710a4 hardware: samsung_slsi: libcamera2: update flash function
c0b6e17 hardware: samsung_slsi: libcamera2: Fix preview delay and recording bugs
e279c76 merge in jb-mr1-release history after reset to jb-mr1-dev
da7ca69 hardware: samsung_slsi: libcamera2: Fix AF and CAF transition bug
181e425 hardware: samsung_slsi: libcamera2: Change ion flag for metadata
7d0efb5 hardware: samsung_slsi: libcamera2: Fix the preview and still bugs.
a44c336 hardware: samsung_slsi: libcamera2: Add support resolutions / wideAspect
308291d hardware: samsung_slsi: libcamera2: Bug fix for digital zoom
b55ed66 hardware: samsung_slsi: libcamera2: Bug fixes and stability enhancements
30359f7 merge in jb-mr1-release history after reset to jb-mr1-dev
4e0f168 hwc: Fix booting with hdmi attached
2adeb9f Merge "hwc: Disable hdmi on blank" into jb-mr1-dev
65bcf01 Merge "hwc: Add full screen video support on HDMI" into jb-mr1-dev
c959dbe Merge "libgscaler: Update for HDMI full screen video" into jb-mr1-dev
1cd0c1b Merge "exynos5: omx: osal: only free sharedmem buffers we allocated" into jb-mr1-dev
a6c8bcb exynos5: omx: osal: only free sharedmem buffers we allocated
2b0421d hardware: samsung_slsi: libcamera2: add new HAL stub
ad4e358 hwc: Disable hdmi on blank
8bad7e3 hwc: Add full screen video support on HDMI
aad0a4c libgscaler: Update for HDMI full screen video
1b8ef18 STOPSHIP: Turn back off exif data until we ship
9582cfb merge in jb-mr1-release history after reset to jb-mr1-dev
6f19b6c hardware: smasung_slsi: libcamera2: add flash function
2d5e6ec hardware: samsung_slsi: libcamera2: fix thumbnail size bug
74d78eb hardware: samsung_slsi: libcamera2: Enable preview callback
71eb855 Merge "exynos_omx: multi_thread: Remove OMX Error log on init time." into jb-mr1-dev
b5eeb20 exynos_omx: multi_thread: Remove OMX Error log on init time.
e2d37ba merge in jb-mr1-release history after reset to jb-mr1-dev
c41b757 gralloc: add extra line of padding after aligning
3bad845 gralloc: make sure rgb buffers have at least 1 line of padding
8ba4292 merge in jb-mr1-release history after reset to jb-mr1-dev

   * hardware/ti/omap3
f3af114 Fix another misspelling of a symbol name (same exact symbol, different vendor)
9c36bd8 libstagefrighthw: Fix building with mr1
b7c4c0d omap3: Updates for JB compatibility
8024869 Merge omap3-cm9 into omap3-merge
0c5c565 omx: Fix build failures

   * hardware/ti/omap4xxx
de825f2 omap4xxx: add flag to allow custom libion
a1c078b [1/3] omap4xxx: Allow custom DOMX source instead of Google DOMX default
60c8c25 hwc: Support HDMI as primary display
a3825d8 hwc: Add support for FB scaling and cloning
62b870e hwc: fix timing issue with vsync sysfs loop
53cacd8 hwc: support vsync notification via sysfs
707e301 Revert "CameraHal: Sync AF cancel with incoming OMX events"
b96dffd CameraHal: Sync AF cancel with incoming OMX events
b6a9d10 CameraHal: Avoid race condition during recording stop
3d6b69f HWC field was renamed

   * hardware/ti/wlan
4e0d010 wl12xx: fix unbalanced wakelock in IRQ-while-suspended path
da8f6d2 Fix error introduced by copy-paste from Gerrit
6e99179 WLAN - wl12xx: Update to R5.SP3.06 from R5.SP3.01 package
b9dbf2e wlan: Fix inline building
6db38e2 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/ti/wlan into HEAD
48d1807 WLAN - wlconf: add wlconf code
3d851dd WLAN - add autogenerated file to gitignore
e14cce7 WLAN - wl12xx: Update to R5.SP3.01 from R5.SP2.04 package
917853d WLAN - wl18xx: Update to R8.a4.02 from R8.a2.09 package

   * hardware/ti/wpan
dbcd866 libbt-vendor: rework structure of source code
70d3d9f wpan: Adds vendor library for TI's WiLink chipsets
7a669a3 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/ti/wpan into HEAD
d2f7b47 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
53fd67f ti_wpan: build wpan only if device requires it

   * kernel/samsung/smdk4412
e8aa6a7 Merge "mali: pick the right GPU voltage table for 1400MHz devices, restore thresholds" into cm-10.1
6949ff4 mali: pick the right GPU voltage table for 1400MHz devices, restore thresholds
ccb973c Increase lowest GPU step for 1400MHz devices
ac24beb Merge "mshci: disable MMC_CAP_ERASE on u1" into cm-10.1
7625c99 mshci: disable MMC_CAP_ERASE on u1
06b6513 mmc: fix the workqueue overload battery waste
84c11ba cm exynos: enable selinux support
f79dbef Fix GPS for n80xx devices
31f128d Merge "smdk4412: add i925/p4noteltevzw support" into cm-10.1
cb93f68 smdk4412: add i925/p4noteltevzw support
5dabd15 isa1200_vibrator: user configurable vibration intensity
5b3cb3c Merge "USB: f_mass_storage: 2048 block size for cdrom devices" into cm-10.1
dedc614 Merge "UMS: f_mass_storage: Added cdrom option to UMS-lun-devices" into cm-10.1
eaa9040 USB: f_mass_storage: 2048 block size for cdrom devices
35eb230 UMS: f_mass_storage: Added cdrom option to UMS-lun-devices
4b2308c d710: initial support for the Epic 4G Touch (SPH-D710)
855d6a6 u1: port sensors and modem interface from smdk4210 kernel
a8c0a4a Merge "Samsung i9300 Update 10" into cm-10.1
003fb4d smdk4412: Fix typo
83e756c Samsung i9300 Update 10
e25020d perf: Treat attr.config as u64 in perf_swevent_init()
55bb204 smdk4412: bulk update from i9300 update 9
3d8b293 enable nfs support
3446141 4412: builtin md4 and dnsresolver
3905fe3 i777, i9100, n7000: enable utf8 support for nls
10f6777 mali: change alloc order from 6 to 11 for 4210
0bc490b usb gadget: use two luns on devices with two cards
f4156e2 ondemand: cpuidle detection
4377ebe Merge "drivers: modem_if : Remove some debugging" into cm-10.1
768687a drivers: modem_if : Remove some debugging
1cb7aa3 mach-u1: Improve touch sensitivity for MXT224E controller
8b0f95e mxt224_u1: Silence some status messages
2e944db makefile: mach-exynos: Separate 4x10 and 4x12 objects
f1ab31b cm3663: fix initial proximity sensor state
065da93 u1: add cyanogenmod mdnie scenario
39b1957 i777, i9100, n7000: regenerate defconfigs
05f0203 u1: import from CyanogenMod/android_kernel_samsung_smdk4210
ab6dfcc migrate: fix merge fail
ba39955 Correct md5sum executable on OSX hosts
c421809 update bcmdhd driver from GT-9505 Source
43aaedb t0ltecdma: enable support for car dock
1632b24 t0lte: enable support for car dock
25c1958 i9305: Enable car dock
18262ff i9300: reenable dock support
e01a693 smdk4412: enable sio iosched
8a39f72 block: add sio iosched
89a7aa0 smdk4412: enable row iosched
b6bde0d block: add row iosched
8823489 smdk4412: mali: merge with r3p1 driver from note8
cba0718 Merge branch 'cm-10.1-experimental' into HEAD
1fb968e bcmdhd: disable GAN_LITE_NAT_KEEPALIVE_FILTER
b9ed02d bcmdhd: reenable IPv6, disable multicast in suspend
cea4b18 melfas touch: report touch events to cypress for backlight timeout
4465558 WIFI: Use kernel version 3.4 ifdef's.
3cedbff wireless backport from 3.4
78eca74 config: Regenerate for new bcmdhd driver
d4f19c0 bcmdhd: kang from d2
5843001 mm: Update Samsung's -cma shit to match 3.0.64
19dd872 Fix mistakes in merge
b08797f Merge remote-tracking branch 'kernelorg/linux-3.0.y' into 3_0_64
cbfae70 display: updates for t0 devices
c96eeb5 s5c73m3: only use camera fw from system if newer than on data
6974a50 s5c73m3: print s_ctrl and g_ctrl values
08b5204 s3cfb: disable spam
3536d5c mali: update to r3p1-01rel1
c715892 Merge "bcmdhd: update from jb update 7" into cm-10.1
54ea5b4 Linux 3.0.64
7406f42 netback: correct netbk_tx_err to handle wrap around.
1d08d86 xen/netback: free already allocated memory on failure in xen_netbk_get_requests
f045784 xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop.
2af567a xen/netback: shutdown the ring if it contains garbage.
01cc083 tg3: Fix crc errors on jumbo frame receive
98d5919 tg3: Avoid null pointer dereference in tg3_interrupt in netconsole mode
98df258 bridge: Pull ip header into skb->data before looking into ip header.
9f55757 tcp: fix MSG_SENDPAGE_NOTLAST logic
3188568 tcp: fix for zero packets_in_flight was too broad
ff1e4e5 tcp: frto should not set snd_cwnd to 0
0535d24 net: sctp: sctp_endpoint_free: zero out secret key data
7340fda net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree
daba311 sctp: refactor sctp_outq_teardown to insure proper re-initalization
107be19 atm/iphase: rename fregt_t -> ffreg_t
069d8ee packet: fix leakage of tx_ring memory
d72b29e ipv6: do not create neighbor entries for local delivery
aa5d265 pktgen: correctly handle failures when adding a device
94510aa net: loopback: fix a dst refcounting issue
3a42cce r8169: remove the obsolete and incorrect AMD workaround
71d6857 isdn/gigaset: fix zero size border case in debug dump
6856b63 MAINTAINERS: Stephen Hemminger email change
cadce46 net: prevent setting ttl=0 via IP_TTL
55f40ea mac80211: synchronize scan off/on-channel and PS states
4d973b2 kernel/resource.c: fix stack overflow in __reserve_region_with_split()
61cf42c virtio_console: Don't access uninitialized data.
ff3c8fd rtlwifi: Fix the usage of the wrong variable in usb.c
a96dbfb Linux 3.0.63
b9094c6 USB: XHCI: fix memory leak of URB-private data
85b9c6b xhci: Fix isoc TD encoding.
dac9424 USB: storage: optimize to match the Huawei USB storage devices and support new switch command
a215bd7 USB: storage: Define a new macro for USB storage match rules
f3f2759 USB: EHCI: fix bug in scheduling periodic split transfers
9e26845 USB: qcserial: add Telit Gobi QDL device
b506463 USB: option: add Changhong CH690
216d450 USB: option: add support for Telit LE920
6b5410c USB: ftdi_sio: add PID/VID entries for ELV WS 300 PC II
62ddf7f USB: ftdi_sio: add Zolix FTDI PID
76913678 drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler
466affe nilfs2: fix fix very long mount time issue
b19f432 x86-64: Replace left over sti/cli in ia32 audit exit code
aec2043 drm/radeon: Calling object_unrefer() when creating fb failure
dfd365b drm/radeon: add quirk for RV100 board
ed1d34f drm/radeon/evergreen+: wait for the MC to settle after MC blackout
21a1753 i9305: add defconfig
e1c63f9f Linux 3.0.62
d997f40 x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI
591f90e efi, x86: Pass a proper identity mapping in efi_call_phys_prelog
7497ef2 x86/msr: Add capabilities check
d915fe3 smp: Fix SMP function call empty cpu mask race
95675e4 Bluetooth: Fix incorrect strncpy() in hidp_setup_hid()
207d5e1 EDAC: Test correct variable in ->store function
a043100 ALSA: usb-audio: fix invalid length check for RME and other UAC 2 devices
bed3700 ath9k: fix double-free bug on beacon generate failure
a2e1c39 ath9k_htc: Fix memory leak
afd2d0e Bluetooth: Fix sending HCI commands after reset
7948bfd ARM: DMA: Fix struct page iterator in dma_cache_maint() to work with sparsemem
833a2e1 fs/cifs/cifs_dfs_ref.c: fix potential memory leakage
bb40f9f can: pch_can: fix invalid error codes
8313623 can: ti_hecc: fix invalid error codes
331f275 can: c_can: fix invalid error codes
f94d43c bcmdhd: update from jb update 7
0ae4324 t0ltecdma: remove ifdef from bt lpm
214dfbe Linux 3.0.61
be6ee99 ioat: Fix DMA memory sync direction correct flag
a94e7cf ACPI / cpuidle: Fix NULL pointer issues when cpuidle is disabled
06cce02 SGI-XP: handle non-fatal traps
b6d3beb x86: Use enum instead of literals for trap values [PARTIAL]
d87f5a8 ahci: Add identifiers for ASM106x devices
b250e45 drm/i915: Implement WaDisableHiZPlanesWhenMSAAEnabled
231788b staging: usbip: changed function return type to void
c9d332c serial: 8250, increase PASS_LIMIT
a6aa749 drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
88e10f8 drivers/firmware/dmi_scan.c: check dmi version when get system uuid
0aa31f1 SCSI: sd: Reshuffle init_sd to avoid crash
27b2a26 USB: UHCI: fix IRQ race during initialization
ef3319d PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
1085a87 ftrace: Be first to run code modification on modules
4a0bc17 drm/i915: Invalidate the relocation presumed_offsets along the slow path
f9b5ada i9300: add NFS support
d418434 Linux 3.0.60
42e29fd staging: vt6656: Fix inconsistent structure packing
904e718 serial:ifx6x60:Delete SPI timer when shut down port
f21c75c USB: option: blacklist network interface on ONDA MT8205 4G LTE
da1213a USB: option: add TP-LINK HSUPA Modem MA180
a5b0529 xen: Fix stack corruption in xen_failsafe_callback for 32bit PVOPS guests.
3b2167c xhci: fix null-pointer dereference when destroying half-built segment rings
2ff95ab drbd: add missing part_round_stats to _drbd_start_io_acct
e16037a intel-iommu: Prevent devices with RMRRs from being placed into SI Domain
b436f48 USB: fix endpoint-disabling for failed config changes
e82efee powerpc: fix wii_memory_fixups() compile error on 3.0.y tree
97765f3 ext4: init pagevec in ext4_da_block_invalidatepages
a6d8f58 x86/Sandy Bridge: reserve pages when integrated graphics is present
228f49c s390/time: fix sched_clock() overflow
5304f42 tcm_fc: Do not report target role when target is not defined
ed46841 tcm_fc: Do not indicate retry capability to initiators
b738689 sh: Fix FDPIC binary loader
d4ece4b Merge "mdm: Update mdm" into cm-10.1
76fcb2e mdm: Update mdm
fa4e880 Sensorhub: Update sensors and firmware
10b2523 t0lte: add wake_peer and bcm header back
4c4e63a t0lte: disable samsung mtp
afacd75 use VZW defconfig as common T0LTE cdma defconfig
91a73eb t0lte: support for galaxy note 2 lte
0829a6c Linux 3.0.59
7633459 staging: comedi: Kconfig: COMEDI_NI_AT_A2150 should select COMEDI_FC
57a7502 staging: comedi: don't hijack hardware device private data
f387ee8 Revert "drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13"
9d2fdad KVM: PPC: 44x: fix DCR read/write
5b8692b intel-iommu: Free old page tables before creating superpage
d668f92 GFS2: Test bufdata with buffer locked and gfs2_log_lock held
961161c xhci: Handle HS bulk/ctrl endpoints that don't NAK.
b30765e USB: hub: handle claim of enabled remote wakeup after reset
e16e202 USB: Increase reset timeout.
fca884e usb: gadget: dummy: fix enumeration with g_multi
6d9a5f5 USB: cdc-acm: Add support for "PSC Scanning, Magellan 800i"
edce154 usb: ftdi_sio: Crucible Technologies COMET Caller ID - pid added
54923de USB: option: add Telekom Speedstick LTE II
40d3aad USB: option: Add new MEDIATEK PID support
eaf103d USB: option: blacklist network interface on ZTE MF880
aa6e90f USB: option: add Nexpring NP10T terminal id
9e2bd12 mac80211: use del_timer_sync for final sta cleanup timer deletion
0c3b520 radeon/kms: force rn50 chip to always report connected on analog output
71a1306 staging: speakup: avoid out-of-range access in synth_add()
36aa870 staging: speakup: avoid out-of-range access in synth_init()
30571057 staging: r8712u: Add new device ID
2d8a66e staging: comedi: comedi_test: fix race when cancelling command
bf302ba staging: comedi: prevent auto-unconfig of manually configured devices
e2abf66 ALSA: pxa27x: fix ac97 cold reset
639fd95 ASoC: wm2000: Fix sense of speech clarity enable
93b4026 epoll: prevent missed events on EPOLL_CTL_MOD
b18401a rtnetlink: fix rtnl_calcit() and rtnl_dump_ifinfo()
a0d3aa1 rtnetlink: Fix problem with buffer allocation
2e3cbde rtnetlink: Compute and store minimum ifinfo dump size
4a6cf0c ACPI : do not use Lid and Sleep button for S5 wakeup
5e3fe67 x86, amd: Disable way access filter on Piledriver CPUs
457a972 thp, memcg: split hugepage for memcg oom on cow
cdfcbd8 udf: don't increment lenExtents while writing to a hole
de3ecca udf: fix memory leak while allocating blocks during write
39a7319 aoe: do not call bdi_init after blk_alloc_queue
a4202fd ext4: lock i_mutex when truncating orphan inodes
1ba9a27 ext4: do not try to write superblock on ro remount w/o journal
7c558b7 jbd2: fix assertion failure in jbd2_journal_flush()
8cbe638 ext4: fix extent tree corruption caused by hole punch
fc65b0b video: mxsfb: fix crash when unblanking the display
f125f80 staging: vt6656: 64bit fixes: vCommandTimerWait change calculation of timer.
afaac0d staging: vt6656: 64bit fixes: key.c/h change unsigned long to u32
355bda5 staging: vt6656: 64 bit fixes: fix long warning messages.
f25b877 staging: vt6656: 64 bit fixes : correct all type sizes
4f668e4 staging: vt6656: 64 bit fixes: use u32 for QWORD definition.
a32f2fe staging: vt6656: [BUG] out of bound array reference in RFbSetPower.
1cf8193 dm ioctl: prevent unsafe change to dm_ioctl data_size
61cdfbb ring-buffer: Fix race between integrity check and readers
39126ac RDMA/nes: Fix for terminate timer crash
84181e4 RDMA/nes: Fix for crash when registering zero length MR for CQ
f03ef10 drm/i915: make the panel fitter work on pipes B and C on IVB
03bdf8e i2400m: add Intel 6150 device IDs
43f5d33 jffs2: hold erase_completion_lock on exit
113b47f SUNRPC: Ensure that we free the rpc_task after cleanups are done
9d4cbf8 ext4: fix memory leak in ext4_xattr_set_acl()'s error path
2c44276 mfd: Only unregister platform devices allocated by the mfd core
52ae560 target/tcm_fc: fix the lockdep warning due to inconsistent lock state
454a7d5 libata: fix Null pointer dereference on disk error
9b49bdf libata: set dma_mode to 0xff in reset
1bf3579 sata_promise: fix hardreset lockdep error
78c9672 SCSI: qla2xxx: Test and clear FCPORT_UPDATE_NEEDED atomically.
b9ebaf5 SCSI: mvsas: fix undefined bit shift
f8ef1b3 firewire: net: Fix handling of fragmented multicast/broadcast packets.
46bea30 ath9k: ar9003: fix OTP register offsets for AR9340
ae172f6 Revert "ath9k_hw: Update AR9003 high_power tx gain table"
da0e14f mm: use aligned zone start for pfn_to_bitidx calculation
63c5442 mm: compaction: fix echo 1 > compact_memory return error issue
2c77bb3 s390/cio: fix pgid reserved check
aea63e0 powerpc/vdso: Remove redundant locking in update_vsyscall_tz()
dc22f2d powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build
b797be2 configs: i9300, n7100, n80xx: enable uhid
d5d6ced HID: uhid: Fix sending events with invalid data
e7ff9a7 HID: uhid: silence gcc warning
f4a5c11 HID: uhid: add example program
3b90a61 HID: uhid: add documentation
c9410c2 HID: uhid: implement feature requests
ff7beda HID: uhid: forward raw output reports to user-space
6134b58 HID: uhid: forward output request to user-space
ab8add2 HID: uhid: forward open/close events to user-space
4517caa HID: uhid: add UHID_START and UHID_STOP events
3c0a833 HID: uhid: forward hid report-descriptor to hid core
fa55868 HID: uhid: allow feeding input data into uhid devices
ee03848 HID: uhid: add UHID_CREATE and UHID_DESTROY events
ce2b250 HID: uhid: implement write() on uhid devices
0391705 HID: uhid: implement read() on uhid devices
402b6a4 HID: uhid: allow poll()'ing on uhid devices
6b48868 HID: uhid: add internal message buffer
626b761 HID: uhid: introduce user-space I/O driver support for HID
2a68fec Linux 3.0.58
a0ed2e7 can: Do not call dev_put if restart timer is running upon close
c39096f mm: limit mmu_gather batching to fix soft lockups on !CONFIG_PREEMPT
a2e1113 drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time
afc0e69 drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
4a16c40 CRIS: fix I/O macros
9b7b38a Bluetooth: cancel power_on work when unregistering the device
1bc2621 Bluetooth: ath3k: Add support for VAIO VPCEH [0489:e027]
e641306 PCI: Reduce Ricoh 0xe822 SD card reader base clock frequency to 50MHz
decbd08 solos-pci: fix double-free of TX skb in DMA mode
0b6916a ARM: missing ->mmap_sem around find_vma() in swp_emulate.c
f61019b ARM: mm: use pteval_t to represent page protection values
8d15569 tcp: RFC 5961 5.2 Blind Data Injection Attack Mitigation
ffd34fc tcp: tcp_replace_ts_recent() should not be called from tcp_validate_incoming()
282190e tcp: refine SYN handling in tcp_validate_incoming
ab5c718 tcp: implement RFC 5961 4.2
86791bb tcp: implement RFC 5961 3.2
9b79271 net: sched: integer overflow fix
1e8928a sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
6fe7238 ftrace: Do not function trace inlined functions
6c94f43 x86, amd: Disable way access filter on Piledriver CPUs
01fdcf4 cgroup: remove incorrect dget/dput() pair in cgroup_create_dir()
5729b13 xhci: Add Lynx Point LP to list of Intel switchable hosts
d038911 genirq: Always force thread affinity
ada84ad Input: walkera0701 - fix crash on startup
31c4e8c nfs: fix null checking in nfs_get_option_str()
d6e0c42 nfsd4: fix oops on unusual readlike compound
9d53441 NFS: Fix calls to drop_nlink()
64b45c8 NFS: avoid NULL dereference in nfs_destroy_server
611d6f0 ACPI / scan: Do not use dummy HID for system bus ACPI nodes
42fac8e usb: gadget: phonet: free requests in pn_bind()'s error path
1db444f p54usb: add USBIDs for two more p54usb devices
45a62af p54usb: add USB ID for T-Com Sinus 154 data II
6ab1dea ALSA: usb-audio: Fix missing autopm for MIDI input
5a6400c ALSA: usb-audio: Avoid autopm calls after disconnection
51afc62 tmpfs mempolicy: fix /proc/mounts corrupting memory
8fafe01 mm: Fix PageHead when !CONFIG_PAGEFLAGS_EXTENDED
812e638 virtio: force vring descriptors to be allocated from lowmem
276c234 x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
28278b3 exec: do not leave bprm->interp on stack
947d716 pnpacpi: fix incorrect TEST_ALPHA() test
8d759d1 usb/ipheth: Add iPhone 5 support
98ffdcd irda: sir_dev: Fix copy/paste typo
80fef29 ne2000: add the right platform device
55fdb80 sctp: fix -ENOMEM result with invalid user space pointer in sendto() syscall
e620776 sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space fails
cefbc05 bonding: fix race condition in bonding_store_slaves_active
a8695e1 bonding: Bonding driver does not consider the gso_max_size/gso_max_segs setting of slave devices.
4a1388e i9300, n7100, n80xx: enable sysfs vsync notifications
c1713e6 s3cfb: Notify userspace of vsync using sysfs, make uevents optional
49017aa Update to the exynos-mem security issue from Samsung I9300 Update7
5528b5d Revert "exynos-mem: Fix major security hole"
3698988 Revert "exynos-mem: Add fimc1 to mmap whitelist check"
843a1f4 Merge "Add ION to exynos-mem whitelist, needed for n80xx camera" into cm-10.1
da84616 mmc: Soft-patch MoviNAND VTU00M (16GB) eMMC failure
cd98096 Add ION to exynos-mem whitelist, needed for n80xx camera
126b49a n7100: CONFIG_USE_FIMC_CMA
eaa468e exynos-mem: Add fimc1 to mmap whitelist check
9c1d0f4 exynos-mem: Fix major security hole
881c0a0 Linux 3.0.57
3882a18 powerpc: Keep thread.dscr and thread.dscr_inherit in sync
1758e55 powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
7a09a2f ftrace: Clear bits properly in reset_iter_read()
dadc9f9 xhci: Extend Fresco Logic MSI quirk.
e22045d USB: OHCI: workaround for hardware bug: retired TDs not added to the Done Queue
ffedea0 ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000
cb2bf59 ACPI / PNP: Do not crash due to stale pointer use during system resume
fd013d7 ACPI / battery: Correct battery capacity values on Thinkpads
092082a USB: mark uas driver as BROKEN
f1ac973 USB: cp210x: add Virtenio Preon32 device id
d57cab5 usb: ftdi_sio: fixup BeagleBone A5+ quirk
3ffab0b USB: ftdi_sio: Add support for Newport AGILIS motor drivers
ea337d3 USB: option: blacklist network interface on Huawei E173
1d28af1 USB: add new zte 3g-dongle's pid to option.c
29a4f067 x86: hpet: Fix masking of MSI interrupts
15487eb tmpfs: fix shared mempolicy leak
d2e0863 telephony: ijx: buffer overflow in ixj_write_cid()
cde5ccf x86,AMD: Power driver support for AMD's family 16h processors
b9f21c2 mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls
3ff0aec workqueue: convert BUG_ON()s in __queue_delayed_work() to WARN_ON_ONCE()s
f2a1abc powerpc/ptrace: Fix build with gcc 4.6
15a83cc ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set
c3e546e mem: fix permissions on exynos-mem
4bca699 Merge "smdk4412: s3cfb_s6e8ax0: Stop fb shitstorm in kmsg" into mr1-staging
984bcbf smdk4412: s3cfb_s6e8ax0: Stop fb shitstorm in kmsg
eef70d5 bluetooth-bcm4334: Make LPM behave like 4330 implementation
4eb15b7 Linux 3.0.56
9012327 scsi: Silence unnecessary warnings about ioctl to partition
95b471a drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
4d574d2 i915: Quirk no_lvds on Gigabyte GA-D525TUD ITX motherboard
b0ce22d ACPI: missing break
bc436dd route: release dst_entry.hh_cache when handling redirects
e86b690 Revert "sched, autogroup: Stop going ahead if autogroup is disabled"
cc3c85d workqueue: exit rescuer_thread() as TASK_RUNNING
11bcecc mm: soft offline: split thp at the beginning of soft_offline_page()
8bec650 mm/vmemmap: fix wrong use of virt_to_page
6d62cb3 Dove: Fix irq_to_pmu()
31a2aa1 Dove: Attempt to fix PMU/RTC interrupts
a71808b smdk4412: reboot bootloader boots into download mode
78ac47e s6evr02: Allow max brightness at 255
3bbbcb1 Linux 3.0.55
296a041 x86-32: Export kernel_stack_pointer() for modules
7cd2d7c Linux 3.0.54
49a66fd mmc: sdhci-s3c: fix the wrong number of max bus clocks
8cefc55 Input: bcm5974 - set BUTTONPAD property
85f07cc x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
f7118e1 acer-wmi: support for P key on TM8372
872edb5 watchdog: using u64 in get_sample_period()
14179cd USB: mct_u232: fix broken close
a5c147f get_dvb_firmware: fix download site for tda10046 firmware
6d4f2ce ixgbe: add support for new 82599 device id
7daba4e ixgbe: add support for new 82599 device
a36eea2 sata_svw: check DMA start bit before reset
344b5bf ixgbe: add support for X540-AT1
346f855 bas_gigaset: fix pre_reset handling
bbc0a18 ALSA: hda - Add support for Realtek ALC292
0752069 ALSA: hda - Fix missing beep on ASUS X43U notebook
64c94de ALSA: hda - Add new codec ALC283 ALC290 support
bf7ef7e sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()
1c4e871 jbd: Fix lock ordering bug in journal_unmap_buffer()
f6a8d4c can: bcm: initialize ifindex for timeouts without previous frame reception
399a326 radeon: add AGPMode 1 quirk for RV250
34ef0d5 mac80211: deinitialize ibss-internals after emptiness check
beb93b1 futex: avoid wake_futex() for a PI futex_q
2d7c6b7 dm: fix deadlock with request based dm and queue request_fn recursion
38f6449 mtd: slram: invalid checking of absolute end address
f561b30 PARISC: fix user-triggerable panic on parisc
a536dd3 PARISC: fix virtual aliasing issue in get_shared_area()
08dc993 ALSA: ua101, usx2y: fix broken MIDI output
14de2f6 SCSI: isci: copy fis 0x34 response into proper buffer
d3a11ab mwifiex: report error to MMC core if we cannot suspend
37fd5d3 rtlwifi: rtl8192cu: Add new USB ID
2be8019 x86, microcode, AMD: Add support for family 16h processors
683448e x86-32: Fix invalid stack address while in softirq
ec34868 ifenslave: Fix unused variable warnings.
7ddaba0 riva/fbdev: fix several -Wuninitialized
6ce2a94 drivers/block/DAC960: fix -Wuninitialized warning
a0bdb13 drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning
fa52e1c ALSA: pcmcia - Use pcmcia_request_irq()
d44e799 Revert "smdk4412 devices: double memsize for fimd"
a55162c Revert "smdk4412 devices: higher the number of s5p fb buffers"
106c5f5 smdk4412 devices: double memsize for fimd
9b7a40b smdk4412 devices: higher the number of s5p fb buffers
9ee66ec Fix build on Darwin: http://forum.xda-developers.com/showthread.php?t=1788935
2af8c19 mach-exynos: Even wifi p4notes have GPS
2fc3fd4 Linux 3.0.53
b87c48d Resource: fix wrong resource window calculation
8515be6 PCI : Calculate right add_size
36720ae PCI : ability to relocate assigned pci-resources
95eb6d3 selinux: fix sel_netnode_insert() suspicious rcu dereference
7eebd4f reiserfs: Protect reiserfs_quota_write() with write lock
2f21676 reiserfs: Move quota calls out of write lock
a7b8408 reiserfs: Protect reiserfs_quota_on() with write lock
daa88cb reiserfs: Fix lock ordering during remount
31fcdd0 NFS: Wait for session recovery to finish before returning
c76fbef drm/i915: fix overlay on i830M
bb9583e sky2: Fix for interrupt handler
6c0e763 eCryptfs: check for eCryptfs cipher support at mount
34396c6 eCryptfs: Copy up POSIX ACL and read-only flags from lower mount
40ebcb8 usb: use usb_serial_put in usb_serial_probe errors
328325b netfilter: nf_nat: don't check for port change on ICMP tuples
9e8b32b netfilter: Mark SYN/ACK packets as invalid from original direction
d87b26d netfilter: Validate the sequence number of dataless ACK packets as well
02f7a0d kbuild: Fix gcc -x syntax
bb976b0 r8169: use unlimited DMA burst for TX
3cc4ead net-rps: Fix brokeness causing OOO packets
c5d6a96 net: correct check in dev_addr_del()
db4bf38 ipv6: setsockopt(IPIPPROTO_IPV6, IPV6_MINHOPCOUNT) forgot to set return value
26aeb8b ipv4: avoid undefined behavior in do_ip_setsockopt()
345d88c m68k: fix sigset_t accessor functions
7e2c753 wireless: allow 40 MHz on world roaming channels 12/13
b67793d USB: option: add Alcatel X220/X500D USB IDs
5ff767d USB: option: add Novatel E362 and Dell Wireless 5800 USB IDs
55d60ef s390/gup: add missing TASK_SIZE check to get_user_pages_fast()
f174b32 UBIFS: introduce categorized lprops counter
ad33dc0 UBIFS: fix mounting problems after power cuts
bb71076 ASoC: dapm: Use card_list during DAPM shutdown
dd5df62 ASoC: wm8978: pll incorrectly configured when codec is master
174aad5 ALSA: hda - Force to reset IEC958 status bits for AD codecs
57ecc1f ALSA: hda: Cirrus: Fix coefficient index for beep configuration
8493a23 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption
5a5ffbe fanotify: fix missing break
218440d mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
7a4702b mmc: Enable support for Triangle Away
89d2d13 Linux 3.0.52
0933714 ALSA: usb-audio: Fix mutex deadlock at disconnection
aaf238b ALSA: Fix card refcount unbalance
919609d intel-iommu: Fix AB-BA lockdep report
11b34bb xfs: fix reading of wrapped log data
87725c3 USB: mos7840: remove unused variable
b7832d49e drm/i915: clear the entire sdvo infoframe buffer
9615dee drm/i915: fixup infoframe support for sdvo
d18edec drm/vmwgfx: Fix hibernation device reset
2f56580 futex: Handle futex_pi OWNER_DIED take over correctly
2e570a4 ipv6: send unsolicited neighbour advertisements to all-nodes
5a3e425 l2tp: fix oops in l2tp_eth_create() error path
798c7db net: fix divide by zero in tcp algorithm illinois
690bfe5 net: usb: Fix memory leak on Tx data path
db138ef ipv6: Set default hoplimit as zero.
3297d60 tcp: fix FIONREAD/SIOCINQ
fdc00ab netlink: use kfree_rcu() in netlink_release()
b232704 sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
8a7173c ALSA: Avoid endless sleep after disconnect
40edba6 ALSA: Add a reference counter to card instance
fb434cc ALSA: usb-audio: Fix races at disconnection in mixer_quirks.c
1456577 ALSA: usb-audio: Use rwsem for disconnect protection
ea7b69a ALSA: usb-audio: Fix races at disconnection
61bc285 ALSA: PCM: Fix some races at disconnection
ec1f5bf hwmon: (w83627ehf) Force initial bank selection
356c93d drm: restore open_count if drm_setup fails
4d02840 NFS: Fix Oopses in nfs_lookup_revalidate and nfs4_lookup_revalidate
095a518 NFS: fix bug in legacy DNS resolver.
110d3a2 nfsd: add get_uint for u32's
f354d0c NFSv4: nfs4_locku_done must release the sequence id
6fbd3cd nfs: Show original device name verbatim in /proc/*/mount{s,info}
e4648b1 nfsv3: Make v3 mounts fail with ETIMEDOUTs instead EIO on mountd timeouts
9c750c9 mac80211: fix SSID copy on IBSS JOIN
03938ad mac80211: check management frame header length
2dda2bb DRM/Radeon: Fix Load Detection on legacy primary DAC.
6f8acfd mac80211: don't inspect Sequence Control field on control frames
4bdd5ed wireless: drop invalid mesh address extension frames
58bca02 cfg80211: fix antenna gain handling
f100fdf target: Don't return success from module_init() if setup fails
4a7dfa5 rt2800: validate step value for temperature compensation
a699cd3 ath9k: fix stale pointers potentially causing access to free'd skbs
7e28734 config: Change N80xx default UI window to 3
5ddd587 ARM: SMP: use a timing out completion for cpu hotplug
3c3b858 n7100 support
ac7b56f Linux 3.0.51
a8a0b23 drm/nouveau: silence modesetting spam on pre-gf8 chipsets
e418b3b mm: fix XFS oops due to dirty pages without buffers on s390
05e0274 x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
2000afe floppy: do put_disk on current dr if blk_init_queue fails
27d0858 Linux 3.0.50
ba90d99 drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
5a30fdd staging: comedi: amplc_pc236: fix invalid register access during detach
0ac1713 x86, mm: Undo incorrect revert in arch/x86/mm/init.c
0582e57 x86, mm: Find_early_table_space based on ranges that are actually being mapped
eccd54a cpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code
0ff89134 bcma: fix unregistration of cores
0dab9d1 mac80211: check if key has TKIP type before updating IV
2689cd6 ARM: at91/i2c: change id to let i2c-gpio work
83dab46 vhost: fix mergeable bufs on BE hosts
713b9c2 xhci: Fix potential NULL ptr deref in command cancellation.
44ddc9a USB: mos7840: remove invalid disconnect handling
c48cddb USB: mos7840: remove NULL-urb submission
52fb227 USB: mos7840: fix port-device leak in error path
de3ca50 USB: mos7840: fix urb leak at release
25a665e USB: sierra: fix memory leak in probe error path
866cf67 USB: sierra: fix memory leak in attach error path
3edf35a USB: serial: Fix memory leak in sierra_release()
8766126 USB: opticon: fix memory leak in error path
84c1f11 USB: opticon: fix DMA from stack
a48db00 USB: whiteheat: fix memory leak in error path
974ee86 usb hub: send clear_tt_buffer_complete events when canceling TT clear work
4ed0b57 usb-storage: add unusual_devs entry for Casio EX-N1 digital camera
2996976 ehci: Add yet-another Lucid nohandoff pci quirk
3f89e7a ehci: fix Lucid nohandoff pci quirk to be more generic with BIOS versions
e17ce2e sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
910e425 SUNRPC: Prevent races in xs_abort_connection()
16b7109 Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."
5acfec9 SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT
5b34d96 SUNRPC: Get rid of the xs_error_report socket callback
387373e ARM: 7559/1: smp: switch away from the idmap before updating init_mm.mm_count
b6d1ac7 genalloc: stop crashing the system when destroying a pool
681c9b8 drivers/rtc/rtc-imxdi.c: add missing spin lock initialization
ab41bb2 fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check
ed12438 gen_init_cpio: avoid stack overflow when expanding
d9ee258 Linux 3.0.49
29b3f4e xHCI: handle command after aborting the command ring
4b360f4 xHCI: cancel command after command timeout
bc47204 xHCI: add aborting command ring function
c76e4de xHCI: add cmd_ring_state
63d9249 sparc64: Be less verbose during vmemmap population.
6c2bbdc sparc64: do not clobber personality flags in sys_sparc64_personality()
7583ffe sparc64: Fix bit twiddling in sparc_pmu_enable_event().
7f6df60 sparc64: Like x86 we should check current->mm during perf backtrace generation.
ad88238 sparc64: fix ptrace interaction with force_successful_syscall_return()
4d306c2 tcp: resets are misrouted
445b290 RDS: fix rds-ping spinlock recursion
17989e5 skge: Add DMA mask quirk for Marvell 88E8001 on ASUS P5NSLI motherboard
5891cb7 net: Fix skb_under_panic oops in neigh_resolve_output
06d96e5 drm/i915: apply timing generator bug workaround on CPT and PPT
6613dbb media: au0828: fix case where STREAMOFF being called on stopped stream causes BUG()
a322f9a amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]
f0c76f5 cgroup: notify_on_release may not be triggered in some cases
68e919c USB: option: add more ZTE devices
c01321d USB: option: blacklist net interface on ZTE devices
24d76b9 usb: acm: fix the computation of the number of data bits
1468380 USB: cdc-acm: fix pipe type of write endpoint
1ad744c xen/x86: don't corrupt %eip when returning from a signal handler
bd7bca8 x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
2f3dc85 use clamp_t in UNAME26 fix
58793e9 kernel/sys.c: fix stack memory content leak via UNAME26
7b48126 pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
0fc01fa Revert: lockd: use rpc client's cl_nodename for id encoding
7a104fc SUNRPC: Prevent kernel stack corruption on long values of flush
ef9fccf oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
c303f82 NLM: nlm_lookup_file() may return NLMv4-specific error codes
e114f9e arch/tile: avoid generating .eh_frame information in modules
b1b33a2 Fix camera for N80xx
9fc7170 Linux 3.0.48
798e16a Revert "block: fix request_queue->flags initialization"
e496537 Linux 3.0.47
87df253 ALSA: emu10k1: add chip details for E-mu 1010 PCIe card
28551b8 ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new()
b08d7db udf: fix retun value on error path in udf_load_logicalvol
39a0885 tpm: Propagate error from tpm_transmit to fix a timeout hang
8b9b3bf x86, random: Verify RDRAND functionality and allow it to be disabled
5faf9fc x86, random: Architectural inlines to get random integers with RDRAND
b88ac13 jbd: Fix assertion failure in commit code due to lacking transaction credits
cbdf110 drm/radeon: Don't destroy I2C Bus Rec in radeon_ext_tmds_enc_destroy().
298d042 Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
dfd5603 netfilter: xt_limit: have r->cost != 0 case work
fb3c4ac netfilter: limit, hashlimit: avoid duplicated inline
de07e51 netfilter: nf_ct_expect: fix possible access to uninitialized timer
01f66df netfilter: nf_nat_sip: fix via header translation with multiple parameters
4b55215 ipvs: fix oops on NAT reply in br_nf context
2b3e2b5 netfilter: nf_nat_sip: fix incorrect handling of EBUSY for RTCP expectation
7e3cf6e netfilter: nf_ct_ipv4: packets with wrong ihl are invalid
716362d netfilter: nf_conntrack: fix racy timer handling with reliable events
e3c4187 ipvs: fix oops in ip_vs_dst_event on rmmod
e5d5ba9 tg3: Apply short DMA frag workaround to 5906
dd81262 pktgen: fix crash when generating IPv6 packets
a6a1e89 timers: Fix endless looping between cascade() and internal_add_timer()
c420df2 viafb: don't touch clock state on OLPC XO-1.5
52baa89 video/udlfb: fix line counting in fb_write
17313c0 module: taint kernel when lve module is loaded
3a738a8 autofs4 - fix reset pending flag on mount fail
2101aa5 block: fix request_queue->flags initialization
d62c80f xen/bootup: allow read_tscp call for Xen PV guests.
57bbd13 xen/bootup: allow {read|write}_cr8 pvops call.
ef9fd53 SUNRPC: Ensure that the TCP socket is closed when in CLOSE_WAIT
72d0ba1 firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
5c025e8 ARM: 7541/1: Add ARM ERRATA 775420 workaround
f38039a tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking
72630f7 mips,kgdb: fix recursive page fault with CONFIG_KPROBES
57600cd ACPI: EC: Add a quirk for CLEVO M720T/M730T laptop
e607831 ACPI: EC: Make the GPE storm threshold a module parameter
12d6370 lockd: use rpc client's cl_nodename for id encoding
d1b9810 ARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels
d874d3c bcmdhd: enable p2p interface
400f867 bcmdhd: restore state from edd8a9171858fad7713b8fc07b158df5114b3c1a (samsung update 4)
40e6f93 Linux 3.0.46
1434cc1 mtd: omap2: fix module loading
ecd111b mtd: omap2: fix omap_nand_remove segfault
ad9ca19 mtd: nand: Use the mirror BBT descriptor when reading its version
776a41b mtd: nandsim: bugfix: fail if overridesize is too big
b4f7f36 mtd: autcpu12-nvram: Fix compile breakage
8f48f1a CPU hotplug, cpusets, suspend: Don't modify cpusets during suspend/resume
d08719c mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma()
29715fe mempolicy: fix refcount leak in mpol_set_shared_policy()
cedd186 mempolicy: fix a race in shared_policy_replace()
e12681f mempolicy: remove mempolicy sharing
bdd7794 revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages"
f074e60 r8169: call netif_napi_del at errpaths and at driver unload
c903340 r8169: fix unsigned int wraparound with TSO
768551e r8169: 8168c and later require bit 0x20 to be set in Config2 for PME signaling.
68c9338 r8169: Config1 is read-only on 8168c and later.
f6e16b7 r8169: runtime resume before shutdown.
1854f0e r8169: missing barriers.
8ffd1cb r8169: fix Config2 MSIEnable bit setting.
85ce022 r8169: Rx FIFO overflow fixes.
c43209e r8169: increase the delay parameter of pm_schedule_suspend
11bd9be r8169: expand received packet length indication.
cc669c3 r8169: jumbo fixes.
da2b1b7 r8169: remove erroneous processing of always set bit.
5676605 r8169: don't enable rx when shutdown.
39ee330 r8169: fix wake on lan setting for non-8111E.
3f6ea7b rcu: Fix day-one dyntick-idle stall-warning bug
a0e49be drm/radeon: force MSIs on RS690 asics
32a9bbd drm/radeon: Add MSI quirk for gateway RS690
6a971de drm/radeon: only adjust default clocks on NI GPUs
70deff0 ALSA: USB: Support for (original) Xbox Communicator
8f5f4d2 ALSA: usb - disable broken hw volume for Tenx TP6911
7aa79b1 ALSA: aloop - add locking to timer access
6c06bd6 mm: thp: fix pmd_present for split_huge_page and PROT_NONE with THP
4999673 mm: fix invalidate_complete_page2() lock ordering
0e3f2bd ASoC: wm9712: Fix name of Capture Switch
a6c0070 ext4: fix fdatasync() for files with only i_size changes
985f704 ext4: always set i_op in ext4_mknod()
48fa077 ext4: online defrag is not supported for journaled files
7f5397a PCI: Check P2P bridge for invalid secondary/subordinate range
e4fdc6c SCSI: zfcp: only access zfcp_scsi_dev for valid scsi_device
9745d6c SCSI: zfcp: restore refcount check on port_remove
2e54c4f SCSI: zfcp: remove invalid reference to list iterator variable
e120cc4 SCSI: zfcp: Do not wakeup while suspended
c25b541 SCSI: zfcp: Make trace record tags unique
2cf80ae tg3: Fix TSO CAP for 5704 devs w / ASF enabled
dbbfb5c aoe: assert AoE packets marked as requiring no checksum
70875a0 net: do not disable sg for packets requiring no checksum
6a992a9 netrom: copy_datagram_iovec can fail
60e6a18 l2tp: fix a typo in l2tp_eth_dev_recv()
92da074 ipv6: mip6: fix mip6_mh_filter()
27ab68c ipv6: raw: fix icmpv6_filter()
a1b995a ipv4: raw: fix icmp_filter()
1a6b2c9 net: guard tcp_set_keepalive() to tcp sockets
74665a9 net: small bug on rxhash calculation
0ddaf88 pppoe: drop PPPOX_ZOMBIEs in pppoe_release
126268e sctp: Don't charge for data in sndbuf again when transmitting packet
75cb41f tcp: flush DMA queue before sk_wait_data if rcv_wnd is zero
61c7891 ipv6: release reference of ip6_null_entry's dst entry in __ip6_del_rt
4ea3465 8021q: fix mac_len recomputation in vlan_untag()
1af3bea sierra_net: Endianess bug fix.
3f99fee pkt_sched: fix virtual-start-time update in QFQ
829f216 net-sched: sch_cbq: avoid infinite loop
b89ea13 netxen: check for root bus in netxen_mask_aer_correctable
c56a0fd ixp4xx_hss: fix build failure due to missing linux/module.h inclusion
46462f2 net: ethernet: davinci_cpdma: decrease the desc count when cleaning up the remaining packets
3d39c3b xfrm_user: ensure user supplied esn replay window is valid
cc4d0d8 xfrm_user: don't copy esn replay window twice for new states
c33fcb8 xfrm_user: fix info leak in copy_to_user_tmpl()
a601da7 xfrm_user: fix info leak in copy_to_user_policy()
2f21f426 xfrm_user: fix info leak in copy_to_user_state()
2ed1aea xfrm_user: fix info leak in copy_to_user_auth()
72ab84b xfrm: fix a read lock imbalance in make_blackhole
182d22d xfrm_user: return error pointer instead of NULL #2
66c41c8 xfrm_user: return error pointer instead of NULL
7218add xfrm: Workaround incompatibility of ESN and async crypto
21de4eb workqueue: add missing smp_wmb() in process_one_work()
fe77d1b drivers/scsi/atp870u.c: fix bad use of udelay
faaeea3 kernel/sys.c: call disable_nonboot_cpus() in kernel_restart()
7151b69 lib/gcd.c: prevent possible div by 0
073c05b PCI: acpiphp: check whether _ADR evaluation succeeded
6aca02a ACPI: run _OSC after ACPI_FULL_INITIALIZATION
8a6c264 media: rc: ite-cir: Initialise ite_dev::rdev earlier
58e6b5c kbuild: make: fix if_changed when command contains backslashes
36cc783 mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
95661c3 Merge "wakelock: use single threaded workqueueus" into jellybean
b8be62e bcmdhd: Reenable IPv6, disable multicast in suspend
7cf296f wakelock: use single threaded workqueueus
24e842a Linux 3.0.45
d71df54 SCSI: scsi_dh_alua: Enable STPG for unavailable ports
8fda079 SCSI: scsi_remove_target: fix softlockup regression on hot remove
fc3ef18 PCI: honor child buses add_size in hot plug configuration
368d531 x86/alternatives: Fix p6 nops on non-modular kernels
42cc576 isci: fix isci_pci_probe() generates warning on efi failure path
7385895 IB/srp: Avoid having aborted requests hang
7846edb IB/srp: Fix use-after-free in srp_reset_req()
0a44207 IPoIB: Fix use-after-free of multicast object
d125a7e can: mscan-mpc5xxx: fix return value check in mpc512x_can_get_clock()
c07ad5e SCSI: hpsa: Use LUN reset instead of target reset
a3b1f83 SCSI: ibmvscsi: Fix host config length field overflow
079c1ed UBI: fix autoresize handling in R/O mode
e54195a n_gsm: memory leak in uplink error path
a4e92d2 Increase XHCI suspend timeout to 16ms
7c36d46 coredump: prevent double-free on an error path in core dumper
9ce5f86 n_gsm: added interlocking for gsm_data_lock for certain code paths
9c1ce83 xhci: Intel Panther Point BEI quirk.
c19d52a firmware: Add missing attributes to EFI variable attribute print out from sysfs
f39a3e8 b43legacy: Fix crash on unload when firmware not available
d482e8f serial: set correct baud_base for EXSYS EX-41092 Dual 16950
f580d51 serial: pl011: handle corruption at high clock speeds
63959b0 TTY: ttyprintk, don't touch behind tty->write_buf
0950902 Remove BUG_ON from n_tty_read()
8455d77 staging: comedi: fix memory leak for saved channel list
03acba6 staging: comedi: don't dereference user memory for INSN_INTTRIG
e451b6d staging: comedi: jr3_pci: fix iomem dereference
99f7fee staging: comedi: s626: don't dereference insn->data
bf26fa2 staging: speakup_soft: Fix reading of init string
bd6a0fa USB: qcaux: add Pantech vendor class match
3f72cbc USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support
952c5d8 USB: option: blacklist QMI interface on ZTE MF683
7da444a dm: handle requests beyond end of device instead of using BUG_ON
d2212d2 vfs: dcache: fix deadlock in tree traversal
b9a7985 Linux 3.0.44
54d4d42 ARM: 7467/1: mutex: use generic xchg-based implementation for ARMv6+
b15ab4a USB: Fix race condition when removing host controllers
8ef8fa7 MCE: Fix vm86 handling for 32bit mce handler
ca465ba sched: Fix ancient race in do_exit()
81e8058 spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
7388a98 spi/mpc83xx: fix NULL pdata dereference bug
aaa9ef3 UBI: fix a horrible memory deallocation bug
41cc15c e1000e: Disable ASPM L1 on 82574
cfa379de mmc: Prevent 1.8V switch for SD hosts that don't support UHS modes.
09e4ad5 mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode
9523d52 Squashfs: fix mount time sanity check for corrupted superblock
b960ba5 pch_uart: Fix parity setting issue
4b14f6f pch_uart: Fix rx error interrupt setting issue
00b35456 pch_uart: Fix missing break for 16 byte fifo
abfbc26 media: Avoid sysfs oops when an rc_dev's raw device is absent
fe979e2 time: Move ktime_t overflow checking into timespec_valid_strict
4ffa9a8 time: Avoid making adjustments if we haven't accumulated anything
44fa9a0 time: Improve sanity checking of timekeeping inputs
81cee4e drop_monitor: dont sleep in atomic context
2c51de7 drop_monitor: prevent init path from scheduling on the wrong cpu
b2f89a7 drop_monitor: Make updating data->skb smp safe
34c0bc4 drop_monitor: fix sleeping in invalid context warning
ae04311 media: lirc_sir: make device registration work
64ac72f sched: Fix race in task_group()
cf0a716 cpufreq / ACPI: Fix not loading acpi-cpufreq driver regression
894682f libata: Prevent interface errors with Seagate FreeAgent GoFlex
25dee10 rds: set correct msg_namelen
45516dd Fix a dead loop in async_synchronize_full()
b64295e net: Statically initialize init_net.dev_base_head
41ed10a Bluetooth: Add support for Apple vendor-specific devices
4d94c8c Bluetooth: Use USB_VENDOR_AND_INTERFACE() for Broadcom devices
d10d2f0 Bluetooth: btusb: Add vendor specific ID (0a5c:21f4) BCM20702A0
b69eba7 x86: Fix boot on Twinhead H12Y
bc713e2 workqueue: UNBOUND -> REBIND morphing in rebind_workers() should be atomic
e2471ec drm/i915: HDMI - Clear Audio Enable bit for Hot Plug
7693ca1 asus-nb-wmi: add some video toggle keys
06aac3b asus-laptop: HRWS/HWRS typo
062a59e drm/radeon/kms: extend the Fujitsu D3003-S2 board connector quirk to cover later silicon stepping
eafd7bd fbcon: fix race condition between console lock and cursor timer (v1.1)
9b3746b drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources
d6163c4 PM / Runtime: Clear power.deferred_resume on success in rpm_suspend()
5af14b8 PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set
f20560e drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode
d0179ca mutex: Place lock in contended state after fastpath_lock failure
e3439be xhci: Fix bug after deq ptr set to link TRB.
d8ec66c usb: host: xhci: fix compilation error for non-PCI based stacks
b1e81ba xhci: Recognize USB 3.0 devices as superspeed at powerup
f78e6ad xhci: Make handover code more robust
c0a168c xhci: Fix a logical vs bitwise AND bug
4a4c06b Intel xhci: Only switch the switchable ports
d515ad3 USB: add device quirk for Joss Optical touchboard
15e8756 USB: ftdi-sio: add support for more Physik Instrumente devices
0c361a3 USB: ftdi_sio: do not claim CDC ACM function
a16bd7c USB: ftdi_sio: PID for NZR SEM 16+ USB
ebf16a5b EHCI: Update qTD next pointer in QH overlay region during unlink
863f36b NFS: return error from decode_getfh in decode open
d351ebe NFS: Fix a problem with the legacy binary mount code
839e17b NFS: Fix the initialisation of the readdir 'cookieverf' array
b4395a1 rt2x00: Fix rfkill polling prior to interface start.
d89abc3 rt2x00: Fix word size of rt2500usb MAC_CSR19 register.
e24fd51 dmaengine: at_hdmac: check that each sg data length is non-null
5b77c2c dmaengine: at_hdmac: fix comment in atc_prep_slave_sg()
2cfb6b1 cfg80211: fix possible circular lock on reg_regdb_search()
cf90cf8 can: janz-ican3: fix support for older hardware revisions
2704f7f can: ti_hecc: fix oops during rmmod
7f3db96 asix: Support DLink DUB-E100 H/W Ver C1
31a4eee Input: i8042 - disable mux on Toshiba C850D
b086921 tracing: Don't call page_to_pfn() if page is NULL
ae9973c ARM: 7532/1: decompressor: reset SCTLR.TRE for VMSA ARMv7 cores
b8751608 ARM: fix bad applied patch for arch/arm/Kconfig of stable 3.0.y tree.
5001e3e hpwdt: Fix kdump issue in hpwdt
9d1abc4 SCSI: hpsa: fix handling of protocol error
880d7a7 SCSI: bnx2i: Fixed NULL ptr deference for 1G bnx2 Linux iSCSI offload
9772793 SCSI: mpt2sas: Fix for issue - Unable to boot from the drive connected to HBA
b0871df hwmon: (ads7871) Add 'name' sysfs attribute
fe7e822 hwmon: (fam15h_power) Tweak runavg_range on resume
d83fc0b xen/boot: Disable NUMA for PV guests.
2aab466 memory hotplug: fix section info double registration bug
0f8c1df mm/ia64: fix a memory block size bug
9680ec7 can: mcp251x: avoid repeated frame bug
bc2f6ff hwmon: (twl4030-madc-hwmon) Initialize uninitialized structure elements
d344b6d drivers/rtc/rtc-twl.c: ensure all interrupts are disabled during probe
54fd21c mm/page_alloc: fix the page address of higher page's buddy calculation
f265780 md: Don't truncate size at 4TB for RAID0 and Linear
5e5369d Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
f8ec0c2 kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
ad0b57d ahci: Add alternate identifier for the 88SE9172
0afe881 mmc: sdhci-esdhc: break out early if clock is 0
2df2bfd mmc: mxs-mmc: fix deadlock in SDIO IRQ case
71f08eb perf_event: Switch to internal refcount, fix race with close()
d982d2f USB: option: replace ZTE K5006-Z entry with vendor class rule
b004f11 staging: comedi: das08: Correct AO output for das08jr-16-ao
7bdec51 staging: r8712u: fix bug in r8712_recv_indicatepkt()
ef7d68b staging: vt6656: [BUG] - Failed connection, incorrect endian.
274fca5 Staging: speakup: fix an improperly-declared variable.
c820f12 ALSA: ice1724: Use linear scale for AK4396 volume control.
e3653af target: Fix ->data_length re-assignment bug with SCSI overflow
047b8d01 eCryptfs: Copy up attributes of the lower target inode after rename
b0b5cee netconsole: remove a redundant netconsole_target_put()
8b2b69f vfs: dcache: use DCACHE_DENTRY_KILLED instead of DCACHE_DISCONNECTED in d_kill()
c168d49 vfs: make O_PATH file descriptors usable for 'fstat()'
cf8d67a cciss: fix handling of protocol error
4b1785a cpufreq/powernow-k8: workqueue user shouldn't migrate the kworker to another CPU
3d45db6 workqueue: reimplement work_on_cpu() using system_wq
896b6af net: ipv4: ipmr_expire_timer causes crash when removing net namespace
928863a l2tp: avoid to use synchronize_rcu in tunnel free function
f8df5b8 netlink: fix possible spoofing from non-root processes
7a62b44 net: fix info leak in compat dev_ifconf()
b565185 ipvs: fix info leak in getsockopt(IP_VS_SO_GET_TIMEOUT)
500e5c9 dccp: fix info leak via getsockopt(DCCP_SOCKOPT_CCID_TX_INFO)
27fb5ec llc: fix info leak via getsockname()
6ffb80e Bluetooth: L2CAP - Fix info leak via getsockname()
00553f5 Bluetooth: RFCOMM - Fix info leak via getsockname()
416a675 Bluetooth: RFCOMM - Fix info leak in ioctl(RFCOMMGETDEVLIST)
f1c0a71 Bluetooth: HCI - Fix info leak via getsockname()
1b917a7 Bluetooth: HCI - Fix info leak in getsockopt(HCI_FILTER)
d5d3ca7 atm: fix info leak via getsockname()
9a897ce atm: fix info leak in getsockopt(SO_ATMPVC)
f9b6cac ipv6: addrconf: Avoid calling netdevice notifiers with RCU read-side lock
2d1244f af_packet: remove BUG statement in tpacket_destruct_skb
e869e62 net/core: Fix potential memory leak in dev_set_alias()
c5c04e2 isdnloop: fix and simplify isdnloop_init()
d5916de net_sched: gact: Fix potential panic in tcf_gact().
09c403d tcp: Apply device TSO segment limit earlier
8a15a4b sfc: Fix maximum number of TSO segments and minimum TX queue size
7f8742a net: Allow driver to limit number of GSO segments per skb
3d1181d Remove isx012 ratio check as it crashes the n80xx
99f8b80 modem_if: disable printing of IPC-RX/TX messages
28fac0f max77693: fix debugging
7bc6b9c max77693: fix overbloated debug message
cccb231 max77686: disable debugging code
b41d9d9 mms_ts: comment some debugging code
3e8fe91 Merge "bcmdhd: change packet filter settings to block multicast" into jellybean
dc24673 bcmdhd: change packet filter settings to block multicast
2d094d0 Merge "mali: fix getting subversion revision number" into jellybean
f99e726 mali: fix getting subversion revision number
21087eb GT-N80XX defconfig
25c3e5a tspdrv: Add missing ISA1200 file
fc40e40 synaptics: Add S7301 touchscreen driver
2489007 merge opensource jb u5
5f67568 fix permission issue which prevents "active tasks" shown in
f991bd2a Merge linux-3.0.31 from korg into jellybean
c282657 applied patches from i9305 jb sources, updated mali to r3p0
3d2e7b3 Linux 3.0.43
8f365b6 hwmon: (asus_atk0110) Add quirk for Asus M5A78L
a629a20 dccp: check ccid before dereferencing
2b6007f PARISC: Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
839b995 drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot
cc75079 Input: i8042 - add Gigabyte T1005 series netbooks to noloop table
fd63204 fuse: fix retrieve length
04234b3 ext3: Fix fdatasync() for files with only i_size changes
31147bc udf: Fix data corruption for files in ICB
778105a SCSI: Fix 'Device not ready' issue on mpt2sas
a87c6c9 SCSI: mpt2sas: Fix for Driver oops, when loading driver with max_queue_depth command line option to a very small value
b787880 SCSI: megaraid_sas: Move poll_aen_lock initializer
3ee8d64 Remove user-triggerable BUG from mpol_to_str
7b296be powerpc: Restore correct DSCR in context switch
52640df powerpc: Fix DSCR inheritance in copy_thread()
52340b6 USB: CDC ACM: Fix NULL pointer dereference
9f48c23 USB: smsusb: remove __devinit* from the struct usb_device_id table
42d6954 USB: rtl8187: remove __devinit* from the struct usb_device_id table
82c6c33 USB: p54usb: remove __devinit* from the struct usb_device_id table
6a239aa USB: spca506: remove __devinit* from the struct usb_device_id table
7201325 block: replace __getblk_slow misfix by grow_dev_page fix
3696bb1 PCI: EHCI: Fix crash during hibernation on ASUS computers
c227ece ath9k: fix decrypt_error initialization in ath_rx_tasklet()
92c4d22 ACPI: export symbol acpi_get_table_with_size
06c7487 cciss: fix incorrect scsi status reporting
b8e52a4 svcrpc: sends on closed socket should stop immediately
299ee06 svcrpc: fix svc_xprt_enqueue/svc_recv busy-looping
e684493 svcrpc: fix BUG() in svc_tcp_clear_pages
830cd76 audit: fix refcounting in audit-tree
56e4562 audit: don't free_chunk() after fsnotify_add_mark()
002d412 NFS: Alias the nfs module to nfs4
4ad55ff NFSv4.1: Remove a bogus BUG_ON() in nfs4_layoutreturn_done
9516c03 NFSv3: Ensure that do_proc_get_root() reports errors correctly
8959204 mm: hugetlbfs: correctly populate shared pmd
eb2f4fb USB: winbond: remove __devinit* from the struct usb_device_id table
4f7da69 alpha: Don't export SOCK_NONBLOCK to user space.
3db5984 vfs: canonicalize create mode in build_open_flags()
57dba9b vfs: missed source of ->f_pos races
0253e78 ASoC: wm9712: Fix microphone source selection
d9026c7 ARM: imx: select CPU_FREQ_TABLE when needed
88b6962 ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
c616bd5 ARM: 7489/1: errata: fix workaround for erratum #720789 on UP systems
cb8a66c ARM: 7488/1: mm: use 5 bits for swapfile type encoding
9a0417a ARM: 7487/1: mm: avoid setting nG bit for user mappings that aren't present
33fe660 ALSA: hda - fix Copyright debug message
4281412 USB: emi62: remove __devinit* from the struct usb_device_id table
49f75e9 USB: vt6656: remove __devinit* from the struct usb_device_id table

   * libcore
35d2187 Values in ZIP files are unsigned.
ac16122 Only enforce the encrypted bit in the GPBF, and ignore other unsupported bits.
63cd294 Don't install APK files with unsupported General Purpose Bit Flag bits.
53ce79b Clean up ZipFile a little, fix a few bugs, and improve the documentation.
a23d6eb Add detail messages to all the easy IllegalArgumentException cases.
f96064d Revert "Values in ZIP files are unsigned."
fb94a6a Values in ZIP files are unsigned.
fe70e69 Remove support for duplicate file entries
8a22bed libcore: Better Enum fix for JDK 7
27196eb GC triggering performance optimizations
6e80bc6 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/libcore into 1.1
359aafc Fix compilation of Enum on JDK 7
cc55503 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
e888585 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/libcore into mr1
6218bfe Revert "Add two more GC parameter interfaces"
8dd90ae Lazy parsing of zip files for Java resources.
7b5bfdf Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
17280ff merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
548fbbd merge in jb-mr1-release history after reset to jb-mr1-dev
85c4f32 Bump ThreadsTest tolerance from 5% to 10%
1eb3485 merge in jb-mr1-release history after reset to jb-mr1-dev
eef7e93 Test to verify BC Signature algorithms by OID
3531e14 merge in jb-mr1-release history after reset to jb-mr1-dev
50e0be6 Wait for threads to finish in ThreadsTest before continuing
5536b5c merge in jb-mr1-release history after reset to jb-mr1-dev
0e1afa1 Fix ConcurrentCloseTest flakiness.
d2de5f3 merge in jb-mr1-release history after reset to jb-mr1-dev
45b4903 Merge "Fix flakiness with InterruptedStreamTest DO NOT MERGE" into jb-mr1-dev
105068e Merge "Fix test flakiness." into jb-mr1-dev
835e3e3 merge in jb-mr1-release history after reset to jb-mr1-dev
243111f Fix flakiness with InterruptedStreamTest DO NOT MERGE
2b096f6 Fix test flakiness.
6c84204 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
f86b7fe Fix ThreadsTest use of CyclicBarrier
b0698db merge in jb-mr1-release history after reset to jb-mr1-dev
dd3dd77 Change ThreadsTest to use CyclicBarrier to address flakiness
3ba656f merge in jb-mr1-factory-release history after reset to jb-mr1-dev
5e399d7 merge in jb-mr1-release history after reset to jb-mr1-dev
ee9008d merge in jb-mr1-factory-release history after reset to jb-mr1-dev
3645639 merge in jb-mr1-release history after reset to jb-mr1-dev
72e4440 Change OpenSSLCipherRSA.{engineGetBlockSize,engineGetOutputSize} to return result based on key size
7860128 Extra log output for ConcurrentCloseTest flakiness.
0e61312 merge in jb-mr1-release history after reset to jb-mr1-dev
cc5d007 Fix races in OldPreferencesTest.
e06ba13 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/libcore into aosp-merge
f605918 merge in jb-mr1-release history after reset to jb-mr1-dev
83400bd Merge "NativeCrypto: clear errors for key verification" into jb-mr1-dev
29e5133 NativeCryptoTest#test_SSL_do_handshake_clientCertificateRequested_throws_after_renegotiate
f3862a7 NativeCrypto: clear errors for key verification
5896bdb merge in jb-mr1-release history after reset to jb-mr1-dev
e51202d Merge "Ensure we give "tl" the display name "Filipino"." into jb-mr1-dev
b11e44a Fix a bug in tunnel construction and 'Connection: close' headers.
50e50d5 Ensure we give "tl" the display name "Filipino".
2779c6f merge in jb-mr1-release history after reset to jb-mr1-dev
1e8ec26 Merge "Increment OpenSSLKey EVP_PKEY reference when it is selected for use with SSL_use_PrivateKey" into jellybean
b2e6be1 Rewrite NIO Pipe to use socketpair(2).
0a91b3e Increment OpenSSLKey EVP_PKEY reference when it is selected for use with SSL_use_PrivateKey
2ec9cc5 merge in jb-mr1-release history after reset to jb-mr1-dev
77b2088 Merge "NativeCryptoTest#test_SSL_do_handshake_clientCertificateRequested_throws_after_renegotiate failure" into jb-mr1-dev
d18b7a8 Manually inline StrictMath.min(JJ) and StrictMath.max(JJ).
51de62c Fix flaky NativeCryptoTest.test_SSL_do_handshake_client_timeout
db611c5 NativeCryptoTest#test_SSL_do_handshake_clientCertificateRequested_throws_after_renegotiate failure
ad56af9 Fix a native memory leak in SimpleDateFormat cloning.
df27a13 merge in jb-mr1-release history after reset to jb-mr1-dev
3d43199 Fix ConcurrentCloseTest flakiness.
13a0546 merge in jb-mr1-release history after reset to jb-mr1-dev
152e701 merge in jb-mr1-release history after reset to jb-mr1-dev
6d41a7c Strip content length in requests with "transparent" gzip handling.
0c37ea2 Merge branch 'jb-release' of https://android.googlesource.com/platform/libcore into aosp
fce022b Fix flaky finalization tests.
09fec8d am 594aa21e: am 35627363: Merge "Fix umask."
594aa21 am 35627363: Merge "Fix umask."
03c772c Fix umask.
3562736 Merge "Fix umask."
acba45c Fix umask.
8e340ff merge in jb-mr1-release history after reset to jb-mr1-dev
8205bc4 Add write timeout argument to SSL_write calls NativeCryptoTest
615225a Add OpenSSLSocketImpl.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
ba951b3 merge in jb-mr1-release history after reset to jb-mr1-dev
1472867 Merge "Suppress long broken test caused by kernel bug" into jb-mr1-dev
ce1311e Suppress long broken test caused by kernel bug
74b5689 am 722d0b9e: am 5ca6d99a: Merge "Add tests for underscores in URLs."
722d0b9 am 5ca6d99a: Merge "Add tests for underscores in URLs."
5ca6d99 Merge "Add tests for underscores in URLs."
dc24b1b Add tests for underscores in URLs.
abfee56 am 2682316c: am c87dc489: Merge "Add setsid."
2682316 am c87dc489: Merge "Add setsid."
c87dc48 Merge "Add setsid."
6c9b537 Add setsid.
78f02b8 am f0f825cb: am 90bdb9da: Merge "Fix LocaleData.toString once and for all."
f0f825c am 90bdb9da: Merge "Fix LocaleData.toString once and for all."
90bdb9d Merge "Fix LocaleData.toString once and for all."
0ab0d54 am 63529068: am 82d74983: Merge "Fix a native memory leak in SimpleDateFormat cloning."
9833e10 merge in jb-mr1-release history after reset to jb-mr1-dev
66e8297 Fix LocaleData.toString once and for all.
6352906 am 82d74983: Merge "Fix a native memory leak in SimpleDateFormat cloning."
82d7498 Merge "Fix a native memory leak in SimpleDateFormat cloning."
34a3a05 Fix a native memory leak in SimpleDateFormat cloning.
50c0023 am 7252fd9a: am 630a4982: Merge "Remove obsolete ThirdPartyProject.prop files."
7252fd9 am 630a4982: Merge "Remove obsolete ThirdPartyProject.prop files."
630a498 Merge "Remove obsolete ThirdPartyProject.prop files."
e6281f0 Remove obsolete ThirdPartyProject.prop files.
ed4305e merge in jb-mr1-release history after reset to jb-mr1-dev
9473606 Add cached trust anchors to the chain prior to checking pinning.
7b5bf80 Move null check for cert store to the consumer code.
5ab2ad7 Migrate PinFailureLogger to use the DropBox.
aeb2d41 Add dummy DropBox to libcore.
924af71 Restructure logging to ease the transition to dropbox.
5368a32 merge in jb-mr1-release history after reset to jb-mr1-dev
00368ee am 39b41012: am d1e99baf: Merge "Explain the (non-obvious) purpose of IntrinsicTest."
39b4101 am d1e99baf: Merge "Explain the (non-obvious) purpose of IntrinsicTest."
d1e99ba Merge "Explain the (non-obvious) purpose of IntrinsicTest."
56a5c4e Explain the (non-obvious) purpose of IntrinsicTest.
1c55af7 am 0101812e: am e2f9b2c6: Merge "OsConstants: add O_NOFOLLOW"
0101812 am e2f9b2c6: Merge "OsConstants: add O_NOFOLLOW"
e2f9b2c Merge "OsConstants: add O_NOFOLLOW"
5c9add3 Add logging to detect cert pin failures caused by MITM proxies.
dd538c3 OsConstants: add O_NOFOLLOW
a24856c merge in jb-mr1-release history after reset to jb-mr1-dev
5a97188 Make PinListEntry and PinEntryException public for CertPinManagerTest
4d6734d merge in jb-mr1-release history after reset to jb-mr1-dev
719abfb am d23dd0d4: am 90450038: Merge "Consistently use "charsetName" for charset names."
d23dd0d am 90450038: Merge "Consistently use "charsetName" for charset names."
9045003 Merge "Consistently use "charsetName" for charset names."
4606343 am 5d42d06c: am e606a7f6: Merge "Add consistent reasons for NullPointerException"
5d42d06 am e606a7f6: Merge "Add consistent reasons for NullPointerException"
9b9e914 Consistently use "charsetName" for charset names.
e606a7f Merge "Add consistent reasons for NullPointerException"
d43b9ef Add consistent reasons for NullPointerException
16edf9b Merge "Add consistent reasons for NullPointerException" into jb-mr1-dev
048311f merge in jb-mr1-release history after reset to jb-mr1-dev
8d6c578 am dad6b628: am 480d35bc: Merge "Manually inline StrictMath.min(JJ) and StrictMath.max(JJ)."
2827b1f am c9411f30: am 3f905a73: Merge "Document that Random.nextGaussian should use StrictMath."
dad6b62 am 480d35bc: Merge "Manually inline StrictMath.min(JJ) and StrictMath.max(JJ)."
c9411f3 am 3f905a73: Merge "Document that Random.nextGaussian should use StrictMath."
480d35b Merge "Manually inline StrictMath.min(JJ) and StrictMath.max(JJ)."
3f905a7 Merge "Document that Random.nextGaussian should use StrictMath."
bf9c479 Manually inline StrictMath.min(JJ) and StrictMath.max(JJ).
e390842 Fix Security2Test to not be case sensitive
86acc04 Add consistent reasons for NullPointerException
1bde17b merge in jb-mr1-release history after reset to jb-mr1-dev
e88bbba Added event logging to PinListEntry.
6d2a17a Added basic cert pinning support.
fe8b870 Tracking upgrade to bouncycastle 1.47
f099327 am a1359997: am 9f519e17: Merge "Add OpenSSLProvider support for Cipher.RSA/None/PKCS1Padding"
a135999 am 9f519e17: Merge "Add OpenSSLProvider support for Cipher.RSA/None/PKCS1Padding"
9f519e1 Merge "Add OpenSSLProvider support for Cipher.RSA/None/PKCS1Padding"
0a156e0 Add OpenSSLProvider support for Cipher.RSA/None/PKCS1Padding
b373230 Document that Random.nextGaussian should use StrictMath.
329203d merge in jb-mr1-release history after reset to jb-mr1-dev
0715b5f am f8cc0581: am c71eceac: Merge "Get expat header files from the approved location."
f8cc058 am c71eceac: Merge "Get expat header files from the approved location."
c71ecea Merge "Get expat header files from the approved location."
44d7372 Get expat header files from the approved location.
ecb9322 merge in jb-mr1-release history after reset to jb-mr1-dev
5ab0d1d KeyStoreTest should not populate read only KeyStores
40ee742 merge in jb-mr1-release history after reset to jb-mr1-dev
e25cfef am ab991b57: am 43211dce: Merge "Make FileDescriptor.sync() work on ttys"
ab991b5 am 43211dce: Merge "Make FileDescriptor.sync() work on ttys"
43211dc Merge "Make FileDescriptor.sync() work on ttys"
c44b3f5 Better OpenSSL key comparison
19dca0f merge in jb-mr1-release history after reset to jb-mr1-dev
bb5816a Make FileDescriptor.sync() work on ttys
c455ce4 am 2c417207: am f26e2ed8: Merge "Fix date parsing for RTL languages such as Arabic."
2c41720 am f26e2ed8: Merge "Fix date parsing for RTL languages such as Arabic."
f26e2ed Merge "Fix date parsing for RTL languages such as Arabic."
9596d75 Fix date parsing for RTL languages such as Arabic.
69b153a am 7488cc51: am bc87d13f: Merge "Fix NativeCrypto.d2i_SSL_SESSION to initialize SSL_SESSION\'s cipher field"
7488cc5 am bc87d13f: Merge "Fix NativeCrypto.d2i_SSL_SESSION to initialize SSL_SESSION\'s cipher field"
bc87d13 Merge "Fix NativeCrypto.d2i_SSL_SESSION to initialize SSL_SESSION's cipher field"
5ab6991 merge in jb-mr1-release history after reset to jb-mr1-dev
d37fb6f Performance improvements: DiskLruCache, HttpResponseCache.
8b43d6d Fix NativeCrypto.d2i_SSL_SESSION to initialize SSL_SESSION's cipher field
a138def Disable AndroidKeyStore in libcore tests
6256280 Allow non-password KeyStore in tests
528dfcb am 065d4f55: am 3836bd5f: Merge "Clear errors after failed ENGINE_add"
065d4f5 am 3836bd5f: Merge "Clear errors after failed ENGINE_add"
3836bd5 Merge "Clear errors after failed ENGINE_add"
8ff93a3 am 79b38787: am dd0dee14: Merge "Fix test_KeyStore_setEntry issue"
79b3878 am dd0dee14: Merge "Fix test_KeyStore_setEntry issue"
dd0dee1 Merge "Fix test_KeyStore_setEntry issue"
5ab96b6 Fix test_KeyStore_setEntry issue
7a9767b Merge "Access to all users' external storage." into jb-mr1-dev
832bff6 merge in jb-mr1-release history after reset to jb-mr1-dev
c590a49 am d027b65d: am 36bd86c1: Merge "Disable SSL compression"
d027b65 am 36bd86c1: Merge "Disable SSL compression"
36bd86c Merge "Disable SSL compression"
7695a9b Disable SSL compression
83819f3 am a6af0f95: am 957ffcb2: Merge "Fix SimpleDateFormatTest.java and SimpleTimeZoneTest.java\'s assumption"
2f9779d am d1db9689: am 005ac00d: Merge "Add test for bogus ProtectionParameter"
a6af0f9 am 957ffcb2: Merge "Fix SimpleDateFormatTest.java and SimpleTimeZoneTest.java\'s assumption"
d1db968 am 005ac00d: Merge "Add test for bogus ProtectionParameter"
957ffcb Merge "Fix SimpleDateFormatTest.java and SimpleTimeZoneTest.java's assumption"
005ac00 Merge "Add test for bogus ProtectionParameter"
273ca48 am 364d7f53: am 420036ab: Merge "Add a test for ICU.getScript and ICU.addLikelySubtags."
364d7f5 am 420036ab: Merge "Add a test for ICU.getScript and ICU.addLikelySubtags."
9cc7e40 Fix SimpleDateFormatTest.java and SimpleTimeZoneTest.java's assumption
420036a Merge "Add a test for ICU.getScript and ICU.addLikelySubtags."
a3cb41e Add test for bogus ProtectionParameter
e8a6961 Add a test for ICU.getScript and ICU.addLikelySubtags.
89e98b1 Merge "Add Android KeyStore provider to StandardNames" into jb-mr1-dev
a8ae31b Add Android KeyStore provider to StandardNames
f160fa2 merge in jb-mr1-release history after reset to jb-mr1-dev

   * ndk
6d6807c Build cpufeatures against the NDK.
6d013b7 Merge "Add testcase for issue34613"
4cfc4f4 Merge "Make packaged files universally readable/executable"
9d2b6cc Make packaged files universally readable/executable
4ec8f4f Add testcase for issue34613
9e5835d Merge "Bail out when NDK installation path contains space"
15a3502 Merge "Add testcase for issue 7079906"
2c1bb7c Bail out when NDK installation path contains space
97c3231 Merge "Fix two docs errors"
62a4be7 Merge "Fix run-tests.sh and standalone/run.sh"
ac16c81 Fix run-tests.sh and standalone/run.sh
7fc7d73 Fix two docs errors
5f94281 Add testcase for issue 7079906
2b25b6d Merge "Add --gcc-ver=<vers> option to build list of GNU STL version"
740b725 Merge "Add testcase for issue28598"
35c2ccb Merge "Add testcase for issue22165"
4e0749d Add testcase for issue28598
24767a5 Add testcase for issue22165
313fb0c Merge "Fix Clang MIPS exception personality reloc SEGV."
014e914 Fix Clang MIPS exception personality reloc SEGV.
b6416da Merge "Change TOOLCHAIN_GIT_DATE to now"
8df3bc9 Change TOOLCHAIN_GIT_DATE to now
351ab73 Add --gcc-ver=<vers> option to build list of GNU STL version
8592457 Merge "Fix clang mingw32 build by appending exe to program for GetProgramPath"
31d6877 Merge "Add predefined flags to clang -cc1"
e0ba86c Fix clang mingw32 build by appending exe to program for GetProgramPath
0ee354a Add predefined flags to clang -cc1
554809f Merge "Add -fPIC to CFLAGS in x86-clang3.1/setup.mk."
587fcca Add -fPIC to CFLAGS in x86-clang3.1/setup.mk.
3b09ca3 Merge "Tune patch for toolchain changes on enabling USE_PT_GNU_EH_FRAME"
295cec8 Merge "Add patches for Clang to search for sysroot."
899d371 Merge "Remove unused llvm executables to reduce package size."
0b9102a Merge "Change -ccc-host-triple to -target for Clang."
bf83140 Merge "Use proper postfix for pre-defined LDBL_*."
4cc11f7 Merge "Pass -march=armv7-a for ARM v7 linker to link v7-specific libgcc.a"
38e4521 Merge "Fix 2 tests"
dffc466 Add patches for Clang to search for sysroot.
a2fd84c Remove unused llvm executables to reduce package size.
58dcd5e Change -ccc-host-triple to -target for Clang.
1383114 Use proper postfix for pre-defined LDBL_*.
e7f8b52 Fix 2 tests
ccc2926 Merge "Fix ARM EHABI exceptions for Clang 3.1."
0614734 Pass -march=armv7-a for ARM v7 linker to link v7-specific libgcc.a
34eea26 Merge "New 'ndk-which' convenience script"
f8ada4b Merge "Remove platforms/android-{3,4,5,8}/arch-{x86,mips}"
288e7ba Remove platforms/android-{3,4,5,8}/arch-{x86,mips}
6e563ee Merge "Add --minimal to platforms generation script call"
6076910 Add --minimal to platforms generation script call
ca3127b Merge "Enable -fstack-protector for X86 GCC 4.4.3 toolchain"
87c19cf Merge "Allow crtbegin/end* in c file"
b37c8b8 Fix ARM EHABI exceptions for Clang 3.1.
dd5cdab Enable -fstack-protector for X86 GCC 4.4.3 toolchain
75cecb4 Allow crtbegin/end* in c file
255daa2 Merge "Add i386-pc-linux-gnu- to the list of wrappers for BUILD toolchain"
0792259 Merge "Add build_expat () to build_host_gdb.sh"
a28cb3b Merge "Use arm-linux-androideabi-as by default."
2d5d836 Add build_expat () to build_host_gdb.sh
b614888 Add i386-pc-linux-gnu- to the list of wrappers for BUILD toolchain
ab509a8 Merge "Update unwanted-symbols in libgcc.a"
3710eac5 Update unwanted-symbols in libgcc.a
a51782b Use arm-linux-androideabi-as by default.
3dc82db Merge "Adjust android-10 .. 13 to android-9"
376d8f8 Merge "Enhance make-release.sh to have option to build only linux-x86 package"
8e18148 New 'ndk-which' convenience script
cc42e53 Enhance make-release.sh to have option to build only linux-x86 package
448450d Merge "Enable -fstack-protector for X86 GCC 4.6 toolchain"
48324ed Merge "Fix Clang compile error on test-stlport-full."
a7844c5 Merge "Enable test-compiler-bug-1 test for MIPS/X86."
fd1b75c Merge "Bump up TOOLCHAIN_GIT_DATE; misc fixes"
9205ed2 Bump up TOOLCHAIN_GIT_DATE; misc fixes
7fef8e7 Merge "Backport ".init_array" patches from the upstream."
5549d21 Adjust android-10 .. 13 to android-9
34ed92a Fix Clang compile error on test-stlport-full.
61d9639 Enable test-compiler-bug-1 test for MIPS/X86.
1049c96 Backport ".init_array" patches from the upstream.
c6499be Merge "Remove -Wno-psabi"
6c85647 Merge "Use clang++ for TARGET_CXX instead of clang"
9603c2c Use clang++ for TARGET_CXX instead of clang
d63ed0f Merge "Add test for fix in ARM g++ warning about mangling of <va_list>"
a8af891 Add test for fix in ARM g++ warning about mangling of <va_list>
c52c156 Remove -Wno-psabi

   * packages/apps/Apollo
f1b4d02 Apollo: zh-TW translations
3b6045d Merge "Apollo: Make albums with the same name to use respective album-art/date/etc." into cm-10.1
77a24f6 Apollo: Make albums with the same name to use respective album-art/date/etc.
01fab09 Apollo: SK translation
48d4693 Merge "Apollo: Add menu action to delete current track." into cm-10.1
2c26983 Apollo: Add menu action to delete current track.
6021725 Merge "Add some (optional) debug logging to the player service." into cm-10.1
ed7c82f Merge "Cleanup: Use only one method to shut down the service instead of two." into cm-10.1
ab7dece Merge "Apollo:add: tradtional chinese translation" into cm-10.1
6ed8f22 Apollo: LV translation fix
3320aa9 Apollo: open album by id rather by name and artist.
3f090d6 Apollo:add: tradtional chinese translation
e46607c Add some (optional) debug logging to the player service.
7aa615e Cleanup: Use only one method to shut down the service instead of two.
2d130ba Apollo: LV translation (rebase)
a65ae61 Merge "Apollo: Update Polish translation" into cm-10.1
f16cfad Apollo: PT-BR update translations
6b69963 Apollo: Ignore playlist when name is null.
48fc4ef Apollo: Update Polish translation
3e3d79c Fix merge derp.
ba7e99b Merge "Make sure notification is shown when playback is started via media button intent." into cm-10.1
25527a2 Make sure notification is shown when playback is started via media button intent.
2f2b733 Merge "Don't start playing if we couldn't acquire audio focus." into cm-10.1
00f8f11 Fix audio session ID handling when invoking DSP manager.
3df81e5 Kill off the option to not use RemoteControlClient.
ae09653 Don't start playing if we couldn't acquire audio focus.
a68a6b8 Added PT-PT language support for Apollo
11e45b1 Apollo: PT-BR update translations
43ef1cc Apollo: SK Translations
1b27f92 Merge "Apollo : translation" into cm-10.1
b5b344f Apollo: TR translations
48aaf78 Apollo : translation
a9edef5 Merge "Apollo: RU translation" into cm-10.1
e3547b0 Apollo: CS translation
aca1fdc Apollo: RU translation
0466f85 Apollo: RU translation
b7684c2 Merge "Apollo: Simplified Chinese Translations" into cm-10.1
7ffb04f Merge "Apollo: RU translation" into cm-10.1
74b2125 Apollo: NB translation
1d4aea5 Apollo: Simplified Chinese Translations
465c6d1 Merge "Apollo: DA translation" into cm-10.1
70d7595 Apollo: RU translation
d146601 Merge "Apollo: NL translations" into cm-10.1
0e9ff37 Afrikaans: Add missing translations & plurals
d9aeb22 Apollo: NL translations
7562ea1 Apollo: DA translation
635718a Merge "Apollo: EL translation" into cm-10.1
d9d77db Merge "Apollo : FR translation" into cm-10.1
14da5f7 Apollo: EL translation
aae1c45 Merge "Apollo: HU update translations" into cm-10.1
19154ef en_GB localisation.
c830355 Merge "Add support for playing files and playlists via intent." into cm-10.1
0d0769f Apollo: HU update translations
432c827 Merge "Apollo: Update italian translation" into cm-10.1
aa62e73 Apollo: Update italian translation
899ca66 Apollo: ES translations
019f89b Merge "Improve app widget layouts." into cm-10.1
5061b75 Apollo : FR translation
f03bfef Merge "Make sure to not overflow thread pool." into cm-10.1
0e950db Merge "Init loader manager in main thread." into cm-10.1
5d80be5 Fix applying the lockscreen controls setting on startup.
18b3d93 Init loader manager in main thread.
11c2503 Assorted typo fixes.
ad3ea55 Merge "Don't assume the difference between the singular and plural is only 1 character." into cm-10.1
e2a49d5 Improve app widget layouts.
28eeddd Merge "Fix up app widget background drawables." into cm-10.1
07810c4 Merge "Apollo: Danish translation" into cm-10.1
ceda239 Add support for playing files and playlists via intent.
c696b30 Don't assume the difference between the singular and plural is only 1 character.
937dd0b Make sure to not overflow thread pool.
a273f60 Fix up app widget background drawables.
9a23615 Apollo: Fix aapt warnings
98bf6f4 Apollo: Danish translation
e041e12 Merge "Add Apollo uk_UA translation" into cm-10.1
fce6e05 Apollo: Remove non-translatable strings
56095a5 Merge "Adding translatable false tag to some lines" into cm-10.1
f84b2da Adding translatable false tag to some lines
3499e32 Apollo: Add Greek Translation
fc0c6d7 Apollo: Added Norwegian translation
c2a551b Add Apollo uk_UA translation
d17070a Merge "Apollo: updated Finnish translation" into cm-10.1
175c57e PT-BR: Update translation
7e1d250 Merge "PT-BR: Update translation" into cm-10.1
aeab327 Merge "Apollo: NL translations" into cm-10.1
1a339a3 PT-BR: Update translation
d288d66 Merge "Apollo: Disable hardware acceleration in ColorPickerView" into cm-10.1
76666c8 Apollo: NL translations
cfe676e Merge "Update Russian Translation-Apollo-CM10.1" into cm-10.1
7760110 Apollo: Update italian translation
19d08ef Update Russian Translation-Apollo-CM10.1
5a04671 Merge "Apollo: improve default translations" into cm-10.1
43e8989 Merge "Apollo: Add Simplified Chinese Translations" into cm-10.1
09d32e3 Apollo: improve default translations
7729ed8 Apollo: Update German translation
8d9ed32 Apollo: Disable hardware acceleration in ColorPickerView
3506c4b Apollo: Fix afrikaans aapt warning
1003a7f Merge "Add Afrikaans translation" into cm-10.1
2584c7e Fix notification widget start
c1dfdc8 Add Afrikaans translation
467b226 Merge "Japanese : Initial Japanese translation for new Applo." into cm-10.1
21c8304 Fix up bitmap config check.
c549f66 Invert Play/Pause buttons in Notification widget
a7e4a6b Apollo: updated Finnish translation
22bcf1c Fix NPE
271e07a Japanese : Initial Japanese translation for new Applo.
18a53ae Merge "Added Russian Translation-Apollo-CM10.1" into cm-10.1
d6608d8 Merge "es_ES: Add spanish translations" into cm-10.1
f4d9084 Merge "Apollo: Update italian translation" into cm-10.1
d18ad89 Merge "Apollo: Update italian translation" into cm-10.1
b49e644 Merge "Apollo: Added Polish language" into cm-10.1
d8f455b Merge "Apollo: Add French translation" into cm-10.1
ee2d96e Add German translation.
4399448 Apollo: Add Simplified Chinese Translations
4439577 Added Russian Translation-Apollo-CM10.1
c08a0d2 Apollo: Added Polish language
400df99 Fix crash
2703ec4 Convert line endings
4442fd4 es_ES: Add spanish translations
4c8eebe Apollo: Hungarian translations
c7eca53 Apollo: Update italian translation
d1c2c6d Apollo: Add French translation
81c7ae7 Merge "Apollo: Don't reduce visibility of hasDividerBeforeChildAt" into cm-10.1
3e27a6b Improve translability of some items.
dfce2d1 Remove unused strings.
86e4d7c Apollo: Update italian translation
30aaeb9 Apollo: Don't reduce visibility of hasDividerBeforeChildAt
8bd9470 Apollo: update resources
4f3e7d0 Merge remote-tracking branch 'github/master' into HEAD
e1608e7 Send com.android.music prefixed sticky broadcasts
270228b Put play state information in the sticky broadcast again.
2e86a62 Replace the music app again.
332687d Fix typo.
27ff66f Apollo: Update Afrikaans translation
1ad22a3 Bump version number to 1.1.
62cac86 Some cleanup.
42a128e Fix state handling of play/pause icon in the notification.
dff853e Take a cleaner approach at foreground tracking.
1cc3fba Clean up 'cache pause' handling.
d5b9b0e Remove remainders of pre-ICS support.
89b71fe Remove support library jar.
f47c005 Remove lyrics support.
4fe6444 Cleanup: Treat IDs, counts and durations as numbers, not as strings.
5bf80e2 CheckBoxPreference already saves internally, no need to do it twice.
6677f51 Make Apollo compile and adapt to min API level 14 (ICS).
0b041bb Import AppMsg.
86fa588 Import ViewPagerIndicator.
12d1a5f Hide the EQ when not available
e726757 Fixed crash when dragging an item behind the profile header and when touching the BAB artwork when nothing is playing.
8410206 Make sure the playing notification is only shown when playing is actually started.
10e83d3 Merge "Add Afrikaans translation" into cm-10.1
b2da8e4 Add Afrikaans translation
10f4cb9 Apollo: Update values
dc1fa3e Merge "The suggested changes have been made." into cm-10.1
83f301a Apollo: Indonesian translations
52170d0 The suggested changes have been made.
ee3b7c3 Apollo: Update italian translation
a494412 Add serbian translation
7a9ce9a Rewrite image fetching and caching
d6061ba Apollo: Add Greek translation
4393663 Removed duplicate String
ad90d96 Play Store changes
06c78ff Make apollo survive usb mounts
f121136 Apollo: Update for Czech translation
4a8aad4 fix for NullPointerException
71bdd58 Apollo: Added danish translations for external file dialog
fdc1d3e Apollo: fixed romanian translation
42fb41b Merge "update gitignore" into jellybean
60b8bae Modified the Apollo Play Store string for the Norwegian translation. Pretty sure Google does not brand the Play Store as "Play Butikk" in Norway.
bde28bb update gitignore
d55e364 Merge "Apollo - Corrected Croatian translation" into jellybean
7ff9836 Merge "Apollo: romanian translation" into jellybean
c258ba7 Merge "Improved Finnish translation for Apollo" into jellybean
658e94b Apollo - Corrected Croatian translation
e80c5ce Apollo: romanian translation
dacb27e Improved Finnish translation for Apollo
d2fa92d Apollo: Remove untranslatable strings in language NB
8e9a86c Apollo: Norwegian translations
c45bfc5 apollo: Gapless playback
b14e0e5 Merge "Update Russian Translation-Apollo-CM10" into jellybean
df12e5e Merge "Apollo: Korean translation" into jellybean
106d334 Merge "Apollo - Added Croatian translation" into jellybean
bf65a1f Update Russian Translation-Apollo-CM10
5f6b676 Apollo: Korean translation
d1b32ec Appolo: Added czech translation
d64ec6b Apollo - Added Croatian translation
cf9f30d es_ES: Added missing translations
04b564d Merge "Apollo: Remove untranslatable strings in values-sk" into jellybean

   * packages/apps/BasicSmsReceiver
67abadb Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/BasicSmsReceiver into HEAD
793edc4 Improved Finnis translation for the Basic SMS Receiver app

   * packages/apps/Bluetooth
af9e902 Bluetooth: CA translations
04976c5 Merge "Update MAP code from upstream." into cm-10.1
39cac9a Update MAP code from upstream.
5072e21 Bluetooth: Update italian translation
3c231e5 Fix MAP SDP record generation [3/3].
7f1df9e Bluetooth: German translation
3962f79 Added support for Filter parameter for PBAP function PullPhoneBook
63805cc Merge "Fix MAP accept threads sometimes spinning endlessly." into cm-10.1
bc96577 Fix MAP accept threads sometimes spinning endlessly.
c66689a Bluetooth: TR translations
9bd3b2e Merge "Bluetooth: Simplified Chinese Translations" into cm-10.1
5f9554b Bluetooth: NB translation
71146f7 Bluetooth: Simplified Chinese Translations
f452dc0 Bluetooth: DA translation
ef61f8e Fix crash during BT shutdown
003778b Merge "Bluetooth: AF translation" into cm-10.1
f385553 Merge "Bluetooth: NL translations" into cm-10.1
9b88b7c Merge "Bluetooth: PT-BR update translations" into cm-10.1
a56cdc0 Merge "Allow sending/receiving of APK files over bluetooth" into cm-10.1
42d1b69 Merge "Bluetooth : move CM strings in cm_resources.xml" into cm-10.1
37d6dfa Bluetooth: NL translations
5e7d9d7 Bluetooth : move CM strings in cm_resources.xml
07db370 Bluetooth: Update italian translation
054f5c7 Bluetooth: AF translation
2c7c0ff Bluetooth: PT-BR update translations
3596dce Bluetooth : FR translation
8d388f6 Bluetooth: Refactor default translations
e6e4c73 Allow sending/receiving of APK files over bluetooth
5e8b0ed Bluetooth: ES translations
93bdeae Added missing translation
a71be06 Bluetooth: Reorganize Greek translations
97e80ab Bluetooth : reorganize and add french translation
700d8b6 Accidentally removed bugfix in BluetoothMasObexServer
cff630a handleCpbsCommand was incorrectly sending two responses which broke phonebook sync with Audi 2G MMI
827d931 Merge "Leading whitespace removed." into cm-10.1
cb9d761 Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Bluetooth into mr1.1-staging
188ea52 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Bluetooth into 1.1
a5bb581 Merge "Bluetooth: Update Greek translations" into cm-10.1
469f225 Leading whitespace removed.
e0c3f55 Bluetooth: Update Greek translations
4de221e Bluetooth: Dutch translations
5d54e37 Czech: merged from CM10, fixed typo
ae002e2 Bluetooth: Hebrew translation updates
cdc9e1f Merge "Bluetooth: Simplified Chinese Translations" into cm-10.1
7388d94 Merge "Gábor Sári added hungarian translations for strings_map" into cm-10.1
ee582d2 Merge "PT-BR: Update Translations" into cm-10.1
0aab1b6 Bluetooth: Update values
8e80a44 Bluetooth: Simplified Chinese Translations
a7c5b31 Gábor Sári added hungarian translations for strings_map
078e032 PT-BR: Update Translations
bffc5d0 BT_MAP: Initial German translation
cc1d9b0 Merge "Bluetooth MAP (Message Access Profile) Upstream Changes (1/3)" into cm-10.1
4b74ba0 Merge "Always follow the user's preferred contact display name format." into cm-10.1
3b8ff8d Bluetooth: Hebrew translation update
e7f60fe Bluetooth MAP (Message Access Profile) Upstream Changes (1/3)
0f92089 Bluetooth: Update Greek translations
caf68ea Always follow the user's preferred contact display name format.
616be43 Send out a broadcast intent when BT voice dialing is shut down.
4b1aab6 es_ES: Added CM translations
4161660 Fix build warnings
fa5a6af Merge "Clean up debug messages" into jb-mr1.1-dev
28cc988 need send status code back(OK) after broadcast the intent(VENDOR_SPECIFIC_HEADSET_EVENT)
0f4ef70 Clean up debug messages
e203945 Merge "Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing" into jb-mr1.1-dev
ac1c280 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Bluetooth into HEAD
dd66c70 Code to broadcast VENDOR_SPECIFIC_HEADSET_EVENT missing
4daa2db Merge "need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users" into jb-mr1.1-dev
31be0d2 need to send BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED intent to all users
0ed3d87 Bluetooth: Dutch translations
cb7b1a5 Fixed potention ANR issue with Bluetooth OPP share.
23b1020 Czech: fixed unicode code
4e5575c Czech: fixet national quotation marks
19d8d54 Temporarily add GALLERY_PROVIDER permission to fix Beam.
a195396 Czech: revised and completed translation, changed length of too long        string
ede67c2 License of files Bluetooth package is not updated to ASL2
18e2a65 32 bit int shifted by 36 bits at BluetoothMasObexServer.getUint32BigEndian
bd704c7 BT connection notification in not updated in status bar for second user It is due to the system UI is always running as the first user. It can't receive broadcast intent ACTION_CONNECTION_STATE_CHANGED and ACTION_BOND_STATE_CHANGED from bluetooth service when We switch to second user. Also the system UI also is running as uid 10055, which will also call function isEnabled, getState, getBondedDevices, getAdapterConnectionState and getBondState in bluetooth service. I allow these functions to be called by all the users. I forget remove check for getBondState in my first patch set
2a930a0 Bluetooth MAP profile fix
a595fcc Fix crash in Bluetooth when sharing MMS video.
fb8b279 Fix NREC command format error
df9d0fe Merge "Turn off dbg messages, be prepared for production build" into jb-mr1-dev
cd18678 Merge "Bluetooth multi-user updates: change bluetooth service to reject background user access." into jb-mr1-dev
3751015 Bluetooth multi-user updates: change bluetooth service to reject background user access.
da3d0ac Config pbap_include_photots_in_vcard false as default
fd1da11 Turn off dbg messages, be prepared for production build
dec1168 Improved Finnish translation for the bluetooth app
344036b Make Bluetooth Services support multi user
be38be9 remove the AT command separator from the CPBR range parameters
6458cff Move socket initialization code out of pbap service's main thread
c7ead6d Move bluetooth priorities from Secure to Global.
0e46362 Add MODIFY_PHONE_STATE permission to access Bluetooth service in Phone app
c2fcca6 Upgrade the app to better follow holo guidelines
daaf5bd Merge "Bluetooth: Use proper holo alert drawable" into jellybean
ebdb4d9 When pbap cleanup,  stopSelfResult called twice with same service id
826318b Merge "Enable Bluetooth sharing of downloaded files." into jb-mr1-dev
faebb8f Revert "Reference headers in their new location"
77bf535 Bluetooth: Updated italian translation
2ebf3eb Merge "Add StateMachine make methods." into jb-mr1-dev
7e2c121 Reference headers in their new location
6893668 Add StateMachine make methods.
ee52ddf Enable Bluetooth sharing of downloaded files.
6d0ef41 Ported: Bluetooth Message Access Profile (MAP) from CM9
f46f032 Donot include photo in vard in pbap
1c03c84 fixed bt on off stress test issue
37e1e99 Terminate PBAP service cleanly during BT off
a55eca0 Bluetooth: Use proper holo alert drawable
8ca777c Revert "Terminate PBAP service cleanly during BT off"
f5d88a7 Terminate PBAP service cleanly during BT off
3237754 fixed local reference leak
8f464d0 Merge "Accept all mimetypes for inbound bluetooth file transfers" into jellybean
9eb4a84 Adjust profile priorities when setting auto-connect

   * packages/apps/Browser
92e9a88 Browser: CA translations
1106672 Browser: FI translations
864618f Merge "Add DuckDuckGo search engine for en-gb locale (both regional and region agnostic version)" into cm-10.1
6b15c17 Browser: Update Polish language
2a654f8 browser: Privacy Guard support
c844e93 Browser: zh-rTW translations
efede5c Add DuckDuckGo search engine for en-gb locale (both regional and region agnostic version)
7286384 Merge "Browser: Simplified Chinese Translations" into cm-10.1
d78e8ce Browser: Simplified Chinese Translations
bf1d052 Browser: RU translation
d626038 Browser: Norwegian translation
fb93f05 Merge "Browser: HU translation refactoring" into cm-10.1
7a90179 Browser: HU translation refactoring
748f69b Browser: Refactor translations
0db3cf0 Merge "Browser: Refactor RU translation" into cm-10.1
0e178e7 Browser : FR translation
beb0aa2 Browser: Refactor RU translation
149b647 Merge "Browser: Refactor AF translations" into cm-10.1
0aeef5c Browser: ES translations
1e37932 Merge "Browser: CS translation" into cm-10.1
987d90a Browser: CS translation
dfebd8f PT-BR: Update translation
b0c9a35 Browser: rearrange CM strings
931d877 Browser: Refactor AF translations
8d2a26c Merge "Browser: New Danish strings" into cm-10.1
d37b3d3 Merge "Browser : reorganize and add new french translation" into cm-10.1
17fc220 Browser: Reorganize Greek translations
c3a72af Browser : reorganize and add new french translation
71e6507 Merge "Update Russian Translation-Browser-CM10.1" into cm-10.1
3260426 Merge "Browser: NL translations" into cm-10.1
17a86f3 Update Russian Translation-Browser-CM10.1
8fdf936 Merge "Update German translation." into cm-10.1
3b4d989 Update German translation.
6825742 labs: websockets: fix typo in preference key
8e35d2a Browser: NL translations
e6a2c61 Merge "Afrikaans translations: Added missing items" into cm-10.1
33a0256 Afrikaans translations: Added missing items
4ac755d Browser: New Danish strings
26d1931 Merge "Czech: added strings for WebSocket" into cm-10.1
1b1c95f Merge "Update Russian translation: Browser" into cm-10.1
6195c19 Czech: added strings for WebSocket
b12939b Merge "PT-BR: Update translations" into cm-10.1
6fd2a4b Merge "Browser: Update italian translation" into cm-10.1
b6cc3c9 Merge "Browser: Update Polish language" into cm-10.1
32d7fd7 Merge "Added hungarian translation for websockets" into cm-10.1
41da3a5 Update Russian translation: Browser
0e6769a es_ES: Add spanish translations
600dac6 Browser: Update italian translation
a3cd48e Added hungarian translation for websockets
485d23c Browser: Update Polish language
2fdfda7 PT-BR: Update translations
b5626d6 Allow enabling WebSockets from Labs Preferences
1cba756 Merge "Browser: Update italian translation" into cm-10.1
2e3eb9e Merge "Browser: Simplified Chinese translations + Fix English Typo" into cm-10.1
9f2b73c Browser: Updated Polish translation
3e735d0 Browser: Simplified Chinese translations + Fix English Typo
7403694 Browser: Update italian translation
0b5cd22 Merge "Browser: Dutch translations" into cm-10.1
36ba9ad es_ES: Restore all AOSP strings
1f84907 Browser: Dutch translations
da1941a Correct misleading translation
ad2dcba Update German translation.
0faf23f Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Browser into mr1.1-staging
9ced794 Merge "Browser: Update Greek translations" into cm-10.1
d61faa2 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Browser into 1.1
abe911c Browser: Update Greek translations
8819b2e Merge "Browser: Dutch translations" into cm-10.1
b10d4c6 Merge "Browser: Update italian translation" into cm-10.1
a118c32 Browser: Use infinitives
ab117b1 Browser: Update italian translation
b89db3e Browser: Dutch translations
a18dbce Czech: some fixes, merge from CM10
573349f Deleting pref_video_preload_choices translations
945e111 Added missing hungarian translation
08fab33 Runtime enablement of WebGL
2e5518f Browser: Hebrew translation
fd4e4d7 Browser: Update Greek translations
6111f34 Fix build warnings
7422f73 am 7c1000f6: Import translations. DO NOT MERGE
582e13d Import translations. DO NOT MERGE
7c1000f Import translations. DO NOT MERGE
285eb1d Revert "Multimedia feature port from ICS"
bf5e496 Revert "Runtime enablement of WebGL"
dcdefbc Merge commit 'android-4.2_r1' into mr1-staging
7ece7a6 Czech: fixed transaltion, unified strings, added missing strings,        fixed national quotation marks
451316c Browser : added missing French translation
1bc48b6 Revert "Czech: fixed transaltion, unified strings, added missing strings"
5f0fcf3 Czech: fixed transaltion, unified strings, added missing strings
3be76c8 am 6c96757f: (-s ours) Import translations. DO NOT MERGE
6c96757 Import translations. DO NOT MERGE
a7c0b56 Let's enhance
c9ec70b Fixed compiler warnings
63b5ff6 Fix the build
2af1bd4 Updated and improved Finnish translation for the Browser app
0437130 Import translations. DO NOT MERGE
5c37e3a Merge "Browser: Added czech missing translation and update" into jellybean
61ace95 Import translations. DO NOT MERGE
ea21463 Browser: Added czech missing translation and update
5e03042 Import translations. DO NOT MERGE
6745452 Browser - Updated Croatian translation
e713ca2 Import translations. DO NOT MERGE
98b9cb5 Import translations. DO NOT MERGE
1a6bacc Import translations. DO NOT MERGE
1ce43bf Import translations. DO NOT MERGE
bbbadfa Merge "Add contentDescription to SnapshotBar" into jb-mr1-dev
8e8cae2 Add contentDescription to SnapshotBar
ebfd289 Merge "Add contentDescription for page info" into jb-mr1-dev
efb15ea Add contentDescription for page info
eebafd1 Merge "Add missing contentDescription" into jb-mr1-dev
a36d703 Add missing contentDescription
aac2ce0 Add content description for folder up
fb20f27 am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"
81cb2d1 Merge "Don't replace file extension when mime-type is incorrect"
c96f8fb Update Russian Translation-Browser-CM10
ecb4e73 Merge "Browser: Dutch translations" into jellybean
1428aae Merge "es_ES: Added translations for recent options" into jellybean
348609e Merge "Added hungarian translation for video preload and webGL settings" into jellybean
5829a3b Merge "Browser: Add chinese translation for WebGL and preload video." into jellybean
5433a91 es_ES: Added translations for recent options
acc1ec6 Browser: Dutch translations
6f7cc4e Don't replace file extension when mime-type is incorrect
2c377b7 Merge "Update Russian Translation-Browser-CM10" into jellybean
2170ca2 Merge "Browser: Updated italian translation" into jellybean
c2e585a Merge "Browser: Danish translations" into jellybean
33dc112 Browser: Add chinese translation for WebGL and preload video.
700142f am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"
b7ee3b5 Merge "BrowserSettings required a Controller sometimes"
eb1fdb5 Added hungarian translation for video preload and webGL settings
47ed4b8 BrowserSettings required a Controller sometimes
de8b578 Update Russian Translation-Browser-CM10
58cf4ed Browser: Updated italian translation
81ab67f Browser: Danish translations
1c42dec Add fullscreen toggle to menu
70c7844 Deleted code that relies on defunct SearchBox interface.
9854e41 Adding exception handler for voice recognition activity
0059fc7 Runtime enablement of WebGL
9aa4a1b Multimedia feature port from ICS
34c8499 am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"
d22af61 Merge "Added catch of SQLiteException when updating screenshot"
561d195 Added catch of SQLiteException when updating screenshot
e9caeaf am 1fce2b5d: Merge "Reset to default did not reset cached settings"
1fce2b5 Merge "Reset to default did not reset cached settings"
c885a24 Reset to default did not reset cached settings
31b62c4 Merge "Use a fixed title bar if accessibility is enabled" into jb-mr1-dev
1cc1d1d Use a fixed title bar if accessibility is enabled
a05bb14 am 922afab3: Merge "No search pane while tapping search button after backing to "windows" view from "saved page" view."
966beb1 am cf00c263: Merge "Pause WebView timer when Browser is paused"
922afab Merge "No search pane while tapping search button after backing to "windows" view from "saved page" view."
cf00c26 Merge "Pause WebView timer when Browser is paused"
2584c31 resolved conflicts for merge of 0570344a to jb-mr1-dev
0570344 Merge "Pass webview's useragent when downloading via context menu"
fdebf36 Merge "Browser: Add Chinese translation" into jellybean
cf31dcf Browser: Add Chinese translation
8e4ce66 Pass webview's useragent when downloading via context menu
9cc2d03 Pause WebView timer when Browser is paused
92c7f5b es_ES: Added missing translations
d971973 Merge "Pass referer on download requests" into jb-mr1-dev
0b3d66f Pass referer on download requests

   * packages/apps/CMFileManager
73d6b66 CMFM: EL translations
b365a6d Merge "CMFileManager: RU translation" into cm-10.1
168fc8f CMFileManager: RU translation
5a9f817 Merge "CMFileManager: Simplified Chinese Translations" into cm-10.1
b2e68bc Merge "CMFileManger : FR translation" into cm-10.1
546bd2d CMFileManager: Simplified Chinese Translations
944c300 CMFileManger : FR translation
048dc60 CMFileManager: DA translation
83d84b9 Merge "CMFileManager: HU translation" into cm-10.1
b28e2ce Merge "Revert "CMFileManager: ET translations"" into cm-10.1
182520a Revert "CMFileManager: ET translations"
947d83a CMFileManager: HU translation
5083c9f Merge "CMFileManager: ET translations" into cm-10.1
8950212 Merge "CMFileManager: CS translation" into cm-10.1
136fba1 CMFileManager: ET translations
2bd6a80 Merge "CMFileManager: IT translations" into cm-10.1
761e08f Merge "CMFileManager: HU translation" into cm-10.1
d50ed67 CMFileManager: ES translations
4380c42 Merge "CMFileManager: PT-BR translations" into cm-10.1
7f762cf CMFileManager: CS translation
7be0c4f Merge "CMFileManager: NL translation" into cm-10.1
90791f1 CMFileManager: HU translation
2579907 CMFileManager: Update German translation
a2a4136 CMFileManager: IT translations
623f148 CMFileManager: PT-BR translations
41a6bbc CMFileManager: NL translation
81a3539 CMFileManager: Simplify selection string creation
347623e Merge "CMFileManager: SK translation" into cm-10.1
f92e77c CM File Manager: Update italian translation
5fe88a3 CMFileManager: SK translation
cb79ef1 Merge "CMFileManager: HU Translation" into cm-10.1
d2caad2 CMFileManager: HU Translation
f3544f1 Merge "CMFileManager: PT-BR translations" into cm-10.1
47c73e3 Merge "CMFM: NL translation" into cm-10.1
29d3450 CMFileManager: CS translation
fe3d6d9 CMFM: EL translations
9a77749 CMFileManager: PT-BR translations
16a68c4 CMFM: NL translation
4dececd CMFileManager: ES translations
cd98772 Allow pluralization of selection string.
322a33a CMFileManager: Make use of plurals correctly
5a5f271 Merge "CMFM: make copy/paste action more understandable" into cm-10.1
629817e Merge "CMFileManager: RU translation" into cm-10.1
2dc03f6 CMFileManager: RU translation
4766e2b CMFileManager: PT-BR translations
32fd416 CMFileManager: Correct logic of string generation
02f3a8f CMFM: make copy/paste action more understandable
d50c81f CMFileManager: PT-BR update translations
e5fe312 CMFileManager: PT-PT translations; new options/menus.
e7cac3f Merge "CMFileManager: PT-PT translations; minor fixes." into cm-10.1
a65e72f CMFileManager: PT-PT translations; minor fixes.
43dd71a CMFileManager: Add Missing Af Translations
47b14a1 Minor corrections on PT-PT language support for File Manager
c00460f CMFM: NL translation
036d00c CMFileManager: Update German translation
cb8adde CMFM: EL translations
1e3d2ca CMFM: Fix AssociationsDialog selection when have scrolling
a8176b8 CMFileManager: SK translations
765be43 CMFileManager: SK translations
718f795 CMFileManager: ES translations
3160e65 Merge "CMFileManager: DA translation" into cm-10.1
6d82340 CMFileManager: update FR translation
9015be8 CMFileManager: DA translation
2270a56 CMFileManager: RU translation
eb204d5 Merge "CMFileManager: Simplified Chinese Translations" into cm-10.1
d93cf3d CMFileManager: RU translation
9e5d449 CMFileManager: Simplified Chinese Translations
9109ae9 Merge "CMFileManager: RU translation" into cm-10.1
0d192b8 CMFileManager: ES translations
c85d589 CMFileManager: RU translation
4f7b23a CMFileManager: DA translation
8e27281 CMFM: Update translations
572ad56 CMFM: Use 'app' instead of 'application'
09f82c7 CMFM: Fix ColorPickerDialog on landscape mode
31c6a70 Merge "CMFileManager: Add missing AF Translations" into cm-10.1
034b79b CMFileManager: NB translation
d2a9b3f CMFM: es_ES: Styling fixes
626c4ee CMFM: Styling fixes
ad6ef5a Merge "CMFM: Update copyright notice" into cm-10.1
bdc6efd CMFileManager: Fix typo in the default string
72d3350 CMFM: Update copyright notice
e606fc6 CMFileManager: Add missing AF Translations
cc2b8d1 Merge "CMFileManager: CS translation" into cm-10.1
e724428 en_GB localisation.
f96d648 CMFM: NL translation
f17ce1c CMFileManager: CS translation
395e82c CMFM: File Manager lets you select a file more than once
4d21458 Merge "CMFileManager: Update Polish Translation" into cm-10.1
2140db8 CMFileManager: Update Polish Translation
5b3fcbe Merge "CMFM: NL translations" into cm-10.1
4c73e29 Merge "Update German translation." into cm-10.1
15590b2 CMFM: NL translations
ffbd24d Update German translation.
82b1549 CMFileManager : FR translation
d355d2b Merge "CMFM: RU translation" into cm-10.1
c96cdaf CMFM: RU translation
dece928 Merge "CMFileManager: PT-BR update translations" into cm-10.1
a2cb8ff Merge "CMFM: EL translations" into cm-10.1
7fb0a41 Merge "CMFileManager: Update italian translation" into cm-10.1
f3c1858 CMFM: EL translations
8ef4e61 CMFileManager: HU update translations
aa9a158 Merge "CMFileManager: ES translations" into cm-10.1
118b6a9 CMFM: Fix editor overflow icon on black theme
03c940c CMFileManager: ES translations
6023f19 CMFileManager: Update italian translation
8749212 CMFM: Fix shortcuts path initialization
c7df972 Merge "CMFM: User-defined date/time format" into cm-10.1
6a5d7f4 Merge "CMFileManager: CS translations" into cm-10.1
614fc38 CMFileManager: PT-BR update translations
31112c7 CMFM: User-defined date/time format
661616e CMFileManager: Simplified Chinese Translations
2c16ef0 CMFileManager: Latest merges
cc33540 CMFileManager: CS translations
ce7a617 Add CMFileManager ukrainian translation
dd93ea3 CMFM: Reorganize Greek translations
6e7f223 CMFM: Protect AssociationsDialog from NPE
ff16b00 Merge "CMFM: Double click to open associated intent" into cm-10.1
4652432 CMFM: File manager SEND issues
801658a CMFM: Double click to open associated intent
5cf3b81 Merge "CMFileManager: Update italian translation" into cm-10.1
64b9354 Merge "CMFM: NL translation reorganization" into cm-10.1
472bdfc CMFM: NL translation reorganization
7e6c61e Merge "es_ES: Add spanish translations" into cm-10.1
41d82dd CMFileManager: Update italian translation
9bcf37a es_ES: Add spanish translations
71427da Merge "Added hungarian translation" into cm-10.1
7c562b6 Merge "CMFileManager: Update German translation" into cm-10.1
185335d Merge "CMFileManager : reorganize and new french translation" into cm-10.1
b8e03e3 CMFileManager : reorganize and new french translation
e7c1f2d CMFileManager: Update German translation
e40a101 Added hungarian translation
a713dbf Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
a3c5a1e Merge "CMFM: Fix hex viewer dark theme" into cm-10.1
47ac170 CMFM: Fix reflection call in ColorPickerView
649198a CMFM: Fix hex viewer dark theme
288d70a Merge "PT-BR: Update translation" into cm-10.1
bcf1d72 Merge "Afrikaans translations:  Added missing items" into cm-10.1
2e5f659 Afrikaans translations:  Added missing items
7f8f309 Merge "CMFileManager: Update Polish language" into cm-10.1
07b8976 Update Russian Translation-CMFileManager-CM10.1
b96d6d8 CMFileManager: Update Polish language
35683ef PT-BR: Update translation
8573124 CMFM: Editor initial highlight support + props syntax processor + others features
d063637 Merge "CMFileManager: Update italian translation" into cm-10.1
3a1b900 CMFileManager: Update italian translation
ab93668 Added hungarian translation
afeedb4 PT-BR: Update translations
c35f6f1 Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
2439dcf Update Russian Translation-CMFileManager-CM10.1
5426d83 es_ES: Add spanish translations
e276b02 CMFM: Display hex format when open a binary file
b5f6d42 Merge "CMFM: Use holo style progress bar" into cm-10.1
5b422a3 CMFM: Add audio/flac mimetype
b28ac1d CMFM: Use holo style progress bar
7af879e Merge "CMFM: Ask to gain privileges for asynchronous commands" into cm-10.1
dda3e74 Merge "CMFM: Integrate themes app into cmfm app" into cm-10.1
8729656 Merge "Change some initial Afrikaans translations." into cm-10.1
e9c9b1b CMFM: Ask to gain privileges for asynchronous commands
f2803c7 Merge "PT-BR: Update translations" into cm-10.1
1e1fdfa CMFileManager: Add Polish Translation for word wrap
92975bf Merge "Added hungarian translation" into cm-10.1
7f7e190 CMFM: Integrate themes app into cmfm app
1697a33 Added hungarian translation
d61ac20 PT-BR: Update translations
bfa7103 Update Russian Translation-CMFileManager-CM10.1
1234897 Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
3ae47b1 Merge "CMFileManager: Added Polish language" into cm-10.1
db157e0 Update Russian Translation-CMFileManager-CM10.1
423787f CMFileManager: Added Polish language
d633f1c CMFM: Add word wrap support
4755ad7 es_ES: Add spanish translations
97fd7f7 Merge "Added hungarian translation" into cm-10.1
dadebce CMFileManager: Update italian translation
acb2740 Merge "PT-BR: Update translations" into cm-10.1
cbc1029 Merge "CMFM: CYAN-200 - Archiving and Extracting .ZIP files in CM File Manager" into cm-10.1
984361e CMFM: Fix checksum java command
fb32207 Added hungarian translation
b163ee2 PT-BR: Update translations
7041313 CMFM: CYAN-200 - Archiving and Extracting .ZIP files in CM File Manager
4477f96 CMFM: CYAN-285 - Add ability to calculate file checksums
dd68ac3 Change some initial Afrikaans translations.
f238158 CMFileManager: Fix tar command
270718d CMFM: CYAN-533 - Increase timeout in File Manager
2cfe199 CMFM: Fix invalid initial directory
672c1ba Merge "CMFileManager : add French translation" into cm-10.1
086f589 CMFileManager : add French translation
a76e667 Merge "CMFM: Update Greek translations" into cm-10.1
3816e76 Merge "CMFileManger: Update German translation" into cm-10.1
0490874 CMFM: Update Greek translations
1e8d97d CMFileManger: Update German translation
9b8cb42 CMFileManager: Simplified Chinese Translations
b54fed0 CMFM: Use new android.permission.ACCESS_SUPERUSER permission
1edc993 CMFileManager: Update Afrikaans translation
79aa798 Merge "Added hungarian translation for case_sensitive_sort_summary" into cm-10.1
05c7d41 Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
060c50b PT-BR: Update translations
f671af3 Update Russian Translation-CMFileManager-CM10.1
a647cb4 Added hungarian translation for case_sensitive_sort_summary
aabe864 CMFileManager: Fix Afrikaans translations
3733c41 Merge "PT-BR: Update translations" into cm-10.1
1584a85 Merge "CMFileManager: Update italian translation" into cm-10.1
a3ab579 CMFileManager: Update italian translation
6c45c94 Merge "CMFileManager: Add summary to 'case-sensitive sorting'" into cm-10.1
610e90d PT-BR: Update translations
b729b11 CYAN-457: Add Advanced Audio Coding mimetypes
19fb177 CMFileManager: Add summary to 'case-sensitive sorting'
a7f31d3 CMFM: fix broken toolbox ls command
8836150 CMFileManager: added finnish translations
39ce630 Merge "Add Afrikaans translation" into cm-10.1
c721995 CMFileManager: Update German translation
8f0ba31 Merge "es_ES: Added spanish translations" into cm-10.1
95b5f77 Merge "CMFM: Dutch translations (changelog)" into cm-10.1
34e499f es_ES: Added spanish translations
9b57c1a CMFM: Update Greek translations
c6f9c07 CMFM: Dutch translations (changelog)
768815f CMFileManager: Update italian translation
8ee698e Merge "CMFM: Dutch translations" into cm-10.1
9d1e948 Merge "CMFileManager: Simplified Chinese Translations" into cm-10.1
153c534 Merge "CMFM: Hebrew translation updates" into cm-10.1
8d23b72 CMFM: Dutch translations
19ee1c8 Add Afrikaans translation
1dabae4 CMFileManager: Simplified Chinese Translations
6d7b207 CMFM: Set translatable="false"
38942e0 Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
3d4d609 Update Russian Translation-CMFileManager-CM10.1
138d39f CMFileManager : add French translation
20ddba2 CMFM: Hebrew translation updates
394d390 Serbian translation for CMFileManager
8c2d2d1 CMFM: es_ES: missing translations
9ffd0d6 Merge "CMFileManager: Added missing Czech translation" into cm-10.1
fc49afa Merge "Added hungarian translations" into cm-10.1
c243e4c Merge "PT-BR: Update Translation" into cm-10.1
17b3183 Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
b24ac28 Added hungarian translations
d0d8365 PT-BR: Update Translation
02b2f55 CMFileManager: Added missing Czech translation
39cea3f Allow picking of directories.
9df6c27 Update Russian Translation-CMFileManager-CM10.1
6a97730 Merge "Don't prompt for superuser access when picking a file." into cm-10.1
4691dd5 CMFM: Remove aapt warning
cb6696f Merge "CMFM: Slovak translations" into cm-10.1
694a140 Don't prompt for superuser access when picking a file.
29909ec PT-BR: Update translations
3755dde Added missing hungarian translation
35923b9 CMFM: Slovak translations
16df1c7 PT-BR: Added missing translations
81fe8fd Merge "CMFM: Dutch translations" into cm-10.1
564a589 CMFM: Dutch translations
aaffcd1 Merge "CMFileManager : add French translation" into cm-10.1
2713d97 Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
9ae9278 Merge "Added hungarian translation for .nomedia settings" into cm-10.1
00fdf0f Merge "CMFileManager: Hebrew translation" into cm-10.1
ab2516b CMFM: Support for Intent.ACTION_SEND_MULTIPLE
2f3c602 Merge "CMFM: Fix select/unselect from menu dialog" into cm-10.1
9a14184 Merge "CMFM: Fix change to root when initial directory not exists" into cm-10.1
af6c2e7 Merge "CMFM: Wait indefinitely on privileged console allocation" into cm-10.1
42e220a Merge "CMFileManager: Update German translation" into cm-10.1
a2c1f40 Added hungarian translation for .nomedia settings
58584ce CMFM: Change mode from 755 to 644
c730945 CMFM: Fix select/unselect from menu dialog
1ab7c01 CMFileManager: Update German translation
2846044 CMFileManager: Hebrew translation
57ab219 CMFM: Fix change to root when initial directory not exists
37b5b48 CMFM: Wait indefinitely on privileged console allocation
1951f31 Update Russian Translation-CMFileManager-CM10.1
0eb0a64 Merge "CMFM: Properly handle async task exception" into cm-10.1
4752556 CMFM: Properly handle async task exception
a0d509c CMFM: Fix relaunchables exceptions
0a6626c CMFileManager : add French translation
0fc3e3b es_ES: Added spanish translations
4c27ca9 Add ability to toggle .nomedia file in storage locations
9f86075 Merge "Added missing hungarian translation" into cm-10.1
64dcdca Merge "CMFileManager: fixed typo in romanian translation" into cm-10.1
0228f31 Added missing hungarian translation
7cc707c CMFM: Fix typo
cb72d34 Merge "CMFM: Do not use cd and pwd commands" into cm-10.1
a364e00 CMFileManager: fixed typo in romanian translation
32dc158 CMFileManager: Dutch translations
3bf048a CMFM: Do not use cd and pwd commands
1530ad9 Merge "CMFM: Ignore stderr from stat list command" into cm-10.1
c5298c6 CMFM: Ignore stderr from stat list command
e5751bc CMFM: Fix race condition
5b4a6b6 CMFM: Read hidden files with new stat listing method
883a154 Merge "CMFM: Fix FC caused by accessing ui outside of UI thread" into cm-10.1
f2a9335 CMFM: Fix FC caused by accessing ui outside of UI thread
4db2fc7 CMFM: Fix AsyncResultProgram deadlock
b6a7803 CMFM: es_ES - update missing translations
6e8dd09 Merge "CMFM: Fix sync object" into cm-10.1
870edd4 Merge "CMFM: Fix NPE when parent dir is null" into cm-10.1
b527c89 Merge "CMFM: Fix navigation view fade effect" into cm-10.1
fb04a54 CMFM: Display new fso datetimes props
b38385b Merge "CMFM: Use filesystem type instead of auto on remount" into cm-10.1
0f6534b CMFM: Fix sync object
063da25 CMFM: Fix NPE when parent dir is null
906ae79 CMFM: Use filesystem type instead of auto on remount
5a9f961 CMFM: Fix navigation view fade effect
6ed957d Merge "CMFileManager: Dutch translations" into cm-10.1
1324700 CMFileManager: Dutch translations
dd954c7 Merge "CMFM: Fix name and parent for root directory" into cm-10.1
75b87a3 CMFM: Fix name and parent for root directory
663db10 CMFM: Fix filesystem and fso dialog layouts
0a127e5 CMFM: Fixes and Improvements
ea585f4 Merge "Update Russian Translation-CMFileManager-CM10.1" into cm-10.1
a722563 Add mime type for exported settings of K9.
f159eae Merge "Fall back to showing all files for unknown mime types." into cm-10.1
be137de Fall back to showing all files for unknown mime types.
3765a12 Update Russian Translation-CMFileManager-CM10.1
b978c84 CMFileManager: Updated menu strings to reduce confusion regarding copy & move
ba5855c PT-BR: Fixes to translation
a0ebc65 CMFileManager: Dutch translations
5b85c6c CMFileManager: Add RealVideo and Matroska mime-types
5d64d0f Merge "Fix german translation for disk usage warning level." into cm-10.1
612ef0c Fix german translation for disk usage warning level.
0b01ee3 CMFileManager: Make groups command optional
b81c47f CMFileManager: Change manifests to API 17
3f41d96 Issue 6795: File Manager selected file actions vanish on navigation to parent directory
cdf91aa updated italian translation
a4c24d6 Issue 6769: The bottom bar of pop-up boxes in CM File Manager should be “Done” or “OK” rather than “Cancel”
ed9708c CMFileManager: pt-pt translations
222973e PT-BR: Added missing translations + Issue 6676 fix
686a671 Issue 6743: CM FileManager can't recognize file types if named with capital suffix
fe6aaa7 Issue 6722: CM File Manager can not Play/Start files recorded with CM embedded Soundrekorder
83e2b0c CMFileManager: Add Japanese translation
8e6ff75 CMFileManager: Fix quickfoldersearch command for files with whitespaces
20bcaf7 CMFileManager: Compress type selection dialog has an invalid background
addb5e7 CMFileManager: PickerActivity: debug requested paremeters
ca21af1 CMFileManager: Formatting
13c394d CMFileManager: Check shell commands on startup
a678713 CMFileManager: Escape $ on prepared arguments
bda07d1 CMFileManager: Add Greek translation
bf0eebe CMFileManager: updated romanian translation
e688954 CMFileManager: Fix ReadCommand incompatible buffer
83daedf Update Hungarian translations
2466576 Issue 6606: CM File Manager will not Remember Selection for "Open With" menu
0f3469a CMFileManager: AOSP GET_CONTENT_DATA compatibility
8936a55 CMFileManager: Fix Typo
6bf7002 CMFileManager: fr_FR - Remove unnecessary translatable string
8e5fabf CMFileManager: fr_FR - Remove unnecessary translatable tag
cb71d65 Merge "CMFileManager : French translation correction" into jellybean
660bb5d CMFileManager : French translation correction
9c866c8 Fix possible NPE, and log path of "not found" commands
5056c53 CMFileManager: Remove duplicate code
a0eb955 Merge "Issue 6624: CM File manager: Mount RW does not work if i slide the slider from ro to rw." into jellybean
5763342 Merge "CMFileManager: Overlay activity must use overlay style" into jellybean
936b523 Merge "CMFileManager: Fix invalid resource on create shortcut" into jellybean
a48778d Merge "CMFileManager: Fixes for non-rooted devices" into jellybean
4671189 CMFileManager: Fix invalid resource on create shortcut
41caa14 CMFileManager: Overlay activity must use overlay style
b3d9e64 Issue 6624: CM File manager: Mount RW does not work if i slide the slider from ro to rw.
c5ad23b Update Hungarian translations
23066fe Merge "CMFileManager: updated romanian translation" into jellybean
f506bb9 CMFileManager: updated romanian translation
32331d7 CMFileManager: Fixes for non-rooted devices
79d1b6e Merge "CMFileManager: Simplified Chinese Translations" into jellybean
67531d4 Merge "CMFileManager: Updated italian translation" into jellybean
d635f07 CMFileManager: Updated italian translation
ad6af15 German: Update translation
671b344 Merge "es_ES: Added new translations" into jellybean
1225dad es_ES: Added new translations
8537a1b Update Russian Translation-CMFileManager-Themes support-CM10
be8ae15 Added hungarian traslation for CMFileManager (Done)
00e862b CMFileManager: Simplified Chinese Translations
0b82260 CMFileManager: updated Czech translation
554c4a7 CMFileManager: Themes support + Dark theme
17d3b81 CMFileManager: Fix translation strings
2f9d3a4 Merge "PT-BR: Initial translation" into jellybean
6806f0e Merge "CMFileManager: update German translation" into jellybean
4e4e99f Merge "CMFileManager: initial romanian translation" into jellybean
2a7122c Update Russian Translation-CMFileManager (fix typo)-CM10
cd5a5a9 CMFileManager: initial romanian translation
7e504da CMFileManager: Updated italian translation
9d5ebc9 CMFileManager: update German translation
d153141 CMFileManager: Fix crash when select CMFileManager internal editor to open text file.
8dc8c05 CMFileManager: Fix the crash when the search file name includes mutiple white spaces.
cad7441 PT-BR: Initial translation
3ae1d1d Merge "CMFileManager: Fix mv operation on Cross-device link failure" into jellybean
e4dd07c Merge "CMFileManager: Remove incorrect notifyDataSetInvalidated()" into jellybean
3d70048 CMFileManager: Fix NPE while retrieving background console
9fca3f9 CMFileManager: Remove incorrect notifyDataSetInvalidated()
b1d5cd1 CMFileManager: Fix mv operation on Cross-device link failure
9fe2cd7 Merge "CMFileManager: Corrections in Czech translation" into jellybean
7dfe5fb Update Russian Translation-CMFileManager (fix typo)-CM10
41f502f CMFileManager: Corrections in Czech translation
dca975d Merge "CMFileManager: initial czech translation" into jellybean
9637ddd CMFileManager: initial czech translation
64571fe CMFileManager : Fix French Translation
2dfee94 CMFileManager: Fix list of folders with broken symlinks
b5ce060 Merge "CMFileManager : Fix duplicate debugging output" into jellybean
8c8af16 CMFileManager : Fix duplicate debugging output
8a0b4b7 Merge "Update Russian Translation-CM File Manager-CM10" into jellybean
cd890fc CMFileManager : Beam to send files
0e77cf3 Update Russian Translation-CM File Manager-CM10
b060162 CMFileManager : Allow rotation
4e9f8bb CMFileManager : es_ES translation fixes
d17ce4e CMFileManager: fix german translations
0a5c60e Merge "CMFileManager: updated Dutch translations" into jellybean
ca20d26 Merge "FileManager: Danish translation" into jellybean
01073fc Merge "CMFileManager: initial german translations" into jellybean
541b018 Merge "CMFileManager : Added French Initial translation" into jellybean
23f2e7c Merge "CMFileManager: Simplified Chinese Translations" into jellybean
dccb848 Merge "Initial Russian Translation-CM File Manager-CM10" into jellybean
75f1343 CMFileManager: updated Dutch translations
c48eb7c Merge "CMFileManager: Added italian translation" into jellybean
db1f4e0 CMFileManager : Added French Initial translation
6c3d4f6 CMFileManager: Simplified Chinese Translations
7b8969d Merge "CMFileManager: Dutch translations" into jellybean
fe5ab98 CMFileManager: initial german translations
8061ab3 CMFileManager: Dutch translations
bf52647 Merge "es_ES: Added initial translations" into jellybean
a01aa27 Initial Russian Translation-CM File Manager-CM10
1fc1d2c Merge "CMFileManager: Avoid crashes when drawable is not found" into jellybean
dcbeb44 CMFileManager: Avoid crashes when drawable is not found
371a637 CMFileManager: Fix invalid mime/type drawables
09805a4 CMFileManager: Added italian translation
c409789 CMFileManager: Fix backwards dialog options + Typo
dfa7f62 es_ES: Added initial translations
43746a8 CMFileManager: Fix compile error
c88c305 CMFileManager: Fix formatting
7ca4348 FileManager: Danish translation
ebe44c3 CMFileManager: Fix file size units
e6334c0 Tweak image
ef1d6e2 Fix XHDPI history drawable
432c1f5 Initial tablet support
524b82a Enable rotation
8b4156f Better start effect (white action bar style)
ef9ba79 CleanUp
c745aba Hide flinger listview settings. Default is not to use flinger listview.
cc952a3 Don't scroll when flinging. (has some effects over scrolling) (issue #8)
d921b98 New methods for deal with Android
ea5c5b2 Remove unused imports
d643034 Merge branch 'master' of git+ssh://git@github.com/jruesga/CMFileManager.git
c236561 If no flinger listener set, then do not trap any event
e30ff77 Minor update to text
fdd6d8f Show changelog inside the application  (issue #6)
af12854 Readme & Changelog (issue #5)
3d75aa8 Better read handling
b91ea8a Better flinger scrolling detection
b069769 Update the internal array when a item was remove
8496701 Remove create copy y rename from search actions dialog
28ac308 Fix incorrect InsufficientPermissionsException detection
e72d167 Better dialog titles
2765bd3 Flinger gesture detection support (issue #8)
de6628e CleanUp whitespaces
6357b57 Merge branch 'master' of git://github.com/jruesga/CMFileManager into dvt
fd47740 Use more user friendly terms for priviledged and non-priviledged mode
34076a1 Prevent editor from receiving focus on startup
9676ee6 Disable the editor on error
22e4eca Force to destroy the consoles on exit event
cd36a93 Catch InsufficientPermissionsException exception on read files
2f1d0f4 Fix coding style
ac2aad9 One more dialog icon to remove (issue #21)
b5a78dd Replace 'arrows' actions icon with new '8-dot' icon (issue #23)
81cc580 Delete confirmation dialog box title is wrong (Issue #18)
979af9d Use AsyncTasks to load bookmarks and history
9aace43 Remove console selection (Issue #17) - Part III (string messages)
dfd3073 Remove console selection (Issue #17) - Part II (Settings & Code)
3d52078 Remove console selection (Issue #17) - Part I (UX)
36ab322 Fix more lint suggestions
6139368 Fix lint advise
70952aa The overflow menu should not show as an icon on devices with a physical menu button (issue #14)
fa69e63 Remove exit menu (issue #19)
aab7886 Display the raw representation of the type and permissions
12063a5 Remove actions menu icon (issue #21)
b968899 More focused drawables
6be595d Change application name to 'File Manager' (issue #20)
7370b71 Refresh navigation view after save file
3210ba1 Check size of assets to conform Android design guidelines (issues #12 and #15)
d4aa953 Remove unused drawables (issue #11)
5c9ec60 Add smooth scrollbar to execution dialog
7f55153 Add EXEC mime category to editor
75d252f New image for the actions button (issue #11)
fd7dd08 Add cancel button to dialogs
a6343ac Fix copyright
9c03053 Added a check for detect binary files.
609c610 Fix Inverted variable
3c9f849 Support of Internal Editors (Issue #4)
0ccbd08 Typo
6cc73ab Better search related strings
650c806 More strings cleanup
e2e9a00 Merge branch 'master' of git+ssh://git@github.com/jruesga/CMExplorer.git
77b9508 Fix issue #9
885f624 Fix issue #3
25b03b7 Merge pull request #13 from jruesga/dvt
d0b8afa Update settings and strings to conform to design guidelines
c0d280d Reset buffers after data is parsed
cb113b8 Strings cleanup part 2
11a0997 Initial Strings Cleanup
262da72 Revert "Initial strings cleanup"
1538c33 Initial strings cleanup
ca4183a Merge pull request #1 from DvTonder/master
3901932 Update AndroidManifest.xml
6fbce31 Update res/values/styles.xml
1dd165f New action "Add shortcut"
33e0c39 Remove onConfigurationChanged from Application
9d12883 Force landscape as same as other activity
173ef89 Destroy the process after stream closing
7e3b9d0 Fix action menu button listener
18aa30d VoiceSearch is not showing the icon
5b23261 CleanUp
7c2f8db Complete support for Java console (WIP)
a414483 More support for Java console (WIP)
7a6f901 Added chrooted mode to the description of search directory
8289711 Fix incorrect chrooted mode in user defined bookmarks
239a3c9 Fix incorrect set of advanced setting
446a029 Added support for Java console (WIP)
f6fe569 Use public method to build the non-privileged console
fc28976 Add mounts file to overlay. Set non translatable
124b80b Typo
ed6b256 Typo
e2f5085 By default don't show symlinks
0b0f9fe Don't allow advanced mode if device is not rooted
c48f71a Expose to the app if the device is rooted
220dbb5 Avoid using internal commands in ShellExecutableCreator
a9540c5 Fix ChRooted mode. Don't show parent directory on root storage volume.
b7286e5 CleanUp
83b43c6 Close consoles when need to call to finish
f4d4731 Separate shell files from binary/executable files
fccf98f Fix exec command: Invalid -c option
3fb19cd Detect debuggable mode, and set different execution timeouts
ef572ac Minor changes to console
dcdb15c Fix invalid message in advanced mode. Fix translations.
58f9d47 Extract destroy method of console. Remove :main from process name.
1c69643 Don't allow to change the permissions of a Symlink
4389611 Rename jail room terms for a more convenient chrooted
57f69dc Fix getFileInfo calls. The return of this function must be checked
288ca4c Remove support dependency
1d67645 Fix AssociationDialog
749e4a0 Proguard: Keep preference's classes
bcab7af Fix size of spinners of FsoPropertiesDialog
3de9ddb Fix detection of compression files without extension
35db468 Make StorageHelper independent from AOSP and CM10
27b7ffa New activity "Picker Activity"
c334085 Jail room mode
6808393 Fix transparent inverted color
f2b04da Revert check_on_normal_inverted drawable
c8d044a Remove obsolete resource
dc6144f CleanUp
7cd227b Welcome message
952b499 CleanUp
d12960c New search action "Open parent"
8e2c09f New fso and global actions "Compress" and "Compress selection" + CleanUp
09ea82a New drawables for compression mime/type and dialog icon
f4fbedb Reorganize ActionsPolicy to make it clearly
54e70ea New fso action "Extract"
f3dd56e Fix uncompress command bugs
44100f9 Add a method to check if the current console is privileged
6143b53 Add zip as a supported uncompress method
ce6bc8b Check getFileInfo is null
4896199 New uncompress command
4e2f063 CleanUp
30c2aea Add new compress mime/type formats
28a7986 New compress command
bd2dc0c CleanUp comment
a549e6e Resolve extension of tar.gz, tar.bz2 and tar.lzma
ff9fde9 Remove older comments
9d399fd New action "Execute"
c7d9090 Add clear history to HistoryActivity menu
8268826 Add file category to fso properties dialog
ff03d83 Fix incorrect call to parsePartialResult (for async programs)
e05ec66 Better handling of FolderUsage
b98418b List command requires do no check No such file or directory when error code == 0
2d7b380 Various: new commands and buffer management
dc925f7 Fix problem with buffered readers and writers (don't use)
d93c1a9 Allow to programs request write to the stdout
0e93b7c Environment.getRootDirectory doesn't return the root directory
438b5f6 Fix TestCases
19eddf2 Don't use -f flag in rm command.
0be3999 Remove trailing whitespace
448d4ea Replace cancelled by canceled
d7f59af Don't hardcode the root directory
b8babc0 Use overlay for root directory
22e345c Don't resolve link when apply user preference in sorting
69c0057 No show create link if current directory is in storage volume
c6202fb Various
007f791 CleanUp
63dc579 New command: ExecCommand (for execute commands)
c0a0acd New command: LinkCommand (for create symlinks)
26374b9 Create StorageHelper, and redesign BookmarksActivity (II)
719efac Create StorageHelper, and redesign BookmarksActivity
fe687a5 Revert refresh of new fso
26c844f New global actions "Paste selection" and "Move selection"
d2c9d01 New global action "Delete Selection"
a3c1736 Deselect all items on an operation (create folder, delete file, ...)
76d0333 Fix statistics computation for symlinks
77bf8cd Better resolve of symlinks in list command
da61ea1 Better history search drawable
2f9c944 Fix a bug in back of navigation activity when there is a search element
d94a0a0 Better symlinks handle
4e363cc Sort the items by path to avoid delete parents fso prior to child fso
962e749 When no console available, ask the user prior to exit
b03fde5 Restructure ActionsPolicy and other changes
fdd2507 Not restrict MessageProgressDialog to number progress
1a0a6ee Use -a flag in copy operations
0c1d1d1 Fix slash in paths for ListCommand
74360c6 Fix InputNameDialog actions
e02e883 Avoid read stdin when is null
384a211 Don't the method onSaveInstanceState and onRestoreInstanceState
ce79fe2 Implemented Allow Console Selection setting
2116cc2 Refresh the navigation view after back from the search view
d8214ad Redesign of some mime/type drawables
2d57f3a Redesign of bookmarks drawables
78a56ac A bunch of changes.
0b1564b Open and Open with actions
746b791 Revert Association Provider. Instead, use AOSP PreferredActivity api.
54e31dc Allow dialogs with no icon
0a50801 Lint warnings
6263ee4 Use new ObjectStringIdentifier to default preference
b35371a Improve DiskUsageGraph layout
f641643 Improve dialog layouts
0b2002b Provider and model for associations (file, intents, ...)
ba35de1 for code style
d0e85c5 Use hand-written counted loop for increase performance
299202f Avoid use of internals getters and setters
d7edde7 Remove synthetic-access for better access performance
f59d49d Shell improvements
bf8ccef Some providers + Some actions
bffa4c3 Global actions: Properties and Refresh
2092305 Add refresh listener to SearchActivity
5ef30a6 Delete file/folder action
6db02f3 Clean up
d989421 Reload fso prior to show actions dialog
b17fb0b ListCommand: Prevent to raise exception
d3bb38e /etc menu is showing open and open with actions
8b8a35f More mime/types and drawables
acd5df9 More polished "Document" drawables
d27cbaf New setting for "compute folder statistics" option
47c142c Fix commands
43610bd Add category to mime/type raw file
cfc430e Rename certificate drawable to security
0d5727e Use a timeout to release the exit status
71eafe2 Mime types and drawables
55e17ce Use a highlighted text for overflow menu
b57215b Add show actions to list of default long-click actions
486b163 No register long-click listener if not needed
501b074 Use uids instead of names on chown operation
a4c42f3 Fix default value of disk usage warning to 95
3265a4e Initial mime types and drawables
fd69dc5 Use unicode symbols for ascending and descending sort type menus
515e151 New refined launcher icons
43ffdf6 Move ActionsPolicy to ui/policy
3ba3bf9 Fix InlineAutocompleteTextView algorithm
26e764c Fix select/deselect of items
ebfed76 More settings and ActionPolicy
eb83295 Change Free Disk Space setting for more policy Disk Usage
5f9b2d0 Remove old classes
76b53fa Put correct values for free disk space warning
aa5a1c9 New general settings
0366398 New: Sort Search mode
18c127b Clean up
c570be2 Resolve symbolic links in search results
1b34725 Don't return the folder of the search
1a90d21 Add CleanSpec.mk
bb356ae New: Setting preferences
9f3ab76 Make selection small than status bar
1a2f0c8 Set selection view visible for display animation effect
bbb107e New: Selection View
731c52e Advise of few space in DiskUsageGraph
77158a7 Advise on mount points with < 5% of free space
e65cfe3 Some renames
1ed627e Various
79268e8 Rename Identifiable to ObjectIndentifier
61ff4d0 Synchronize actions menu dialog
aa48187 InlineAutocompleteTextView improvements
8560036 Fix Code Style
4b43764 Use valueOf as ADT recommends
0ee3238 No select the parent directory
ea83314 Use current console
ca71edc Fix the reexecution of commands
cb2286a Improvements, Clean up Remove sh wrap from su (not working in JB). A simple su opens a shell DiskUsageGraph invalidate all canvas instead of rect
b49d66f Update to CM10/JellyBean

   * packages/apps/CMUpdater
21adc78 Use download.cyanogenmod.org instead of get.cm
5aab90c CMUpdater: SV translations
70b7435 CMUpdater: FI translations
0e8de8b Merge "Fix UnsupportedOperationException." into cm-10.1
5f47c56 Fix UnsupportedOperationException.
f5e52c6 CMUpdater: Simplified Chinese Translations
334d145 CMUpdater: DA translation
65966db CMUpdater: NL translation
4976c77 Merge "CMUpdater: SK translation" into cm-10.1
c0b9cb8 Merge "CMUpdater : FR translation" into cm-10.1
50075d8 Merge "CMUpdater: EL translations" into cm-10.1
c118ceb Use newly-provided API level to compare builds.
ea3dbbf CMUpdater: SK translation
24615b2 CMUpdater: EL translations
c3311aa CM Updater: Update italian translation
46134ca Merge "CMUpdater: CS translation" into cm-10.1
4ea2889 Merge "CMUpdater: NB Translation" into cm-10.1
1d9e22d Merge "CMUpdater: Update Polish translation" into cm-10.1
c29d04e CMUpdater: Update Polish translation
0369add CMUpdater : FR translation
0056573 CMUpdater: ES translations
f2fb108 Merge "CMUpdater: SK translation" into cm-10.1
bcf6ec0 Merge "CMUpdater: RU translation" into cm-10.1
f4052f0 Merge "CMUpdater: HU translation" into cm-10.1
a89e6f6 CMUpdater: NB Translation
4acbf1a CMUpdater: RU translation
09295a4 CMUpdater: HU translation
a17e0e8 CMUpdater: SK translation
2b2e5b9 Merge "CMUpdater: LV translation" into cm-10.1
7047acc Merge "CMUpdater: PT-BR update translations" into cm-10.1
c149d8d CMUpdater: LV translation
713907d Update German translation.
a6515a4 CMUpdater: PT-BR update translations
06628c5 CMUpdater: CS translation
4e0cca6 Various UI and UX fixes.
babf626 CMUpdater: ES translations
46d7141 Merge "CMUpdater: PT-BR update translations" into cm-10.1
a0aa8ff Merge "CMUpdater: HU translation" into cm-10.1
ffbf42d Merge "CMUpdater: NL translation" into cm-10.1
838a83c Merge "CMUpdater: RU translation" into cm-10.1
10d2e76 CMUpdater: AF Translations
3dd17fb CMUpdater: RU translation
98b54f0 CMUpdater: NL translation
db15125 CMUpdater: HU translation
b6e5ae1 CMUpdater: PT-BR update translations
031a8b0 Update German translation.
2109378 Improve update notifications.
20920f2 CMUpdater: zh-rTW translations
2e25dc9 Fix NPE in case previous attempt to download changelog was unsuccessful.
2de91a9 CMUpdater: RU translation update
185391b Merge "CMUpdater: Add missing Af Translations" into cm-10.1
e091256 Merge "CMUpdater: PT-PT translations" into cm-10.1
e00c02b CMUpdater: CS translation
a173c43 CMUpdater: Add missing Af Translations
e192ee1 Merge "CMUpdater: EL translations" into cm-10.1
30b91b6 Merge "CMUpdater: NL translation" into cm-10.1
701ef4e CMUpdater: PT-PT translations
675145f CMUpdater: Simplified Chinese Translations
0983d81 CMUpdater: NL translation
c955568 CMUpdater: EL translations
c1254f8 Merge "CMUpdater: Update italian translation" into cm-10.1
cc99f8b CMUpdater: Japanese translation (bug fix)
1bfffe5 CMUpdater: Update italian translation
326fb3e CMUpdater: SK Translations
a86447f CMUpdater: SK Translations
3c393f5 Fix progress bar display when returning back to activity while download is running.
ba6e8c2 CMUpdater: SK Translations
d13b3c7 Merge changes I31fcd115,I3cdc0d80 into cm-10.1
2bd24af Don't show notification if check was triggered manually.
1b23347 Fix version check and move it to proper place.
9b4f3bc CMUpdater: ES translations
bbf7987 Update German translation.
c9b6227 Merge "CMUpdater : FR translation" into cm-10.1
72c1b87 Merge "CMUpdater: HU update translation" into cm-10.1
856227a CMUpdater: DA translation
4eedaa3 CMUpdater: HU update translation
e6fc5e1 CMUpdater: Update Polish translation
824b1db CMUpdater : FR translation
6619235 Merge "CMUpdater: Simplified Chinese Translations" into cm-10.1
8267c06 Merge "CMUpdater: ES translations" into cm-10.1
a4e5951 CMUpdater: RU translation
43a3195 CMUpdater: ES translations
48a3304 CMUpdater: Simplified Chinese Translations
b9605cc Clean up CMUpdater.
fe618c7 DashClock extension that shows the number of updates.
87944c4 CMUpdater: DA translation
152647c Merge "Japanese: Fixed translation" into cm-10.1
ee44ec3 CMUpdater: PT-BR update translations
3d28962 CMUpdater: Norwegian translation
963efa5 PT-BR: Update translation
46ea7e3 Japanese: Fixed translation
95d2d80 CMUpdater: Reorganize Greek translations
49a16da Fix handling notification click intents.
871cf09 CMUpdater: Greek translation update
c551c16 CMUpdater - tiny update of french translations
c1992c2 Merge "Add CMUpdater Uk translation" into cm-10.1
bffec2b Merge "CMUpdater: Update italian translation" into cm-10.1
cb93137 Correcting misspelled errors
e6dea99 CMUpdater: Update italian translation
bd2120b Add CMUpdater Uk translation
bed6c15 Update Russian Translation-CMUpdater-CM10.1
ed2468e CMUpdater : Hide download description
0116941 CMUpdater: Afrikaans translations
8b6e035 Improve and fix German translation.
247ff7a CMUpdater: Polish translations
0cf540b CMUpdater: Update Greek translations
14d0c83 Merge "Lithuanian: translations for CMUpdater" into cm-10.1
95bdc40 Merge "Czech: fixed translation" into cm-10.1
00bf04b Lithuanian: translations for CMUpdater
def9ba5 Merge "PT-BR: Update translations" into cm-10.1
4ba69b8 CMUpdater : update french translation
1cc170d Update delete messages
9504da6 PT-BR: Update translations
d9d2850 Merge "CM Updater: Hebrew translation" into cm-10.1
2967282 CM Updater: Hebrew translation
2129f42 CM Updater: Rtl layout
d3d79f0 Czech: fixed translation
e430546 CMUpdater : correction French translation
4875215 Merge "Added ability to create shortcut using "Settings shortcut" widget." into cm-10.1
5d91466 Added ability to create shortcut using "Settings shortcut" widget.
fbb338d Merge "CMUpdater: Dutch translations" into cm-10.1
33d9075 PT-BR: Fix translations
95da0b4 CMUpdater: Add Greek translation
131c7c1 Merge "CMUpdater : French correction" into cm-10.1
031d853 CMUpdater : French correction
4a04dfd Build fix.
28de9a6 CMUpdater: Dutch translations
f55e8d8 CMUpdater: Fixed force close on exiting update progress dialogue. Fixed leaked ServiceConnection.
d66aff3 CMUpdater : Add french correction
d14257e Updater: Fix installation path for emulated storage on 4.2
92bc331 Added hungarian translation for data_connection_required settings
fc0fd8b es_ES: Updated translations
c660956 CMUpdater : Fix rotation crash
611989a Merge "CMUpdater: Simplified Chinese translations" into jellybean
24ecea2 PT-BR: Add missing translations
a3b89f3 Merge "CMUpdater: Updated italian translation" into jellybean
9c0ae2f CMUpdater: Updated italian translation
1a8ceb7 CMUpdater: Simplified Chinese translations
96f4da0 Add new French translation and correction
a4bf8c2 German: Fix translation
1065716 German: Update translation
f8b3eaa CMUpdater: Added data connection checks
5c05b13 CMUpdater: Update Simplified Chinese Translations
f081bf0 CMUpdater - update french translation
c8e785b Merge "CMUpdater: New Danish strings" into jellybean
c9dba37 Merge "CMUpdater: updated romanian translation" into jellybean
6cd4c37 CMUpdater: updated romanian translation
860dcee Change activity label so old branded title doesn't appear while loading
8c7a504 Czech: fixed translation, added missing strings, revised
fffb5e0 CMUpdater: Updated italian translation
b3ca013 Added missing hungarian translation for CMUpdater
ca4c3f2 Merge "Update Russian Translation-CMUpdater-CM10" into jellybean
9f8787e Merge "CMUpdater - fix for some french translations" into jellybean
632835a Update Russian Translation-CMUpdater-CM10
7a2618a Remove extraneous "/" from UPDATES_FOLDER constant.
4f15f82 CMUpdater - fix for some french translations
8842eec CMUpdater: Updated italian translation
c8fec20 Merge "Added Norwegian translation for CMUpdater Patch Set 2: Removed General strings." into jellybean
33094f4 Merge "CMUpdater - french translations - initial commit" into jellybean
6bf5473 CMUpdater: Dutch translations
3c560bb CMUpdater: New Danish strings
16d6e03 CMUpdater - french translations - initial commit
ab696d3 CMUpdater:  Use a non-CM branded title in the preference screen header
c9295f9 Merge "CMUpdater: Add translatables" into jellybean
166efdc CMUpdater: Dutch translations
cabe50a CMUpdater: Add translatables
7b2fc9b CMUpdater: update headers
666ef67 Merge "CMUpdater: initial romanian translation" into jellybean
b821d57 Merge "CMUpdater: Dutch translations" into jellybean
005f6a4 CMUpdater: initial romanian translation
7ae265d CMUpdater: Dutch translations
1e31a0c Added Hungarian translations
2e2a274 Fix null String if user has a pre-changelog UpdateInfo
04b1e14 CMUpdater: Updated italian translation
8fedff0 CMUpdater: added finnish translations
9eb091b PT-BR: Added Missing Translations + fixes
8fe0c63 CMUpdater/TR: Add new strings
ab1d8d0 es_ES: Initial spanish translations
76d3ea5 CMUpdater: Simplified Chinese translation
7ba6276 German: initial translation for CM Updater
5ccef47 Update Russian Translation-CMUpdater-CM10
200bd73 Update Russian Translation-CMUpdater-CM10
e2a8af9 Merge "CMUpdater - Added Croatian translation" into jellybean
fec352b CMUpdater: Added czech translation
221724c Merge "CMUpdater/TR: Initial Turkish translations" into jellybean
ab4dc17 CMUpdater: Danish translation
942a3ce CMUpdater: Changelogs, better download handling and lots of tweaks
8d24b6d CMUpdater: Better AsyncTask implementation
748ae7a CMUpdater: Several fixes and better handling of tasks, connectivity etc.
6826260 CMUpdater/TR: Initial Turkish translations
e341622 CMUpdater: Better service binding logic and header navigation
2376684 Merge "Added hungarian translation for CMUpdater" into jellybean
38a4dd8 Merge "PT-BR: Added Missing Translations + fix english typo" into jellybean
8c3b07d Merge "Added Russian Translation-CMUpdater-CM10" into jellybean
2c4f132 Merge "CMUpdater: Added italian strings" into jellybean
c26d871 Merge "CMUpdater: update Japanese translation." into jellybean
3de0457 CMUpdater: Make sure destination folder exists when starting the download
d7c01a4 Added hungarian translation for CMUpdater
9c7c115 PT-BR: Added Missing Translations + fix english typo
3ac5d6a CMUpdater: General code cleanup
3b12864 CMUpdater: Added italian strings
d56f4b6 CMUpdater: Try to improve the recovery storage mount path logic
b317b0e CMUpdater - Added Croatian translation
f141ffb CMUpdater: Fix up licensing notices
cb926a5 Added Russian Translation-CMUpdater-CM10
11b13ab Added Norwegian translation for CMUpdater Patch Set 2: Removed General strings.
7c1fc6f CMUpdater: update Japanese translation.
eb9fdca CMUpdate: Switch to DownloadManager, major cleanup and fixes
bcbe964 Merge pull request #2 from DvTonder/dvt
f05cb46 CMUpdater: Use new drawables and other fixes
54214bc CMUpdater: Use a different API method to get up to 3 builds of each type
55f9bfd Merge pull request #1 from DvTonder/dvt
b09a357 CMUpdater: Reworking the UI, major cleanup and other stuff (WIP)
28d73f4 ApplyUpdate: Remove usage of "su"
db96dbb ApplyUpdate: Change the download location to something less generic
2d58792 DownloadActivity: Fix recreation failure on orientation change
58d8305 StringUtils: Compensate for jenkins timestamping
677d2fa CMUpdater: Do not launch multiple instances of the DownloadActivity
96e9d74 CMUpdater: Updates to main menu
6f5a23f CMUpdater: Remove update source configuration stuff
6452e6e CMUpdater: Remove mirror references, get.cm does its own mirror redirecting
389a9b7 CMUpdater: Replace some strings with the appropriate "CM terminology"
58ce582 Change parent look to Holo
36c7f53 Get rid of unused theme stuff
4f027c0 CMUpdater: Remove cruft
9f81a26 CMUpdater: Initial commit for new version

   * packages/apps/CMWallpapers
453aae8 CMwallpapers: CA translations
4fd8df0 CMWallpapers: CA translations
3db198d CMWallpapers: ET translations
d7305d4 CMWallpapers: TR translations
918197c CMWallpapers: Update copyright notice
b42db29 CMWallpapers: Norwegian translation
9fcbf35 CMWallpapers: Reorganize Greek translations
c566696 Add CMWallpapers uk translation
b0944ef CMWallpapers: Some cleanup
13d4b44 Add Afrikaans translation
a06c7aa CMWallpapers: Indonesian translations
57dbfc3 Add Serbian translation
d373d41 CMWallpapers: Hebrew translation
47277fd Merge "CMWallpapers: Add Greek translation" into cm-10.1
bc6fba7 CMWallpapers: Add Greek translation
87a9ecb CMWallpapers: Dutch translations
57628f3 CMWallpapers: Shorten App name
652d4ee CMWallpapers - Added Croatian translation
e84bed3 es_ES: Added missing translations

   * packages/apps/Calculator
cb754ac Calculator : Simplified Chinese translation
5227f37 Calculator: DA translation
ecaa453 Calculator: EL translations
c7f7606 Merge "Calculator: Update Polish translation" into cm-10.1
74ac530 Calculator: Update italian translation
a40a4ac Merge "Calculator: CS translation" into cm-10.1
e3b7fd6 Calculator: Update Polish translation
0209684 Merge "Calculator : FR Translation" into cm-10.1
4e9b5ea Calculator: CS translation
21e33f4 Merge "Calculator: ES translations" into cm-10.1
f61da4b Merge "Update German translation." into cm-10.1
90837ce Merge "Calculator: RU translation" into cm-10.1
afe8c8f Calculator: ES translations
f4f2386 Calculator: HU translation
5254730 Calculator: RU translation
b5fdfae Merge "Calculator: NL translation" into cm-10.1
0703a6d Calculator : FR Translation
e5cec21 Merge "Calculator: FI translations" into cm-10.1
7fccf5e Calculator: NL translation
0d8e3dd Calculator: PT-BR update translations
917d1ff Calculator: translation updates
c3c3216 Update German translation.
d36678b Calculator: FI translations
d8897cf Calculator: Digit grouping (and other things)
931cc25 Calculator: Update German translation
ea3b154 Calculator: ES translations
02ec8d1 Calculator: DA translation
6158be7 Merge "Calendar: Refactor RU translation" into cm-10.1
962cb1b Calendar: Refactor RU translation
c46776a Calculator : refactor in cm_strings.xml
b3d4600 Calculator: HU translation refactoring
efe27a4 Calculator: Refactor default translations
3bb951e Calculator: Update italian translator
52f9ab2 Calculator : FR translation
6b770cf Calculator: PT-BR update translations
531bf76 Merge "Calculator: Refactor AF translations" into cm-10.1
15035a2 Merge "Czech: added missing CM strings, fixed typos" into cm-10.1
53ac12a Calculator: ES translations
2ee0bce Merge "Calculator: Simplified Chinese Translations" into cm-10.1
70ddb87 Calculator: Refactor AF translations
8f96b82 PT-BR: Update translation
1662739 Czech: added missing CM strings, fixed typos
6232de4 Calculator: Reorganize Greek translations
f3c1998 Calculator: Simplified Chinese Translations
92590f9 Merge "Czech: fixed tranlation, fixed string order, added missing and fixed order again" into cm-10.1
d5fc17e Merge "Calculator : reorganize and add french translation" into cm-10.1
7ac0048 Calculator: NL translations
9c71ac7 Calculator : reorganize and add french translation
2fb9ba1 Czech: fixed tranlation, fixed string order, added missing and fixed order again
9319f35 Calculator: Danish strings for new merges
bcee005 Merge "Calculator: Added Polish translation" into cm-10.1
244b4d8 Fix build warnings.
14c1d61 Calculator: Added Polish translation
5d980b0 Merge "Revert "Calculator: Added Polish translation"" into cm-10.1
71ac1a9 Revert "Calculator: Added Polish translation"
028dbe6 Merge "Calculator: Added Polish translation" into cm-10.1
d1483b5 Calculator: Added Polish translation
2499cea Calculator: Improve German translation
c9ddaf2 Calculator: Update German translation
e70bd26 es_ES: Fix spanish translations
bd90334 Merge "Calculator : add french translation" into cm-10.1
1da46ee Merge "Calculator: Update Greek translations" into cm-10.1
763a811 Merge "Calculator: Update German translation" into cm-10.1
6bd84c4 Calculator : add french translation
a6f5868 Calculator: Update Greek translations
207140f Calculator: Update German translation
05907f1 es_ES: Update spanish translations
cdd98a2 Calculator: Some cleanup
bc9883f Add Afrikaans translation
35ff4ac Update Russian Translation-Calculator-CM10.1
f3090dc Merge "PT-BR: Update translations" into cm-10.1
1219990 Merge "Added translation for New Features Part 3" into cm-10.1
94e84f6 Merge "Move the window background to the activity theme" into cm-10.1
0506f97 Added translation for New Features Part 3
55889c6 Move the window background to the activity theme
5db8eba Calculator: Update italian translation
1a2cdbe PT-BR: Update translations
9f0ec1a Calculator bugfixes
3b7421f Calculator: New Features Part 3
966836b Calculator: Indonesian translations
8091800 Calculator: added missing Czech translations
2768f28 Deleting operatorDescs translations
d455728 Fix the long-text resizing on the ColorButton
87eceb8 Merge "Calculator: Update Greek translations" into cm-10.1
381e6e1 Calculator: Dutch translations
325a670 Calculator: Update Greek translations
2eae61f Merge "Calculator: updated romanian translation" into cm-10.1
2baeea4 Calculator: updated romanian translation
f168adf es_ES: Added missing translations
e30b097 Calculator: fix build break (fr)
3f06679 Calculator : add french missing translation
43643f4 Added hungarian translation (Done)
c35dfc6 PT-BR: Added missing translations
ded986e Fix build warnings Removed all untranslatable strings from languages
9dd8f37 Merge branch 'jb-mr1-release' into mr1-staging
d4683d8 Calculator: Added missing danish translations
1a344cc Calculator: New Features Part 2
80fcda4 Calculator: Dutch translations
ff5a494 Calculator: Add german translation for new features
55360df Hungarian translation for the Calculator and resizing the text on the buttons
6279f31 Update Russian Translation-Calculator-CM10
e4a6fef Calculator: Added missing danish translations
90f52d8 Calculator: Added czech missing translation and update
a3c3d47 Calculator: Updated italian translation
a619ed6 PT-BR: Translations for new features
1837154 Calculator: New Features
4686174 Calculator: Delocalize mathematical function before passing to arity
15cde91 Use more Unicode
96ebecf Calculator: Dutch translations
716e046 Calculator: Fix translatables
e57c0a8 Fix calculator crash on tablet devices. Shortened ES string
4602ee0 french: fix too long delete string
f09e951 Calculator: Simplified Chinese translations
a56fa5f Czech: fixed and added translation, fixed national quotation marks
5243a02 Calculator: Updated italian traslation
e281d25 Added missing hungarian translations for Calculator
2b0dfff PT-BR: Added missing translations
f3cb2cc Calculator: Remove strings with no default translation
9e46845 Calculator: Added missing danish translations
bc45235 Merge "Calculator: New Features Part 2" into jellybean
e1ae142 Calculator: New Features Part 2
1c22e03 Calculator: Dutch translations
6f8c058 Let's enhance
5860eaa Calculator: Add german translation for new features
a17a87b Hungarian translation for the Calculator and resizing the text on the buttons
211b28e Merge "Update Russian Translation-Calculator-CM10" into jellybean
9495a46 Merge "Calculator: Added missing danish translations" into jellybean
ea5df3b Merge "Calculator: Added czech missing translation and update" into jellybean
4a2d353 Update Russian Translation-Calculator-CM10
8e4b763 Calculator: Added missing danish translations
d6de219 Calculator: Added czech missing translation and update
4cb7e3b Calculator: Updated italian translation
1b6b33b Merge "Fixup widths of clear/ delete buttons" into jb-mr1-dev
0d886f3 Fixup widths of clear/ delete buttons
f4d403c Dont draw white border on buttons
8a942be PT-BR: Translations for new features
8a43328 Calculator: New Features
38972c8 Calculator: Delocalize mathematical function before passing to arity

   * packages/apps/Calendar
aba1cd1 Calendar: CA translations
49dad72 Revert "Calendar: CA translations"
36f18e4 Calendar: CA translations
621e8ba Calendar: FI translations
c725c2d Calendar: zh-rTW translations
623f6ad Calendar: Simplified Chinese Translations
f4a73e4 Merge "Calendar: DA translation" into cm-10.1
771ea86 Calendar : refactor in cm_strings.xml
a1e76f2 Calendar: DA translation
b7f7a48 Merge "Calendar: CS translation" into cm-10.1
4259f5c Calendar: CS translation
aa98209 Calendar: HU translation refactoring
83c8e05 Calendar:  Update italian translation
a62dfbf Merge "Calendar: Add Polish translation" into cm-10.1
92fb7cb Merge "Calendar: Refactor RU translation" into cm-10.1
2b0c5e1 Calendar: Add Polish translation
885114b Calendar: AF add missing translations
35d1e7d Calendar: Refactor RU translation
05d7399 Update German translation (refactor to cm_strings).
c979418 Merge "Calendar: CS translation" into cm-10.1
f7bb3e4 Merge "Calendar: ES translations" into cm-10.1
1d9bdc3 Calendar: ES translations
a6aa2e7 Calendar : FR translation
3382401 Calendar: Refactor default translations
ec31de9 Calendar: CS translation
e1e5ba6 Calendar: Reorganize Greek translations
a6141f5 Merge "Calendar : add french translation" into cm-10.1
da8b65f Calendar : add french translation
d2d14c6 Calendar: NL translations
d2b6ffc es_ES: Restore all AOSP strings
533d4f6 Calendar: Update Greek translations
c46e48c Update Russian Translation-Calendar-CM10.1
e2e2c64 Merge "Calendar: Update italian translation" into cm-10.1
5a4d4c3 Merge "es_ES: Added spanish translations" into cm-10.1
092ee6c Merge "PT-BR: Update translations" into cm-10.1
0d6b764 es_ES: Added spanish translations
042e731 PT-BR: Update translations
29fa74f Added hungarian translation for snoozing calendar reminders
a23be54 Calendar: Update italian translation
a173206 Allow configuring the delay for snoozing calendar reminders.
8c5754c Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Calendar into 1.1
5bd22f8 Calendar: Fix a typo
2c6ac82 Import translations. DO NOT MERGE
328417f Import translations. DO NOT MERGE
72d1d73 Remove vibrate-on-silent-mode per UX
65a98ff am 57153052: Import translations. DO NOT MERGE
4440da3 Import translations. DO NOT MERGE
5715305 Import translations. DO NOT MERGE
3905962 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Calendar into HEAD
05037c4 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
ed8b229 Add Recife timezone (2/2)
e608176 Czech: translation corrections
964980d Possible NPE in AllInOneActivity
898d0e6 merge in jb-mr1-release history after reset to jb-mr1-dev
4d8cdb8 Changed to more visible colors for day numbers in month view.
fc7a36a merge in jb-mr1-factory-release history after reset to jb-mr1-dev
d55da41 merge in jb-mr1-release history after reset to jb-mr1-dev
57f2c2c Let's enhance
69d0055 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
c42f259 merge in jb-mr1-release history after reset to jb-mr1-dev
ef68bf4 Import translations. DO NOT MERGE
948aa8d Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Calendar into aosp-merge
84be356 merge in jb-mr1-release history after reset to jb-mr1-dev
3ca997a Calendar: Enable the LED for calendar alerts
d2cc077 Merge "Workaround Email bug that does not set email body correctly, when emailing guests." into jb-mr1-dev
35dbc7a Workaround Email bug that does not set email body correctly, when emailing guests.
17102df merge in jb-mr1-release history after reset to jb-mr1-dev
c6845b2 Merge "Remove icon in widget per UX" into jb-mr1-dev
294aed7 Remove icon in widget per UX
a88e4b9 Import translations. DO NOT MERGE
db37ada merge in jb-mr1-release history after reset to jb-mr1-dev
69ea898 am 029e147b: am 4dcabc96: Added touch slop for horizontal scrolling
029e147 am 4dcabc96: Added touch slop for horizontal scrolling
4dcabc9 Added touch slop for horizontal scrolling
ec7414d merge in jb-mr1-release history after reset to jb-mr1-dev
f216423 am 25f84790: am 6fb86969: Fixed NPE in SelectSyncedCalendarsMultiAccount
25f8479 am 6fb86969: Fixed NPE in SelectSyncedCalendarsMultiAccount
6fb8696 Fixed NPE in SelectSyncedCalendarsMultiAccount
334b327 merge in jb-mr1-release history after reset to jb-mr1-dev
62b05b8 am 7e9c7e29: (-s ours) am c3b4ddce: (-s ours) Import translations. DO NOT MERGE
7e9c7e2 am c3b4ddce: (-s ours) Import translations. DO NOT MERGE
e3b30c6 am 3ac4e995: (-s ours) Import translations. DO NOT MERGE
155f020 Import translations. DO NOT MERGE
3ac4e99 Import translations. DO NOT MERGE
c3b4ddc Import translations. DO NOT MERGE
12f305d am b9a824b7: (-s ours) am 427e521d: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-aqua
b9a824b am 427e521d: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-aqua
61c11b9 am 04f33630: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-burgundy
427e521 Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-aqua
04f3363 Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-burgundy
5fe6b3d Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6668690 merge in jb-mr1-release history after reset to jb-mr1-dev
0ab2b1b Import translations. DO NOT MERGE
bfdfccb Import translations. DO NOT MERGE
a9af1b0 Import translations. DO NOT MERGE
d8cb071 am 5bd6f4d7: am 196bc3a5: Merge "Fixed NPE in matrixCursorFromCursor" into ics-ub-calendar-aqua
5bd6f4d am 196bc3a5: Merge "Fixed NPE in matrixCursorFromCursor" into ics-ub-calendar-aqua
196bc3a Merge "Fixed NPE in matrixCursorFromCursor" into ics-ub-calendar-aqua
6427090 Fixed NPE in matrixCursorFromCursor
97d65c9 am 5497333b: am a8e46c02: (-s ours) Merge "Readding the priority setting, which got accidentally removed in the previous CL." into ics-ub-calendar-aqua
5497333 am a8e46c02: (-s ours) Merge "Readding the priority setting, which got accidentally removed in the previous CL." into ics-ub-calendar-aqua
46ecd11 merge in jb-mr1-release history after reset to jb-mr1-dev
7a218ce am 8472f9d4: resolved conflicts for merge of 87136abf to ics-ub-calendar-burgundy
a8e46c0 Merge "Readding the priority setting, which got accidentally removed in the previous CL." into ics-ub-calendar-aqua
42641bb Readding the priority setting, which got accidentally removed in the previous CL.
8472f9d resolved conflicts for merge of 87136abf to ics-ub-calendar-burgundy
87136ab Merge "ICS notifications fix: de-prioritize expired digest, and use the same custom view for all our notifications." into ics-ub-calendar-aqua
fcb11de Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Calendar into aosp
d56ae09 merge in jb-mr1-release history after reset to jb-mr1-dev
5611723 am 6571d301: (-s ours) am b753a150: (-s ours) Import translations. DO NOT MERGE
6571d30 am b753a150: (-s ours) Import translations. DO NOT MERGE
b14a6bc am 42ce8924: (-s ours) Import translations. DO NOT MERGE
fa981c0 Import translations. DO NOT MERGE
42ce892 Import translations. DO NOT MERGE
b753a15 Import translations. DO NOT MERGE
af589fb ICS notifications fix: de-prioritize expired digest, and use the same custom view for all our notifications.
3617d06 merge in jb-mr1-release history after reset to jb-mr1-dev
aa15ffe am 2250d794: am 2e9eaec7: Merge "Allow "tel:" as phone prefix; more white space leniency." into ics-ub-calendar-aqua
2250d79 am 2e9eaec7: Merge "Allow "tel:" as phone prefix; more white space leniency." into ics-ub-calendar-aqua
2e9eaec Merge "Allow "tel:" as phone prefix; more white space leniency." into ics-ub-calendar-aqua
ddb48b6 am 93edcd71: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-burgundy
29527cb am 359f480d: (-s ours) am 557bd9ba: (-s ours) Import translations. DO NOT MERGE
93edcd7 Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-burgundy
93bd76d Import translations. DO NOT MERGE
359f480 am 557bd9ba: (-s ours) Import translations. DO NOT MERGE
91faed5 Import translations. DO NOT MERGE
557bd9b Import translations. DO NOT MERGE
c5cbf21 Allow "tel:" as phone prefix; more white space leniency.
6f72f11 merge in jb-mr1-release history after reset to jb-mr1-dev
efbff2b am dc59b0bc: am 844cac06: Skip local account types when picking default calendar.
dc59b0b am 844cac06: Skip local account types when picking default calendar.
844cac0 Skip local account types when picking default calendar.
75df531 merge in jb-mr1-release history after reset to jb-mr1-dev
5f18f83 am 6648ecc4: (-s ours) am 21049d25: (-s ours) Import translations. DO NOT MERGE
6648ecc am 21049d25: (-s ours) Import translations. DO NOT MERGE
b9b3288 am 33db66ee: (-s ours) Import translations. DO NOT MERGE
2e1b854 Import translations. DO NOT MERGE
33db66e Import translations. DO NOT MERGE
21049d2 Import translations. DO NOT MERGE
9411a25 merge in jb-mr1-release history after reset to jb-mr1-dev
6523933 am be6a1611: am 84d2dad0: Merge "Allow for reordering the menu options." into ics-ub-calendar-aqua
be6a161 am 84d2dad0: Merge "Allow for reordering the menu options." into ics-ub-calendar-aqua
39d7964 am 0ac1ff1e: (-s ours) am 458c1ec3: (-s ours) Import translations. DO NOT MERGE
0ac1ff1 am 458c1ec3: (-s ours) Import translations. DO NOT MERGE
84d2dad Merge "Allow for reordering the menu options." into ics-ub-calendar-aqua
a0485a8 am b80baab5: (-s ours) Import translations. DO NOT MERGE
9d956a8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b23f61d Allow for reordering the menu options.
f64fa18 merge in jb-mr1-release history after reset to jb-mr1-dev
1db6f01 Enable calendar widget as lock widget
181eee3 Revert "Enable calendar widget as lock widget"
978bff2 Merge "Enable calendar widget as lock widget" into jb-mr1-dev
9705d55 Import translations. DO NOT MERGE
38ee052 Enable calendar widget as lock widget
b80baab Import translations. DO NOT MERGE
458c1ec Import translations. DO NOT MERGE
f61ab57 merge in jb-mr1-release history after reset to jb-mr1-dev
5385ade am 53d81276: (-s ours) am 0c8148d0: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-aqua
53d8127 am 0c8148d0: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-aqua
6afbaa2 am 9c8ae9e8: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-burgundy
0c8148d Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-aqua
9c8ae9e Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-burgundy
768966b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
8a45b6b am 41526e9b: am 8286d2f7: Fix default calendar used when creating/editing event for the first time.
41526e9 am 8286d2f7: Fix default calendar used when creating/editing event for the first time.
8286d2f Fix default calendar used when creating/editing event for the first time.
d9d8b3f Import translations. DO NOT MERGE
6232d21 Import translations. DO NOT MERGE
d9fb9c2 Import translations. DO NOT MERGE
d0c44c4 merge in jb-mr1-release history after reset to jb-mr1-dev
a6d5152 am bf1c2fbf: am 2c0c7744: Merge "Fix emailing guests from event info page when attendees aren\'t synced down (too many), by emailing only the organizer." into ics-ub-calendar-aqua
bf1c2fb am 2c0c7744: Merge "Fix emailing guests from event info page when attendees aren\'t synced down (too many), by emailing only the organizer." into ics-ub-calendar-aqua
2c0c774 Merge "Fix emailing guests from event info page when attendees aren't synced down (too many), by emailing only the organizer." into ics-ub-calendar-aqua
7ffa24c Fix emailing guests from event info page when attendees aren't synced down (too many), by emailing only the organizer.
d42050d am 465811e6: (-s ours) Reconcile with jb-mr0-release - do not merge
465811e Reconcile with jb-mr0-release - do not merge
d6e64ee merge in jb-mr1-release history after reset to jb-mr1-dev
17e4c3e am c4a5fab2: am e472146a: Merge "Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other\'s alerts." into ics-ub-calendar-aqua
c4a5fab am e472146a: Merge "Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other\'s alerts." into ics-ub-calendar-aqua
e472146 Merge "Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other's alerts." into ics-ub-calendar-aqua
d1fa3c0 Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other's alerts.
4e972bd am 7a17c953: am a498f6ed: Modify doScroll to move based on the average of the touch points
7a17c95 am a498f6ed: Modify doScroll to move based on the average of the touch points
a498f6e Modify doScroll to move based on the average of the touch points
02fd982 Modify doScroll to move based on the average of the touch points
5653669 merge in jb-mr1-release history after reset to jb-mr1-dev
9550b83 am 7e2f06c8: am e25b43fb: Modify doScroll to move based on the average of the touch points
7e2f06c am e25b43fb: Modify doScroll to move based on the average of the touch points
e25b43f Modify doScroll to move based on the average of the touch points
e7c4b58 am 45461389: am c81d17c2: Changed widget header to include icon.
4546138 am c81d17c2: Changed widget header to include icon.
c81d17c Changed widget header to include icon.
2167814 am b0c50c10: (-s ours) am 41bae6dd: (-s ours) Fixed back-key bug in day/week view. DO NOT MERGE
b0c50c1 am 41bae6dd: (-s ours) Fixed back-key bug in day/week view. DO NOT MERGE
41bae6d Fixed back-key bug in day/week view. DO NOT MERGE
c14b5a5 am d52514a2: Fixed bug causing incorrect result from pressing back-key while in day/week view after having modified the date in the date picker.
d52514a Fixed bug causing incorrect result from pressing back-key while in day/week view after having modified the date in the date picker.
387f474 am 7a2de3d0: resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundy
d4fbdc5 am a3a27fba: Fix NPE from snoozing.
1986025 Calendar: Revert change 21116
7a2de3d resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundy
013fda0 Merge "Removed use of notification framework's cancelAll so we don't affect SyncAdapter's alerts." into ics-ub-calendar-aqua
948c590 Removed use of notification framework's cancelAll so we don't affect SyncAdapter's alerts.
a3a27fb Fix NPE from snoozing.
8c6fa97 merge in jb-mr1-release history after reset to jb-mr1-dev
b7cc617 Merge remote-tracking branch 'goog/ics-ub-calendar-burgundy' into catchup
91d285e Fixed ClassCastException in agenda view
8455174 Merge "Fixed ClassCastException in agenda view" into jb-mr1-dev
3be24e4 am 2b965215: Fixed ClassCastException in agenda view
fc4ba14 Fixed ClassCastException in agenda view
2b96521 Fixed ClassCastException in agenda view

   * packages/apps/Camera
70fbbd5 Camera: EL translations
321b948 Merge "Camera: update Japanese translation." into cm-10.1
cc38108 Merge "Camera: RU translation" into cm-10.1
b49481d Camera: update Japanese translation.
9dd94c4 Camera: RU translation
4813b8f Camera: Simplified Chinese Translations
92e15d6 Camera: Fix translation derp
f5bf70b Merge "Camera: DA translation" into cm-10.1
0950142 Camera: Update German translation
1982943 Merge "Camera: IT translations" into cm-10.1
8841f19 Camera: DA translation
99a514c Camera: IT translations
9decb28 Camera: PT-BR translations
a4cb837 Merge "Camera : FR Translation" into cm-10.1
c38f230 Merge "Camera: CS translation" into cm-10.1
5e579bf Camera : FR Translation
ed913b2 Merge "Camera: Add Japanese translation for cm" into cm-10.1
42cd303 Merge "Camera: HU translation" into cm-10.1
31f8952 Merge "Camera: PT-BR translations" into cm-10.1
b34db9c Camera: NL translation
506e867 Camera: Add Japanese translation for cm
33757f3 camera: dont call cancelAutoFocus if the preview is stopped
83a753a Camera: HU translation
bae9197 Camera: ES translations
4915fae Camera: CS translation
772673c Camera: PT-BR translations
934db9a Camera: Add red-eye flash mode
5d10e2f Merge "Camera: Add some Samsung color effects" into cm-10.1
79fa291 Merge "Camera: Fix some derp" into cm-10.1
d610191 Camera: Update German translation
641eb06 Camera: Fix some derp
b903ac7 Camera: HDR: don't reset focus manager when HDR is active.
84c5dd4 Merge "Camera:add traditional chinese translation" into cm-10.1
2506a0f Merge "Camera: Update italian translation" into cm-10.1
c360b69 Merge "Camera: Add translatables" into cm-10.1
03b8004 Merge "camera: fix image capture review mode when zsl is enabled" into cm-10.1
1b37394 Camera: Add translatables
176b77e Camera: HDR:  fix rotation issues.
cc3c43b Camera: Update italian translation
32e043e Camera: Add some Samsung color effects
747295b camera: fix image capture review mode when zsl is enabled
1f357c0 Camera: HDR: fix low exposure on samsung hardware.
8b19890 Camera: HDR: convert YUV422P / YV16 format to JPEG
ef79ff0 Camera: Force software HDR if the camera has hardware HDR and HW HDR is broken due to broken implementation issues.
69a931c show the actual shutter speed
6dee787 Camera:add traditional chinese translation
b2b7658 Camera: PT-BR translations
67f4844 Util: remove redundant check for ShutterSpeed
d510093 Add a setting for Shutter Speed
79b254c Camera: PT-BR update translations
23925c4 Merge "Camera : FR translation" into cm-10.1
9fe6aaf camera: reset camera surface on previewstart()
cb00d42 Camera : FR translation
6ae40e2 Camera: NL translation
20cb023 Update German translation.
32ae723 Camera: SK Translations
b88e06c Camera: Add translatables
20aae58 HDR video
77f67be Merge "Camera: Add a GPS indicator" into cm-10.1
4c84169 Merge "Camera: Update Polish translation" into cm-10.1
edac7ca Merge "Camera: Simplified Chinese Translations" into cm-10.1
5fd0e70 Merge "Camera: RU translation" into cm-10.1
ff2f2f7 Merge "Camera: CS translation" into cm-10.1
db3f4c2 Merge "Camera: EL translations" into cm-10.1
4f6a0ad Merge "Camera: NL translation" into cm-10.1
e7c944d Camera : Af translation
79260f3 Camera : FR translation
215bdd7 Camera: HU translation update
9e3c3f8 Camera: EL translations
102c01b Camera: NL translation
7176027 Camera: Add a GPS indicator
2465701 Camera: IT translations
8aa5b5b Camera: RU translation
ef7a417 Camera: Update Polish translation
7973d2e Merge "Camera: Update German translation" into cm-10.1
4633438 Camera: Update German translation
aa4ae80 Don't mess around with pref local ID for power shutter initialization.
3b7401d Camera: CS translation
bfb1a34 Camera: Simplified Chinese Translations
fdb2bb7 Camera: ES translations
0356b22 Camera: Update italian translation
bb2a0de Camera : FR translation
0a8bc98 Add 6mp, 4.5mp, 3.7mp, 2mp, WXGA & WQVGA resolutions
ada55fe Merge "Add missing resources for MDPI devices" into cm-10.1
d122c5e Camera: HU translation update
409f4a6 Camera: NL translation
bde7566 Merge "Camera: CS translation" into cm-10.1
451525c Merge "Camera : PL translation" into cm-10.1
254958d Camera: NL translation
6949f37 Camera: CS translation - AOSP
b2415b8 Camera: EL translations
4e86872 Camera: CS translation
15ddf42 Merge "Camera: Update German translation" into cm-10.1
009f5bd Merge "Camera: ES translations" into cm-10.1
88a2b6d Camera: Update German translation
1349d53 Camera: Update German translation
1857693 Merge "Camera: Wait for camera initialization" into cm-10.1
b58b220 Camera: ES translations
8b9b909 Merge "camera: Add 2.4MP, 6MP, 7MP resolution strings" into cm-10.1
f75b2f3 camera: Add 2.4MP, 6MP, 7MP resolution strings
e6b68c8 Camera: Update German translation
6ca8581 Camera : PL translation
e08de93 Camera: PT-BR update translations
b79274e Camera: NL translations
073208f Camera: Wait for camera initialization
c3c1694 Merge "Camera : FR translation" into cm-10.1
0dad7b9 Merge "Camera: HU translation update" into cm-10.1
22d083e Camera: HU translation update
751f964 Camera : FR translation
f3188c8 Merge "Camera: ES translations" into cm-10.1
a9ef43f Merge "Camera: Update timer and voice activation drawables" into cm-10.1
49d57c3 Camera: ES translations
fe83840 Merge "Camera: CS translation" into cm-10.1
7e72eb3 camera: add 1392x1392 resolution for galaxys s3 front cams
d07bdb1 Merge "Camera: ES translation" into cm-10.1
6765c6c Merge "Camera: DA translation" into cm-10.1
621a20f Camera: Update timer and voice activation drawables
c02b20a Merge "Camera: Update exposure drawables to fix various problems" into cm-10.1
c3a4d74 Camera: ES translation
8297eec Camera: DA translation
09a1c80 Merge "Camera : FR translation" into cm-10.1
330b65b Merge "Camera: Update Polish translation" into cm-10.1
3617422 Camera: HU update translation
a47f671 Camera: Update Polish translation
9f9f72a Camera: CS translation
0cdcaf8 Camera : FR translation
ba93485 Camera: Update exposure drawables to fix various problems
3845b5c Merge "Update German translation" into cm-10.1
d47dfb1 Update German translation
31c9282 Camera: fix preview in panorama mode
5b8be56 Merge "Camera : FR Translation" into cm-10.1
2eed061 Camera : FR Translation
fb31e12 Camera: NB translation
186b074 Revert all recent changes to preview orientation handling
3bb3e49 Camera: Add supportsOrientationResizePreview configuration
14baf52 camera: Clean up code for restarting the preview
3be9d26 Merge "Camera: Add Missing AF translations & do some cleanup" into cm-10.1
d1a3d5d camera: Fix hang when changing picture size
c0c7bd6 Camera: Add Missing AF translations & do some cleanup
c6745b0 Merge "Camera: DA translation" into cm-10.1
1eb28fa Merge "Camera: CS translation" into cm-10.1
7c13b47 Merge "Camera : refactor translation" into cm-10.1
a5d2849 camera: Fix camera storage location
dbab0ba Camera : refactor translation
36d24d9 Merge "Camera: NB translation" into cm-10.1
c858b8a Merge "Camera: fix NL AOSP translation" into cm-10.1
ccbb653 Merge "Camera: NL translation" into cm-10.1
5c40119 Fix preview state machine after it's restarted due to ratio changes
31ae28b Camera: NL translation
b568826 Camera: Fix for stretched preview in front camera
84d5ab5 Merge "camera: Add support for ZSL on new Samsung devices" into cm-10.1
7265837 Merge "camera: Fix parameter dumping" into cm-10.1
9466393 camera: Add support for ZSL on new Samsung devices
32707b5 Merge "Camera: Simplified Chinese Translations" into cm-10.1
0bf8a58 Merge "Camera: RU translation" into cm-10.1
da78fb4 camera: Fix parameter dumping
0d971be Camera: fix NL AOSP translation
d444a87 Camera: NB translation
c26cd7b Camera: CS translation
595f849 Merge "Camera: Update italian translation" into cm-10.1
d84bfeb Camera: HDR: Read parameters for hardware HDR support
2067225 Camera: Update italian translation
10cadf8 Merge "Camera: AF translation" into cm-10.1
72d8a09 Merge "Camera: Update italian translation" into cm-10.1
3a4ab87 Fix NPE in SecureCameraActivity init
6fe8974 Camera: DA translation
732d910 Merge "Camera: HU translations update" into cm-10.1
a395455 Camera: HU translations update
ea77c7d Camera: Set untranslatable
70c611b Merge "Camera: PT-BR update translations" into cm-10.1
89096e3 Camera: Simplified Chinese Translations
3b2a7b7 Camera: PT-BR update translations
727a741 Merge "Camera: Update Polish translation" into cm-10.1
7359e29 Merge "Camera: ES translations" into cm-10.1
7551525 Camera: RU translation
2c07944 Fix pinch to zoom for some devices
a5609ed Camera: Update Polish translation
5206390 Camera: AF translation
dc97633 Camera: Update italian translation
e6308d9 Merge "Camera: Norwegian translation" into cm-10.1
ffe0919 Camera: ES translations
8f9e293 Merge voice and timer options into a single "no-hands shutter" option
23c70af Camera : Timer Snapshot
c24b725 Voice Shutter: Voice triggered snapshots
6daff5e Camera: Norwegian translation
7f5a54b Fixed wrong copyright owner in license
31e6cae Merge "Camera: NL translations" into cm-10.1
aa6ffaa Merge "Camera: RU translation + reorganization" into cm-10.1
ae7aad8 Merge "Camera: EL translations" into cm-10.1
0904ed6 Camera: NL translations
f30d773 Merge "Camera: PT-BR update translations" into cm-10.1
461a152 Merge "Camera: Refactor AF translations" into cm-10.1
48ed6d0 Camera: EL translations
ee7588a Camera Danish translation: transition to cm_ format
0e4d761 Camera: Refactor default translations
d6d6e40 Camera: fix pinch to zoom for some devices
87f1d01 Merge "Camera: Update italian translation" into cm-10.1
ded9c61 Merge "Camera: EL translations" into cm-10.1
d49bee2 Camera: RU translation + reorganization
9aca6a3 Merge "Camera : Fr translation" into cm-10.1
c79bf92 Camera: PT-BR update translations
de2a7cb Camera: Update italian translation
3748afe Merge "Camera: ES translations" into cm-10.1
6bd0c79 Camera: Simplified Chinese Translations
5ef42ba Add an option to maintain the focus mode when using touch-to-focus
e39fd3a Camera: EL translations
5b8ce98 Camera: ES translations
df2774c Added hungarian translation
b8da7f1 Merge "Camera: latest merges" into cm-10.1
efabce4 Merge "Camera: Update Polish Translation" into cm-10.1
e293e72 Merge "Camera: Update italian translation" into cm-10.1
085c678 Merge "Camera: Reorganize Hungarian translations" into cm-10.1
8c936e1 Camera : Fr translation
418e2c2 Merge "camera: german translations for resolutions" into cm-10.1
675f96f camera: german translations for resolutions
3d3cdfa Merge "Add support for 12.8 MP resolution in Camera" into cm-10.1
93e0a61 Camera: Reorganize Hungarian translations
2bb0437 camera: Fix several issues with storage configuration
2866173 Merge "Camera: CS translations" into cm-10.1
b695970 Merge "PT-BR: Update translation" into cm-10.1
158b9c8 Camera: fix crash from storage selection patch
67ff567 Camera: latest merges
3653359 Add support for 12.8 MP resolution in Camera
f745fb6 Camera: CS translations
af13c1b Camera: Update italian translation
b5cbd5b Camera: Refactor AF translations
017368f PT-BR: Update translation
f279bba Camera: ES translations
64d51cc Camera: Update Polish Translation
f1fe659 Remove dead code
9284adf Merge "Add storage selection (1/2)" into cm-10.1
5b84d5e Camera: german translations for picturesize entries
d050f80 Add storage selection (1/2)
f9c4705 Merge "Camera : add french translation" into cm-10.1
678a03a Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1
3d02c95 Merge "Camera: Update italian translation" into cm-10.1
558cdc8 Merge "es_ES: Add spanish translations" into cm-10.1
0eda837 PT-BR: Update translation
2311183 Camera: Update italian translation
f257975 Camera: Reorganize Greek translations
d14d4a0 Camera: fix scene mode breakage caused by soft-hdr feature
8f13912 es_ES: Add spanish translations
2c535ae Merge "Fix camera extra settings menu" into cm-10.1
ee1ba79 Update Russian Translation-Camera-CM10.1
b97ffd1 Camera : add french translation
13a9daa Fix camera extra settings menu
5233130 Camera: add additional picture resolutions
0635e38 Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1
59613f3 Merge "Camera : reorganize and add french translation" into cm-10.1
1bcbb00 CameraSettings: fix the filtering of unsupported settings
4f69c9f Camera : reorganize and add french translation
de39edb Added hungarian translation
aaf7bf0 Update Russian Translation-Camera-CM10.1
43ed885 Merge "Fix picture size tables" into cm-10.1
9f421bd Fix picture size tables
acb746b Afrikaans translations: Added missing items
f6a9932 Camera : add french translation
92659b1 Merge "Camera: Latest Danish strings" into cm-10.1
b5be75b Merge "Added hungarian translation" into cm-10.1
d6b3a86 Merge "Added Russian Translation-Camera-CM10.1" into cm-10.1
66b0837 Added hungarian translation
f6b2599 Camera: Latest Danish strings
109a467 Added Russian Translation-Camera-CM10.1
b905a68 Merge "Camera: Update Italian translation" into cm-10.1
d3893fa Merge "es_ES: Add spanish translations" into cm-10.1
18de5eb es_ES: Add spanish translations
c55eac5 Camera: Update Italian translation
1977411 Camera: Updated Polish translation
77ef3f7 camera: add support for 2.1, 9 and 13MP picture sizes
3b51450 camera: add support for 6.4 and 2.5MP (16:9) picture sizes
bb4a2b6 Camera: separate settings for color effects and jpeg quality
85690ed Merge "es_ES: Update spanish translations" into cm-10.1
93db791 Merge "Camera: update italian translation" into cm-10.1
75833fd Merge "Camera: Update Greek translations" into cm-10.1
0704699 Merge "PT-BR: Update translations" into cm-10.1
22da721 es_ES: Update spanish translations
c6d9d00 Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1
1eb6728 Camera: Update Greek translations
25020bc Update Russian Translation-Camera-CM10.1
423035d Camera: update italian translation
030c195 Added hungarian translations
d231733 Camera: add exposure and JPEG quality settings to video camera
6dee54c camera: add much more scene & focus modes
560ef22 PT-BR: Update translations
91ac45d BurstMode: only show slide animation after final shot
654b333 HDR: only show slide animation after final shot
f7d48fe Util: Disable software HDR if the camera HAL actually supports it
903c51b camera: SoftHDR: Use parallel processing
b14bb7e Camera: SoftwareHDR: Reduce mem usage and let exposure time get tuned
7ed2d41 Merge "[1/2] Camera: add software HDR rendering" into cm-10.1
64ae3a9 camera: Restart the preview if record size changes
bdff6dc [1/2] Camera: add software HDR rendering
b84d77e Fixed aapt warning
9643935 Merge "camera: Add options to better control video preview size" into cm-10.1
5aba2f5 Merge "Camera: Update Greek translations" into cm-10.1
a20a3e3 Merge "Camera: Simplified Chinese Translations" into cm-10.1
c051a5a Camera: Update Greek translations
4468555 Camera:update romanian translation
0f8092d camera: Add options to better control video preview size
96e7a40 Camera: Simplified Chinese Translations
3b2a461 Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Camera into mr1.1-staging
91e5007 Camera: Dutch translations
1fc1065 fix for correct handling of video snapshot feature
8cb349d Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Camera into 1.1
e9d6ea8 es_ES: Added spanish translations
9d2c332 Merge "Camera: Updated italian translation" into cm-10.1
d85702c Merge "Danish: Camera ISO modes" into cm-10.1
a5bb368 Camera: Do not start autofocus when snapshot is in progress.
432cf11 Camera: Don't try to set focus/metering areas when none exist
227c063 Danish: Camera ISO modes
e42b921 Merge "Camera: Hebrew translation updates" into cm-10.1
49b321d Merge "camera: updated german translation" into cm-10.1
8146c11 camera: updated german translation
78ac279 CameraSettings: Fix crash when HAL has too many exposure steps
be7d7be Camera: Hebrew translation updates
521a298 Camera: Updated italian translation
9a7b641 Camera: New danish strings
f4cf1a6 Merge "PT-BR: Update Translation" into cm-10.1
a6b3dfa Added hungarian translation
752bbae Camera: add additional ISO modes (1/2)
ec8f7bc PT-BR: Update Translation
e044329 Merge "Videocamera: Fix the settings panel freeze" into cm-10.1
4adff36 Videocamera: Fix the settings panel freeze
b60126b Merge "Added hungarian translations for focustime_entry" into cm-10.1
e0927eb Update translatables
69d5d00 Merge "Camera : add french translation" into cm-10.1
fa8bc44 Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1
d980e83 Update Russian Translation-Camera-CM10.1
d23e3d7 Added hungarian translations for focustime_entry
6cfa01f Camera : add french translation
b682fa0 Camera: port additional settings from jellybean 4.1 (Round 2)
625eecb Merge "Camera: properly detect multiple cameras when using the camcorder" into cm-10.1
70403d9 Camera: properly detect multiple cameras when using the camcorder
607c04b Camera: Allow setting "profile-video-size" before recording starts
4ced235 Fix the settings panel freeze
c977855 PT-BR: Update translation
d3edfcc Merge "Camera : Add French missing translation" into cm-10.1
6cdfdce Camera: Hebrew translation
42d5624 Camera : Add French missing translation
8512686 Merge "Update Russian Translation-Camera-CM10.1" into cm-10.1
dad529b Update Russian Translation-Camera-CM10.1
2b720cb Merge "Camera: Danish translation" into cm-10.1
1a5c173 Merge "es_ES: Added spanish translations" into cm-10.1
87df29e Merge "Camera: Update Greek translations" into cm-10.1
417782c Merge "PT-BR: Added missing translations" into cm-10.1
d445f20 Merge "Camera: Simplified Chinese Translations" into cm-10.1
c4c72f3 Merge "Camera: add translatables" into cm-10.1
2d3a5b4 es_ES: Added spanish translations
c913105 Camera: Update Greek translations
d5ba32d Camera: Simplified Chinese Translations
b8ab5bb Camera: Dutch translations
1a45e6d Camera: add translatables
3061b63 PT-BR: Added missing translations
28b8d44 Added hungarian translation for scene and flashmode entrys
32c2a27 camera: add support for various scene modes
294e23b camera: add support for various focus modes
dc0e0b3 Camera: Danish translation
ab63d3d Merge "Camera: Updated romanian translation" into cm-10.1
e0ea464 Add missing resources for MDPI devices
de084a6 Camera: Updated romanian translation
6ba17aa Added hungarian translations
c3b31bd Camera: Simplified Chinese Translations
ee48bb1 camera: extend supported exposure compensation range
ac08048 Update Russian Translation-Camera-CM10.1
9ceca9a Italian translation for Camera
469f29d Added hungarian translation (Done)
b04ee3d PT-BR: Merged translation from CM10
45b308c Camera: port additional settings from jellybean 4.1
0bd4b80 Merge "Camera: Dutch translations" into cm-10.1
bf612be camera: Add ZSL support for Samsung/Qualcomm cameras
04b2a69 camera: Add debug logging when setting parameters
e9fc30f Camera: Dutch translations
59674c3 Revert "Camera: fix for non supported camera expoosure setting step from hal is basicily a negitive  value"
9552f8e Camera: Allow a device to request the focus modes at build time
697cd7d camera: allow setting video-size before recording starts
2f774cd camera: add support for samsung and htc camcorder modes
9e8561a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3673e0c am b10ed0f6: Fix picture size option for Arabic languages
b10ed0f Fix picture size option for Arabic languages
40938a0 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
fa02135 am ff46b1c5: unbreak the build by picking in the fix from bryce.
ff46b1c unbreak the build by picking in the fix from bryce.
5a5196c Revert "Revert "Camera : Powerkey shutter (2/2)""
9324cc6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3d6fb68 Revert "Camera : Powerkey shutter (2/2)"
4dfaa4a Camera : Powerkey shutter (2/2)
60c7624 am 7769af02: Merge "Don\'t re-launch activities we already started" into gb-ub-photos-arches
7769af0 Merge "Don't re-launch activities we already started" into gb-ub-photos-arches
759c3a5 Don't re-launch activities we already started
ca2deba merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4cf0a0d am fe00bf5a: Prevent Camera UI from showing up in Galllery
fe00bf5 Prevent Camera UI from showing up in Galllery
f70958c am 8eae48b0: Remove orientation compensation
8eae48b Remove orientation compensation
085b5af Merge "VideoModule: check for videosnapshot support in onSingleTapUp" into mr1-staging
6499e2c Camera: Prevent double-stops on preview for some HALs
2d41bcd merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1c49180 Camera: fix for non supported camera expoosure setting step from hal is basicily a negitive  value
afcef4c VideoModule: check for videosnapshot support in onSingleTapUp
d1dd045 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
fee2d48 am b8b9a3d0: Import translations. DO NOT MERGE
2e585c7 am 51f208fe: (-s ours) Import translations. DO NOT MERGE
ae934ae Import translations. DO NOT MERGE
b8b9a3d Import translations. DO NOT MERGE
51f208f Import translations. DO NOT MERGE
a2bfd7a am 43ded1fe: Merge "Fix shutter button missing in pano" into gb-ub-photos-arches
43ded1f Merge "Fix shutter button missing in pano" into gb-ub-photos-arches
468dd3d am b2443bad: Enable play button in video review
b2443ba Enable play button in video review
8257c4d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
430ac17 am 2d00129e: Merge "Gray out location setting in secure camera" into gb-ub-photos-arches
2d00129 Merge "Gray out location setting in secure camera" into gb-ub-photos-arches
45df1bd Fix shutter button missing in pano
7e145dd am 7ae55bc8: Import translations. DO NOT MERGE
84a7386 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
c1b1e23 am 8ef858b3: (-s ours) Import translations. DO NOT MERGE
cfe9b52 Import translations. DO NOT MERGE
7ae55bc Import translations. DO NOT MERGE
8ef858b Import translations. DO NOT MERGE
2152245 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b312042 am a9a7afe6: Remove the horizontal line in pano portrait
a9a7afe Remove the horizontal line in pano portrait
02fdcae Gray out location setting in secure camera
0da494b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
307bdf2 am fa5bb21e: Merge "Workaround for visible horizontal line in SRI pano" into gb-ub-photos-arches
638a409 am 9cbe225b: (-s ours) Import translations. DO NOT MERGE
fa5bb21 Merge "Workaround for visible horizontal line in SRI pano" into gb-ub-photos-arches
8e0e972 Reconcile with jb-mr1-release - do not merge
857e7e3 Merge 2034290 - do not merge
09cad06 Workaround for visible horizontal line in SRI pano
e8fe19e merge in jb-mr1-release history after reset to jb-mr1-dev
2034290 Import translations. DO NOT MERGE
9cbe225 Import translations. DO NOT MERGE
5b65c79 am 3e40e8d8: Animate between camera modules
239394f Reconcile with jb-mr1-release - do not merge
3e40e8d Animate between camera modules
c47ed1e merge in jb-mr1-release history after reset to jb-mr1-dev
bfc9130 am bb324a56: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
bb324a5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1e80bd1 am 7cbb1826: am 44fc8835: (-s ours) Import translations. DO NOT MERGE
7cbb182 am 44fc8835: (-s ours) Import translations. DO NOT MERGE
1988a08 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
90342b0 Import translations. DO NOT MERGE
44fc883 Import translations. DO NOT MERGE
75508a6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3fec56f merge in jb-mr1-release history after reset to jb-mr1-dev
f37cf4b am 2042ba7d: (-s ours) am cf9b3980: (-s ours) am 73653366: Add maximum recording length resource. DO NOT MERGE
2042ba7 am cf9b3980: (-s ours) am 73653366: Add maximum recording length resource. DO NOT MERGE
55d1224 am f3a9bad2: am c6c123c8: Add overlay control for maximum recording length.
cf9b398 am 73653366: Add maximum recording length resource. DO NOT MERGE
f3a9bad am c6c123c8: Add overlay control for maximum recording length.
7b3ad56 Fix the remaining black blip in secure camera transition.
c6c123c Add overlay control for maximum recording length.
7365336 Add maximum recording length resource. DO NOT MERGE
0bdc122 merge in jb-mr1-release history after reset to jb-mr1-dev
4d3f706 am 9abef056: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
9abef05 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
39d47f3 am 921f9189: am bdc502a9: Lock AE and AWB after the focus completes.
921f918 am bdc502a9: Lock AE and AWB after the focus completes.
bdc502a Lock AE and AWB after the focus completes.
6564a0b Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
e640a1f am 8488df8c: (-s ours) am 234ec79c: (-s ours) Import translations. DO NOT MERGE
8488df8 am 234ec79c: (-s ours) Import translations. DO NOT MERGE
454a475 merge in jb-mr1-release history after reset to jb-mr1-dev
c7bd29d Import translations. DO NOT MERGE
9f632eb Import translations. DO NOT MERGE
234ec79 Import translations. DO NOT MERGE
3f1a856 am e89cfaaf: am 9a0f3e63: Align the right fields for popup menu items
e89cfaa am 9a0f3e63: Align the right fields for popup menu items
9a0f3e6 Align the right fields for popup menu items
4b55b06 merge in jb-mr1-release history after reset to jb-mr1-dev
ec7e867 am 8523de09: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
65cc089 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
8523de0 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ac52265 am 46bc5251: am 33cdc549: Prevent swiping to Gallery while taking HDR
46bc525 am 33cdc549: Prevent swiping to Gallery while taking HDR
c325077 merge in jb-mr1-release history after reset to jb-mr1-dev
33cdc54 Prevent swiping to Gallery while taking HDR
8467f60 am b1836d18: am 9198b905: Merge "Hide switcher earlier in HDR mode" into gb-ub-photos-arches
b1836d1 am 9198b905: Merge "Hide switcher earlier in HDR mode" into gb-ub-photos-arches
9198b90 Merge "Hide switcher earlier in HDR mode" into gb-ub-photos-arches
3c20673 am 6c620346: (-s ours) am 6dde685d: (-s ours) Import translations. DO NOT MERGE
6c62034 am 6dde685d: (-s ours) Import translations. DO NOT MERGE
1ef3717 Import translations. DO NOT MERGE
1b3c924 Import translations. DO NOT MERGE
6dde685 Import translations. DO NOT MERGE
28fffd2 am dbad6120: Merge branch \'jb-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera into jb-mr1-dev
8481d23 am ee9109b1: (-s ours) am 6495f584: (-s ours) Import translations. DO NOT MERGE
dbad612 Merge branch 'jb-mr1-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera into jb-mr1-dev
ee9109b am 6495f584: (-s ours) Import translations. DO NOT MERGE
16e827a Import translations. DO NOT MERGE
8e2ed7b Import translations. DO NOT MERGE
6495f58 Import translations. DO NOT MERGE
a9eb196 am decc4254: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0b5f232 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
decc425 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
017de35 am 34e65195: (-s ours) am eef24940: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
34e6519 am eef24940: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
eef2494 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
953547a merge in jb-mr1-release history after reset to jb-mr1-dev
b869dbf am 64514579: Merge commit \'b27e9f704c6722410cdce9a7ca81db858fa97b1f\' into HEAD
6451457 Merge commit 'b27e9f704c6722410cdce9a7ca81db858fa97b1f' into HEAD
398aea1 Hide switcher earlier in HDR mode
07b7e7c am 07c0c955: am ee76ead5: Merge "Add proxy launcher" into gb-ub-photos-arches
07c0c95 am ee76ead5: Merge "Add proxy launcher" into gb-ub-photos-arches
ee76ead Merge "Add proxy launcher" into gb-ub-photos-arches
ad61616 Import translations. DO NOT MERGE
95f2fdb Import translations. DO NOT MERGE
1232c07 Import translations. DO NOT MERGE
b27e9f7 am 34c3a44f: am 08e3d26c: Show auto flash icon in keyguard widget layout.
34c3a44 am 08e3d26c: Show auto flash icon in keyguard widget layout.
08e3d26 Show auto flash icon in keyguard widget layout.
a903bc6 am 01b34208: am be83315a: Add actual layouts for keyguard widget.
01b3420 am be83315a: Add actual layouts for keyguard widget.
be83315 Add actual layouts for keyguard widget.
1f653f4 am 9839b2fe: am 30027c22: Merge "Initial placeholder layout for lockscreen camera widget." into gb-ub-photos-arches
9839b2f am 30027c22: Merge "Initial placeholder layout for lockscreen camera widget." into gb-ub-photos-arches
30027c2 Merge "Initial placeholder layout for lockscreen camera widget." into gb-ub-photos-arches
20f8a92 Add proxy launcher
e85d242 merge in jb-mr1-release history after reset to jb-mr1-dev
d9570e5 am 77c990e6: am 9b96a7c0: Force renderring request for Camera Animation.
77c990e am 9b96a7c0: Force renderring request for Camera Animation.
d544f97 Add actual layouts for keyguard widget.
9b96a7c Force renderring request for Camera Animation.
9edee11 Initial placeholder layout for lockscreen camera widget.
7c05a33 am c560ccea: am 5c61b678: Merge "Clean up SRI panorama UI." into gb-ub-photos-arches
c560cce am 5c61b678: Merge "Clean up SRI panorama UI." into gb-ub-photos-arches
5c61b67 Merge "Clean up SRI panorama UI." into gb-ub-photos-arches
020ff99 merge in jb-mr1-release history after reset to jb-mr1-dev
ba22aa0 am 4e9f4c20: am f6b9a4f1: Merge "Revert "Use photo picture size for video snapshot"" into gb-ub-photos-arches
4e9f4c2 am f6b9a4f1: Merge "Revert "Use photo picture size for video snapshot"" into gb-ub-photos-arches
f6b9a4f Merge "Revert "Use photo picture size for video snapshot"" into gb-ub-photos-arches
cd4b5bd Revert "Use photo picture size for video snapshot"
b4222f2 am eea3b3c3: am 9a1209eb: Merge "Clean up focus dial code" into gb-ub-photos-arches
eea3b3c am 9a1209eb: Merge "Clean up focus dial code" into gb-ub-photos-arches
9a1209e Merge "Clean up focus dial code" into gb-ub-photos-arches
789f6cc Clean up focus dial code
2185541 am 3d8fb947: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5406cb6 am 39d8d4af: (-s ours) am ad4f77e3: (-s ours) Import translations. DO NOT MERGE
7c2a658 am 6e5431e7: am fd3edfbb: Fix panorama progress indicator direction.
6288bb0 am 8a4c5c65: am cc138e71: Remove cancel text and round capture indicator in panorama.
7418dba am 66bb8f9c: am 553ebe08: Small clean up of SRI panorama.
8890c3b am fa52e42f: am 3eb23a8f: Keep the current frame static in the center in SRI panorama.
30bf8b8 am e173ae37: am dff2ace0: rm activity states(AlbumPage,etc) when invisible
3d8fb94 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
39d8d4a am ad4f77e3: (-s ours) Import translations. DO NOT MERGE
951b415 Import translations. DO NOT MERGE
4ddf47b Import translations. DO NOT MERGE
ad4f77e Import translations. DO NOT MERGE
445ed72 Clean up SRI panorama UI.
594a61c merge in jb-mr1-release history after reset to jb-mr1-dev
19b08af Initial placeholder layout for lockscreen camera widget.
6e5431e am fd3edfbb: Fix panorama progress indicator direction.
fd3edfb Fix panorama progress indicator direction.
e0c69fd merge in jb-mr1-release history after reset to jb-mr1-dev
8a4c5c6 am cc138e71: Remove cancel text and round capture indicator in panorama.
cc138e7 Remove cancel text and round capture indicator in panorama.
66bb8f9 am 553ebe08: Small clean up of SRI panorama.
553ebe0 Small clean up of SRI panorama.
fa52e42 am 3eb23a8f: Keep the current frame static in the center in SRI panorama.
3eb23a8 Keep the current frame static in the center in SRI panorama.
b926ecf merge in jb-mr1-release history after reset to jb-mr1-dev
e173ae3 am dff2ace0: rm activity states(AlbumPage,etc) when invisible
dff2ace rm activity states(AlbumPage,etc) when invisible
3fe82e7 merge in jb-mr1-release history after reset to jb-mr1-dev
eaa74b8 am cf5c82f0: am 7420a50a: Merge "Make sure clear runs on UI thread" into gb-ub-photos-arches
cf5c82f am 7420a50a: Merge "Make sure clear runs on UI thread" into gb-ub-photos-arches
7420a50 Merge "Make sure clear runs on UI thread" into gb-ub-photos-arches
f21d5db am af4108c1: am 0fcaa534: Fix NPE in tests
af4108c am 0fcaa534: Fix NPE in tests
b458bdc Make sure clear runs on UI thread
0fcaa53 Fix NPE in tests
97635a8 am faa7326b: (-s ours) am 8b22c232: (-s ours) Import translations. DO NOT MERGE
3755624 am bc20e5c2: (-s ours) Import translations. DO NOT MERGE
faa7326 am 8b22c232: (-s ours) Import translations. DO NOT MERGE
9dfa793 Import translations. DO NOT MERGE
bc20e5c Import translations. DO NOT MERGE
8b22c23 Import translations. DO NOT MERGE
0137fd3 am 2a623b6c: am b9b40e51: Merge "Render disabled menu items correctly" into gb-ub-photos-arches
2a623b6 am b9b40e51: Merge "Render disabled menu items correctly" into gb-ub-photos-arches
b9b40e5 Merge "Render disabled menu items correctly" into gb-ub-photos-arches
461514a Render disabled menu items correctly
8654cf2 merge in jb-mr1-release history after reset to jb-mr1-dev
ac93cae am 82c23154: am 95abcab2: Merge "Adding a delay to camera startup test to workaround NPE and unblock test." into gb-ub-photos-arches
82c2315 am 95abcab2: Merge "Adding a delay to camera startup test to workaround NPE and unblock test." into gb-ub-photos-arches
95abcab Merge "Adding a delay to camera startup test to workaround NPE and unblock test." into gb-ub-photos-arches
502d8cb merge in jb-mr1-release history after reset to jb-mr1-dev
d6a3485 am 953ba562: (-s ours) am efb7d844: (-s ours) Import translations. DO NOT MERGE
953ba56 am efb7d844: (-s ours) Import translations. DO NOT MERGE
fb37832 am a1acd8d7: (-s ours) Import translations. DO NOT MERGE
785a25f Import translations. DO NOT MERGE
a1acd8d Import translations. DO NOT MERGE
efb7d84 Import translations. DO NOT MERGE
b868fb4 merge in jb-mr1-release history after reset to jb-mr1-dev
71f4e1a am 9a9899ed: am ee1ff397: Fix panorama preview distortion when capture starts.
9a9899e am ee1ff397: Fix panorama preview distortion when capture starts.
ee1ff39 Fix panorama preview distortion when capture starts.
195f17c Adding a delay to camera startup test to workaround NPE and unblock test.
dcd87de merge in jb-mr1-release history after reset to jb-mr1-dev
cf657b7 am bae548e1: am fbcd0807: Merge "Hide the switcher pop-up when the switcher is hidden." into gb-ub-photos-arches
bae548e am fbcd0807: Merge "Hide the switcher pop-up when the switcher is hidden." into gb-ub-photos-arches
fbcd080 Merge "Hide the switcher pop-up when the switcher is hidden." into gb-ub-photos-arches
9f1a7cf am 4337579d: am 8fd37ebb: Make zooming more responsive
4337579 am 8fd37ebb: Make zooming more responsive
b8317ef Hide the switcher pop-up when the switcher is hidden.
8fd37eb Make zooming more responsive
789ac0e am bd2af0cd: am b829523f: Fix NPE when exiting camera due to policy
bd2af0c am b829523f: Fix NPE when exiting camera due to policy
b829523 Fix NPE when exiting camera due to policy
fbf0397 am fa0e369d: am 86b5afc0: Merge "Use photo picture size for video snapshot" into gb-ub-photos-arches
fa0e369 am 86b5afc0: Merge "Use photo picture size for video snapshot" into gb-ub-photos-arches
86b5afc Merge "Use photo picture size for video snapshot" into gb-ub-photos-arches
8a91b60 Use photo picture size for video snapshot
f1427af am c68af146: am 2c81abc4: Fix zoom change listener
c68af14 am 2c81abc4: Fix zoom change listener
2c81abc Fix zoom change listener
9b9f985 merge in jb-mr1-release history after reset to jb-mr1-dev
ebeff30 am 857221fa: am 224cf5df: Show text in potrait when orientation is portrait.
857221f am 224cf5df: Show text in potrait when orientation is portrait.
224cf5d Show text in potrait when orientation is portrait.
1c1e737 am c3f7c160: am 861ea12f: Fix NPE at PhotoModule.onShowSwitcherPopup
c3f7c16 am 861ea12f: Fix NPE at PhotoModule.onShowSwitcherPopup
861ea12 Fix NPE at PhotoModule.onShowSwitcherPopup
a268616 am b50699d9: am c9c5d414: Merge "Clean up accessibility mode" into gb-ub-photos-arches
b50699d am c9c5d414: Merge "Clean up accessibility mode" into gb-ub-photos-arches
c9c5d41 Merge "Clean up accessibility mode" into gb-ub-photos-arches
1ae07ad Clean up accessibility mode
69b01e5 am dd93425e: am 7820dfcc: Merge "Fix touch handling on menu button" into gb-ub-photos-arches
dd93425 am 7820dfcc: Merge "Fix touch handling on menu button" into gb-ub-photos-arches
7820dfc Merge "Fix touch handling on menu button" into gb-ub-photos-arches
fdf3d9c am 2d7d3ba7: am f0b0425a: Hide switcher during HDR capture
2d7d3ba am f0b0425a: Hide switcher during HDR capture
b1ddf57 Fix touch handling on menu button
f0b0425 Hide switcher during HDR capture
c7bee30 am 35ccd3bb: am 8a27da05: Fix capture retake mode
35ccd3b am 8a27da05: Fix capture retake mode
8a27da0 Fix capture retake mode
c4bbc62 merge in jb-mr1-release history after reset to jb-mr1-dev
3bb3c13 am bef540d4: am 7148f0ea: Merge "Panorama should add Exif before adding the image to media store." into gb-ub-photos-arches
bef540d am 7148f0ea: Merge "Panorama should add Exif before adding the image to media store." into gb-ub-photos-arches
7148f0e Merge "Panorama should add Exif before adding the image to media store." into gb-ub-photos-arches
442c0cd am 0d6d34a7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0d6d34a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ea4db9d am 749391e0: (-s ours) am b8f69eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
749391e am b8f69eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
b8f69ee Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
20523f6 Panorama should add Exif before adding the image to media store.
d1e0b82 am 32c1f478: am 50dfe58a: Fix monkey bug
32c1f47 am 50dfe58a: Fix monkey bug
50dfe58 Fix monkey bug
defa515 am 315ee46f: am 34badb11: Merge "Fix NPE in CameraSettings" into gb-ub-photos-arches
315ee46 am 34badb11: Merge "Fix NPE in CameraSettings" into gb-ub-photos-arches
34badb1 Merge "Fix NPE in CameraSettings" into gb-ub-photos-arches
ed61bcd Fix NPE in CameraSettings
3991d29 Import translations. DO NOT MERGE
7b8ac24 Import translations. DO NOT MERGE
4353091 merge in jb-mr1-release history after reset to jb-mr1-dev
53e63a5 am 0eadd09c: am 3a81d882: Update review icons
0eadd09 am 3a81d882: Update review icons
3a81d88 Update review icons
a3bcd59 am a19fd74f: am a486af36: Show flash indicator in video mode
a19fd74 am a486af36: Show flash indicator in video mode
a486af3 Show flash indicator in video mode
fa802ff am d1e9edf7: am 0c23bd23: Fix capture button placement
d1e9edf am 0c23bd23: Fix capture button placement
0c23bd2 Fix capture button placement
9383b6d am 77007467: am 5e4ea5b0: Add background to camera controls
7700746 am 5e4ea5b0: Add background to camera controls
5e4ea5b Add background to camera controls
459a87b am 39ed4b96: am 20713e25: Merge "Fix animation orientation" into gb-ub-photos-arches
b1b5348 am e810e7bb: am 47996184: Merge "Larger shutter button for tablets" into gb-ub-photos-arches
1a87ea0 am 85592e39: am 5aee141a: Merge "Respect screen lock for capture animation" into gb-ub-photos-arches
d3e33d9 am 008eda17: am 8a3640ce: Expose the uncropped width/height for FaceView
fb5e3ed am 525f395a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
cc3f0ec am faad80dc: (-s ours) am 77be1bd2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
39ed4b9 am 20713e25: Merge "Fix animation orientation" into gb-ub-photos-arches
20713e2 Merge "Fix animation orientation" into gb-ub-photos-arches
e810e7b am 47996184: Merge "Larger shutter button for tablets" into gb-ub-photos-arches
d0d0e26 Fix animation orientation
4799618 Merge "Larger shutter button for tablets" into gb-ub-photos-arches
85592e3 am 5aee141a: Merge "Respect screen lock for capture animation" into gb-ub-photos-arches
d200be2 Larger shutter button for tablets
5aee141 Merge "Respect screen lock for capture animation" into gb-ub-photos-arches
008eda1 am 8a3640ce: Expose the uncropped width/height for FaceView
bab66b2 Respect screen lock for capture animation
8a3640c Expose the uncropped width/height for FaceView
525f395 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
faad80d am 77be1bd2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
77be1bd Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
9044bda am 7f20c269: New front/back menu icons
7f20c26 New front/back menu icons
0a518f9 merge in jb-mr1-release history after reset to jb-mr1-dev
2c95aa3 am fa17f740: Merge "Remove unused strings." into gb-ub-photos-arches
fa17f74 Merge "Remove unused strings." into gb-ub-photos-arches
0121a88 am 5bf0244b: Remove oversizing path from CameraScreenNail
5bf0244 Remove oversizing path from CameraScreenNail
5fc2c9d merge in jb-mr1-release history after reset to jb-mr1-dev
7c41381 am 40d03901: Fix face detection circles for landscape devices
40d0390 Fix face detection circles for landscape devices
c1a1b24 Import translations. DO NOT MERGE
2b5cf4e Import translations. DO NOT MERGE
8d5c7a5 Aniamte before capture if HDR
36761e1 am ec6a318c: Fix assets for wb and exposure
ec6a318 Fix assets for wb and exposure
5d732e2 merge in jb-mr1-release history after reset to jb-mr1-dev
a297e91 Remove unused strings.
5a9907b am eec0ab92: Remove unused drawables and xml files.
eec0ab9 Remove unused drawables and xml files.
791a107 am ed19156e: Remove old camera classes and xml files.
ed19156 Remove old camera classes and xml files.
928dbd2 am 0a5afab1: Merge "No need to set contrained frame for camera screen nail." into gb-ub-photos-arches
0a5afab Merge "No need to set contrained frame for camera screen nail." into gb-ub-photos-arches
df1b9a0 am 59d61767: Do not show location prompt in Nakasi
59d6176 Do not show location prompt in Nakasi
3618fb2 am a4bb2efb: Merge "Update location strings" into gb-ub-photos-arches
a4bb2ef Merge "Update location strings" into gb-ub-photos-arches
4d69751 am b7fc8732: Fix NPE for onConfigurationChanged
58f2b1a Update location strings
02f9ef1 Hide menu button when popup is out
7feb179 Remove switcher from menu if only one camera present
1088b55 Fix pie item alpha
68cf90b Set actual zoom value in initialize
b7fc873 Fix NPE for onConfigurationChanged
b613b2e am 8ec4b2af: Merge "Fix indicators on Nakasi" into gb-ub-photos-arches
8ec4b2a Merge "Fix indicators on Nakasi" into gb-ub-photos-arches
6c8d7c8 Fix indicators on Nakasi
cbded33 am 17a04fb7: Don\'t show menu on tap
17a04fb Don't show menu on tap
4c3a254 am f5b3e987: Merge "Fix menu fade in animation" into gb-ub-photos-arches
f5b3e98 Merge "Fix menu fade in animation" into gb-ub-photos-arches
1e5e86d merge in jb-mr1-factory-release history after reset to jb-mr1-dev
8ca6fe2 am 9b475cfd: Aniamte before capture if HDR
9b475cf Aniamte before capture if HDR
0795772 Fix menu fade in animation
defaede am 0ad5161f: Hide menu button when popup is out
0ad5161 Hide menu button when popup is out
3bf0d20 am 5ee84981: Remove switcher from menu if only one camera present
5ee8498 Remove switcher from menu if only one camera present
6aeda7e am aee79b34: Merge "Fix pie item alpha" into gb-ub-photos-arches
aee79b3 Merge "Fix pie item alpha" into gb-ub-photos-arches
14be58c am 0af8a3b2: Set actual zoom value in initialize
8c5c6f2 Fix pie item alpha
0af8a3b Set actual zoom value in initialize
925d4cf No need to set contrained frame for camera screen nail.
38cc9e4 merge in jb-mr1-release history after reset to jb-mr1-dev
08f4164 am 3ed120d2: Use drawables instead of views
3ed120d Use drawables instead of views
8c1434c am 287833cb: Fix camera screen nail for swiping during capture
287833c Fix camera screen nail for swiping during capture
8a5873a merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1ed78e6 merge in jb-mr1-release history after reset to jb-mr1-dev
37197ed am c7874c2e: Merge "Fix camera switcher animation in landscape" into gb-ub-photos-arches
c7874c2 Merge "Fix camera switcher animation in landscape" into gb-ub-photos-arches
6478e5e Fix camera switcher animation in landscape
d32fa21 am 6ab108ba: Merge "Animate menu icons on fade in" into gb-ub-photos-arches
6ab108b Merge "Animate menu icons on fade in" into gb-ub-photos-arches
7feb060 Animate menu icons on fade in
8486964 merge in jb-mr1-release history after reset to jb-mr1-dev
0c59ab0 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
4920f16 am b16b112d: (-s ours) Import translations. DO NOT MERGE
47d8257 Import translations. DO NOT MERGE
b16b112 Import translations. DO NOT MERGE
28b83c4 am 0efe977c: Merge "Fix blurry pictures when taking a burst of pictures." into gb-ub-photos-arches
0efe977 Merge "Fix blurry pictures when taking a burst of pictures." into gb-ub-photos-arches
58d2d2a merge in jb-mr1-factory-release history after reset to jb-mr1-dev
3d5172f am 19e17529: Merge "Show zoom ratio" into gb-ub-photos-arches
19e1752 Merge "Show zoom ratio" into gb-ub-photos-arches
0505273 Fix blurry pictures when taking a burst of pictures.
5ed5467 Show zoom ratio
d7e2557 am 8ed91ce2: Fix corrupted panorama on second run.
d1e4909 merge in jb-mr1-release history after reset to jb-mr1-dev
8ed91ce Fix corrupted panorama on second run.
0622aad am 666e42dd: Fix monkey crash in CameraScreenNail.animateSlide
666e42d Fix monkey crash in CameraScreenNail.animateSlide
5633617 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
4b6e76f am e69aeafb: (-s ours) Import translations. DO NOT MERGE
1fd22f6 Import translations. DO NOT MERGE
e69aeaf Import translations. DO NOT MERGE
55f313e am b4003e72: Merge "New lightcycle assets" into gb-ub-photos-arches
b4003e7 Merge "New lightcycle assets" into gb-ub-photos-arches
ebf2df0 New lightcycle assets
33f1612 merge in jb-mr1-release history after reset to jb-mr1-dev
c435c87 am 2eca6e71: New launcher icons
2eca6e7 New launcher icons
81f16b6 am bd592c2f: Cross fade menu/submenu
bd592c2 Cross fade menu/submenu
558b972 am 8ebe8a7f: Merge "New assets for camera" into gb-ub-photos-arches
8ebe8a7 Merge "New assets for camera" into gb-ub-photos-arches
b10a484 am b7e4d024: Fix "Too fast" warning is not displayed in panorama capture.
b7e4d02 Fix "Too fast" warning is not displayed in panorama capture.
f163320 New assets for camera
26e7d47 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1f727c2 merge in jb-mr1-release history after reset to jb-mr1-dev
fa90dbd am 30f75fdc: Fix NPE in setDisplayOrientation
30f75fd Fix NPE in setDisplayOrientation
71a057e am 6dae2685: Merge "Fix monkey crash" into gb-ub-photos-arches
6dae268 Merge "Fix monkey crash" into gb-ub-photos-arches
e0fdab2 am 23f36aca: Merge "Rotation "just works" if you aren\'t pano" into gb-ub-photos-arches
23f36ac Merge "Rotation "just works" if you aren't pano" into gb-ub-photos-arches
b757930 Fix monkey crash
b662638 Rotation "just works" if you aren't pano
d78f7e2 am 7fc83783: Musical chairs in settings
7fc8378 Musical chairs in settings
97de136 merge in jb-mr1-release history after reset to jb-mr1-dev
086cb4f am c48931f8: Merge "Cancel activity touch handling when zooming" into gb-ub-photos-arches
c48931f Merge "Cancel activity touch handling when zooming" into gb-ub-photos-arches
aeccb7a Cancel activity touch handling when zooming
e8abcc5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3bb262d am 82266bdb: (-s ours) Import translations. DO NOT MERGE
53b28f4 Import translations. DO NOT MERGE
82266bd Import translations. DO NOT MERGE
f6e5e6f am d8a81bc3: Merge "Support flipped pano preview display" into gb-ub-photos-arches
d8a81bc Merge "Support flipped pano preview display" into gb-ub-photos-arches
dc56e54 Support flipped pano preview display
2079485 am 82a8def7: Merge "Fix pie touch handling" into gb-ub-photos-arches
82a8def Merge "Fix pie touch handling" into gb-ub-photos-arches
e3cf61f Fix pie touch handling
e741efe merge in jb-mr1-release history after reset to jb-mr1-dev
55c8bbe merge in jb-mr1-factory-release history after reset to jb-mr1-dev
bf3bbc1 am cd5ab929: Merge "Fix occasional one-way swiping in filmstrip" into gb-ub-photos-arches
80b2c5f am 5ec2790d: Merge "Update display rotation in onOrientationChanged" into gb-ub-photos-arches
0b20d5d merge in jb-mr1-release history after reset to jb-mr1-dev
cd5ab92 Merge "Fix occasional one-way swiping in filmstrip" into gb-ub-photos-arches
5ec2790 Merge "Update display rotation in onOrientationChanged" into gb-ub-photos-arches
3851712 Update display rotation in onOrientationChanged
2136937 am caca1682: Merge "Fixing camera startup tests to use new UI." into gb-ub-photos-arches
caca168 Merge "Fixing camera startup tests to use new UI." into gb-ub-photos-arches
f6b8682 am a5993f9b: Merge "Do a relayout after changing camera frame" into gb-ub-photos-arches
a5993f9 Merge "Do a relayout after changing camera frame" into gb-ub-photos-arches
27e6caa Do a relayout after changing camera frame
d39b793 Fixing camera startup tests to use new UI.
801d4f2 Fix occasional one-way swiping in filmstrip
9c205b8 merge in jb-mr1-release history after reset to jb-mr1-dev
1f9a638 merge in jb-mr1-release history after reset to jb-mr1-dev
d890601 am 1de083f8: Avoid framework shape-cache thrashing in arc drawing
1de083f Avoid framework shape-cache thrashing in arc drawing
db5e8fd am 8a66eb64: Fix menu button in capture mode
8a66eb6 Fix menu button in capture mode
680a09a am add7835a: Merge "Fix NPE if location is changed before camera is opened." into gb-ub-photos-arches
add7835 Merge "Fix NPE if location is changed before camera is opened." into gb-ub-photos-arches
b6a9f3f am ccb15d3a: Merge "Fix review buttons alignment issue" into gb-ub-photos-arches
ccb15d3 Merge "Fix review buttons alignment issue" into gb-ub-photos-arches
1b65e08 am 5c5e82ba: Merge "Fix pie after config change" into gb-ub-photos-arches
5c5e82b Merge "Fix pie after config change" into gb-ub-photos-arches
79a060e Fix review buttons alignment issue
6f54ad9 Fix pie after config change
86bee18 am 4de11f3b: Lock orientation when stitching is in process
4de11f3 Lock orientation when stitching is in process
b55cf3e merge in jb-mr1-release history after reset to jb-mr1-dev
eebbf30 Fix NPE if location is changed before camera is opened.
ac6c248 am c5777bb0: Show review UI for image capture intent.
c5777bb Show review UI for image capture intent.
18cbdd8 am dc37f053: Align menu button and indicators
dc37f05 Align menu button and indicators
765018a am 295c3f89: Hide indicators when reviewing captured image
295c3f8 Hide indicators when reviewing captured image
94bdc87 am b27064ec: Merge "Fix face detection circles" into gb-ub-photos-arches
b27064e Merge "Fix face detection circles" into gb-ub-photos-arches
b5b227a am d1dccd2e: Only PhotoModule should use two-part animation
41d49f0 Fix face detection circles
3b0c391 Hide face detection circles while menu is open
d1dccd2 Only PhotoModule should use two-part animation
0afea18 am 07a3cd25: Merge "Expand old pano preview" into gb-ub-photos-arches
07a3cd2 Merge "Expand old pano preview" into gb-ub-photos-arches
a3676de am 561af393: Hide pie render on switcher popup
561af39 Hide pie render on switcher popup
13a5877 am 70d41293: Split flash & slide animation into two pieces
7a04f3c Expand old pano preview
70d4129 Split flash & slide animation into two pieces
e9366b3 am c9512090: Merge "Use framework orientation" into gb-ub-photos-arches
c951209 Merge "Use framework orientation" into gb-ub-photos-arches
032dea1 Use framework orientation
d368eee am 07702a3e: Merge "Have menu pick the correct assets" into gb-ub-photos-arches
07702a3 Merge "Have menu pick the correct assets" into gb-ub-photos-arches
00e2734 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1f59259 am 6c5b2f05: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
6c5b2f0 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
74db319 Have menu pick the correct assets
9128093 am 6342be38: Start front/back animation from fullscreen
3b5f595 Import translations. DO NOT MERGE
4e5c941 Import translations. DO NOT MERGE
6342be3 Start front/back animation from fullscreen
c52e839 am fd187ac6: Back key dismisses menu
fd187ac Back key dismisses menu
e64229a am 5e5c154c: Merge "Hide face detection circles while menu is open" into gb-ub-photos-arches
5e5c154 Merge "Hide face detection circles while menu is open" into gb-ub-photos-arches
4bde828 am 9d91b995: Merge "Hide Camera UI in film strip" into gb-ub-photos-arches
9d91b99 Merge "Hide Camera UI in film strip" into gb-ub-photos-arches
8dbb2a6 Hide face detection circles while menu is open
d22f668 am 9010cd6d: Merge "Hide switcher during video recording" into gb-ub-photos-arches
9010cd6 Merge "Hide switcher during video recording" into gb-ub-photos-arches
812fcbc Hide Camera UI in film strip
359c59c merge in jb-mr1-release history after reset to jb-mr1-dev
5aa515d am 21bb0682: Changing Lightcyle to photosphere panorama in accessibility
db3148c am f74f3941: Merge "Add content description for accessibity in camera" into gb-ub-photos-arches
2036037 merge in jb-mr1-release history after reset to jb-mr1-dev
cefc9f8 merge in jb-mr1-release history after reset to jb-mr1-dev
21bb068 Changing Lightcyle to photosphere panorama in accessibility
f74f394 Merge "Add content description for accessibity in camera" into gb-ub-photos-arches
d9a3694 Add content description for accessibity in camera
46b602f Hide switcher during video recording
17c2abc am 5a2674d2: Merge "Make time lapse show time interval with correct units" into gb-ub-photos-arches
5a2674d Merge "Make time lapse show time interval with correct units" into gb-ub-photos-arches
8afac93 am 04594c35: Merge "Don\'t reuse the screen nail from LightCycle\'s capture." into gb-ub-photos-arches
04594c3 Merge "Don't reuse the screen nail from LightCycle's capture." into gb-ub-photos-arches
e139408 Make time lapse show time interval with correct units
9a4b58d Don't reuse the screen nail from LightCycle's capture.
f998d67 am 2b2e0831: Hold menu selection for 300 ms
2b2e083 Hold menu selection for 300 ms
a4326f0 am 8e6490c7: Only show HDR menu option if it is supported
72d6f08 am 1293ddd1: Merge "Fade in menu" into gb-ub-photos-arches
20c556a am dfea3e5f: Merge "Add HDR support to menu" into gb-ub-photos-arches
f82a053 am b9a25e6e: Merge "Remove early initialization of switcher popup" into gb-ub-photos-arches
721b507 am 46aaf6cd: Fix camera crash in JB MR0.
90c2714 am 92447c2d: Merge "Keep the camera when switching modules." into gb-ub-photos-arches
ae4ca30 am 4f146348: Remove separator line
5d46908 am 19aa40f8: Merge "Change menu button to indicators" into gb-ub-photos-arches
2ab5ccc am 1f6fd1f2: Don\'t play capture animation until onPicture callback
09942fb am e3a8e523: Merge "Animate the view switcher popup" into gb-ub-photos-arches
2facf7a am 449badb7: Update photo and video menu
759ec0b am da04f24a: New assets
e5ff827 am 065aeb6d: Merge "Show menu when menu button is clicked" into gb-ub-photos-arches
2508b55 am e8683798: Merge "Add enableShutterSound method to CameraProxy." into gb-ub-photos-arches
51280e8 am 9aea5402: Merge "Remove "Restore defaults" option from camera and video camera" into gb-ub-photos-arches
35cc17e am a1014bf8: Merge "Make time lapse dialog wider" into gb-ub-photos-arches
ebe34f2 am 69853ec0: Hide menu during video recording
8e6490c Only show HDR menu option if it is supported
1293ddd Merge "Fade in menu" into gb-ub-photos-arches
1a9a41b Fade in menu
dfea3e5 Merge "Add HDR support to menu" into gb-ub-photos-arches
b9a25e6 Merge "Remove early initialization of switcher popup" into gb-ub-photos-arches
66cccc0 Remove early initialization of switcher popup
e1fa254 Add HDR support to menu
b385a08 merge in jb-mr1-release history after reset to jb-mr1-dev
46aaf6c Fix camera crash in JB MR0.
92447c2 Merge "Keep the camera when switching modules." into gb-ub-photos-arches
4f14634 Remove separator line
19aa40f Merge "Change menu button to indicators" into gb-ub-photos-arches
1a753f5 Change menu button to indicators
1f6fd1f Don't play capture animation until onPicture callback
e3a8e52 Merge "Animate the view switcher popup" into gb-ub-photos-arches
ecf756f Animate the view switcher popup
449badb Update photo and video menu
da04f24 New assets
065aeb6 Merge "Show menu when menu button is clicked" into gb-ub-photos-arches
e868379 Merge "Add enableShutterSound method to CameraProxy." into gb-ub-photos-arches
9aea540 Merge "Remove "Restore defaults" option from camera and video camera" into gb-ub-photos-arches
d028bb0 Show menu when menu button is clicked
a1014bf Merge "Make time lapse dialog wider" into gb-ub-photos-arches
c0c5d69 Add enableShutterSound method to CameraProxy.
69853ec Hide menu during video recording
57abb9e Remove "Restore defaults" option from camera and video camera
acc0772 Make time lapse dialog wider
9dc260a am 839557ce: Merge "Add filtering to face detection state changes" into gb-ub-photos-arches
839557c Merge "Add filtering to face detection state changes" into gb-ub-photos-arches
9a55781 Don't take picture while autofocus is not finished
3a73112 am 349870d1: Merge "Gray out the flash setting when a scene other than Auto is selected" into gb-ub-photos-arches
349870d Merge "Gray out the flash setting when a scene other than Auto is selected" into gb-ub-photos-arches
3cccc4e Gray out the flash setting when a scene other than Auto is selected
446ac94 am f48f2f73: Merge "Hide separator line in Filmstrip" into gb-ub-photos-arches
f48f2f7 Merge "Hide separator line in Filmstrip" into gb-ub-photos-arches
630d255 Add filtering to face detection state changes
dc752de Hide separator line in Filmstrip
6bb8204 am 1a140840: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
540796b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1a14084 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
598ccc6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
21ddcaf am fe44832a: Don\'t take picture while autofocus is not finished
fe44832 Don't take picture while autofocus is not finished
9e33819 am 73f96311: Merge "Disable white balance when scene mode is non-auto" into gb-ub-photos-arches
73f9631 Merge "Disable white balance when scene mode is non-auto" into gb-ub-photos-arches
0457dc4 Import translations. DO NOT MERGE
b77a447 Import translations. DO NOT MERGE
4625e03 Fix menu layout after orientation change Remove dots around focus ring
276b990 Raise Monkey shield
1a5fe96 am 2f662da5: Merge "Fix menu layout after orientation change Remove dots around focus ring" into gb-ub-photos-arches
2f662da Merge "Fix menu layout after orientation change Remove dots around focus ring" into gb-ub-photos-arches
ccd32df Disable white balance when scene mode is non-auto
c02cfe3 am 8215df9f: (-s ours) Import translations. DO NOT MERGE
52bef1e Import translations. DO NOT MERGE
8215df9 Import translations. DO NOT MERGE
16f9b35 Fix menu layout after orientation change Remove dots around focus ring
487c884 am 80e86649: Merge "Fix Gallery swipe UI" into gb-ub-photos-arches
80e8664 Merge "Fix Gallery swipe UI" into gb-ub-photos-arches
84a0709 am 9667bf4a: Raise Monkey shield
89fd143 Fix Gallery swipe UI
9667bf4 Raise Monkey shield
b53be68 merge in jb-mr1-release history after reset to jb-mr1-dev
7dbee4b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
00e0008 am 459c65a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
459c65a Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
3b4933e Blank out image capture after animation has started.
edca489 Change order of cameras in camera switcher
a010841 Adding accessor methods for latency vars and fixing camera latency tests.
180fb98 Log for debugging runtime exception taking picture
78e0258 am 713a8d32: Merge "Blank out image capture after animation has started." into gb-ub-photos-arches
713a8d3 Merge "Blank out image capture after animation has started." into gb-ub-photos-arches
999ed95 am ce2d4ff8: Merge "Change order of cameras in camera switcher" into gb-ub-photos-arches
ce2d4ff Merge "Change order of cameras in camera switcher" into gb-ub-photos-arches
b1be74d Change order of cameras in camera switcher
a434b75 am 0e98d5db: Merge "Adding accessor methods for latency vars and fixing camera latency tests." into gb-ub-photos-arches
0e98d5d Merge "Adding accessor methods for latency vars and fixing camera latency tests." into gb-ub-photos-arches
bd024b9 Import translations. DO NOT MERGE
9f0a3bb am 15e6bb55: Merge "Log for debugging runtime exception taking picture" into gb-ub-photos-arches
503ec45 Import translations. DO NOT MERGE
15e6bb5 Merge "Log for debugging runtime exception taking picture" into gb-ub-photos-arches
dd5a6f9 Log for debugging runtime exception taking picture
d282a28 Blank out image capture after animation has started.
39ba698 merge in jb-mr1-release history after reset to jb-mr1-dev
6f236b1 Don't switch module if the activity is paused.
c5c4ddc Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
73969ce am 640ceff2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
640ceff Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
0dacad5 am 19b1c444: Change video quality notation in settings
19b1c44 Change video quality notation in settings
8e56d15 am c0f19dfc: Merge "Fix corrupt panorama UI after orientation change." into gb-ub-photos-arches
c0f19df Merge "Fix corrupt panorama UI after orientation change." into gb-ub-photos-arches
6c80b4d am f0469206: Adding second-level popup for camera settings
cc70630 Import translations. DO NOT MERGE
81ef48f Import translations. DO NOT MERGE
f046920 Adding second-level popup for camera settings
2adfc9c Hide event blocker when hiding switcher
30eafc9 Remove menu fade at beginning
48bf007 Add logs for debugging runtime exception taking picture
281972d Hide menu when button is pressed second time
bb82c37 A regression in VideoModule
995b955 Don't draw menu items on tap to focus
2df873e Completely redo UI
a4128e0 Don't allow swipe to menu during video recording
806e575 Adding accessor methods for latency vars and fixing camera latency tests.
3e2973e am 019cd2a9: Hide event blocker when hiding switcher
019cd2a Hide event blocker when hiding switcher
5ea2d73 am 63e79531: Remove menu fade at beginning
63e7953 Remove menu fade at beginning
9ee9a24 am 22135091: Merge "Change LightCycle assets." into gb-ub-photos-arches
2213509 Merge "Change LightCycle assets." into gb-ub-photos-arches
a656da7 am 71d90387: Merge "Add logs for debugging runtime exception taking picture" into gb-ub-photos-arches
71d9038 Merge "Add logs for debugging runtime exception taking picture" into gb-ub-photos-arches
15e6cbf am d560a87e: Hide menu when button is pressed second time
d560a87 Hide menu when button is pressed second time
5c7a93d Add logs for debugging runtime exception taking picture
115c1fb am 92cdbe67: Merge "A regression in VideoModule" into gb-ub-photos-arches
92cdbe6 Merge "A regression in VideoModule" into gb-ub-photos-arches
9d51864 Change LightCycle assets.
f046226 A regression in VideoModule
ebe841c am b1b7574b: Don\'t draw menu items on tap to focus
b1b7574 Don't draw menu items on tap to focus
c0904a7 am 876aade7: Merge "Completely redo UI" into gb-ub-photos-arches
876aade Merge "Completely redo UI" into gb-ub-photos-arches
1305baf am d2025741: Don\'t allow swipe to menu during video recording
d202574 Don't allow swipe to menu during video recording
a5e23d9 Completely redo UI
a7ea182 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e938baa am d231988e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
d231988 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
4f90542 merge in jb-mr1-release history after reset to jb-mr1-dev
3125574 Fix corrupt panorama UI after orientation change.
f33fc45 Add log to debug the double-open bug 6829498.
d6ccdf0 am f99fd501: Fix thread anti-pattern.
f99fd50 Fix thread anti-pattern.
093a382 am 3155f08e: Merge "Fix NPE in focus indicator update" into gb-ub-photos-arches
3155f08 Merge "Fix NPE in focus indicator update" into gb-ub-photos-arches
882a34f am 0185ee64: Merge "Enable tapping on menu" into gb-ub-photos-arches
0185ee6 Merge "Enable tapping on menu" into gb-ub-photos-arches
10b189f am d95f2b5b: Camera button intent should launch new UI.
d95f2b5 Camera button intent should launch new UI.
5aaa173 am 75d08dd0: Merge "Add setPreviewCallback in CameraProxy." into gb-ub-photos-arches
75d08dd Merge "Add setPreviewCallback in CameraProxy." into gb-ub-photos-arches
5542399 am f46fea16: Merge "Fix ANR in VideoModule.getThumbnail." into gb-ub-photos-arches
f46fea1 Merge "Fix ANR in VideoModule.getThumbnail." into gb-ub-photos-arches
31596f6 am a2c44407: Fix issues for reset-to-default dialog box
a2c4440 Fix issues for reset-to-default dialog box
a19abf2 Fix NPE in focus indicator update
55f0d13 Enable tapping on menu
c719cc0 Fix Monkey NPE
e183cc9 Make Monkeys happy.
f6630c8 am 3ae48a61: Merge "Only move one module on fling" into gb-ub-photos-arches
3ae48a6 Merge "Only move one module on fling" into gb-ub-photos-arches
cdab4a4 am 0c6cca88: Ensure ScreenNail orientation matches LightCycle draw orientation.
1da1885 Only move one module on fling
0c6cca8 Ensure ScreenNail orientation matches LightCycle draw orientation.
bd5eb12 Import translations. DO NOT MERGE
c8989c7 Import translations. DO NOT MERGE
ab8227f am ea7e3512: Merge "Fix Monkey NPE" into gb-ub-photos-arches
ea7e351 Merge "Fix Monkey NPE" into gb-ub-photos-arches
8688903 am 1b2443e3: Merge "Enable swipe to Gallery in LightCycleView." into gb-ub-photos-arches
1b2443e Merge "Enable swipe to Gallery in LightCycleView." into gb-ub-photos-arches
242e191 am ba7bb98f: Work around scale end/begin on move events
ba7bb98 Work around scale end/begin on move events
2ff430a Fix Monkey NPE
1acc316 Fix ANR in VideoModule.getThumbnail.
9a7734b am ba6a3559: Make Monkeys happy.
ba6a355 Make Monkeys happy.
6362b89 merge in jb-mr1-release history after reset to jb-mr1-dev
7433f98 Keep the camera when switching modules.
7e790a5 Add setPreviewCallback in CameraProxy.
d247e0e am ad30bda0: Put HDR as a separate setting in the overflow settings dialog.
5134413 am 999eb5f1: Prevent menu and zoom showing at the same time
67177a7 am 673da081: Focus ring UX changes
898f798 am 9147e9e5: Merge "Switch to zoom mode when zoom gesture starts" into gb-ub-photos-arches
34e7758 am b1f79856: Don\'t play sound on focus
ad30bda Put HDR as a separate setting in the overflow settings dialog.
999eb5f Prevent menu and zoom showing at the same time
673da08 Focus ring UX changes
9147e9e Merge "Switch to zoom mode when zoom gesture starts" into gb-ub-photos-arches
e506ca4 Switch to zoom mode when zoom gesture starts
b1f7985 Don't play sound on focus
e14d914 Enable swipe to Gallery in LightCycleView.
61caccc am f1f3d8f5: Add first run setup for location preference
f1f3d8f Add first run setup for location preference
f857581 Verify we are receiving a callback for the current ST
ce67c60 am 9a6a288c: Merge "Verify we are receiving a callback for the current ST" into gb-ub-photos-arches
9a6a288 Merge "Verify we are receiving a callback for the current ST" into gb-ub-photos-arches
a759660 Verify we are receiving a callback for the current ST
8b8e021 am 9dea0f8c: Use capture animation for video snapshot
9dea0f8 Use capture animation for video snapshot
2605b72 am f7a3cc7b: Merge "Fix focus ring size" into gb-ub-photos-arches
f7a3cc7 Merge "Fix focus ring size" into gb-ub-photos-arches
eede360 Fix focus ring size
8cbaf85 am f39357a1: Enable swipe gestures for radial menu
f39357a Enable swipe gestures for radial menu
13f06e6 merge in jb-mr1-release history after reset to jb-mr1-dev
16f6809 am bc918cd8: Merge "Remove camera settings title" into gb-ub-photos-arches
bc918cd Merge "Remove camera settings title" into gb-ub-photos-arches
d15a6af am 1aea23b7: Further restricting the size of the pano preview
8b09d7c merge in jb-mr1-release history after reset to jb-mr1-dev
1aea23b Further restricting the size of the pano preview
5488457 am 156ffb09: Merge "Show menu for longer" into gb-ub-photos-arches
156ffb0 Merge "Show menu for longer" into gb-ub-photos-arches
acf17e0 am 965091bc: Resizing old pano preview
965091b Resizing old pano preview
b986d1e Show menu for longer
208ed24 am c367b15e: Merge "Fix zoom renderer ui" into gb-ub-photos-arches
c367b15 Merge "Fix zoom renderer ui" into gb-ub-photos-arches
f53e17b am ba2d8301: Merge "Fix settings popup orientation issue" into gb-ub-photos-arches
ba2d830 Merge "Fix settings popup orientation issue" into gb-ub-photos-arches
0f1cc66 Fix zoom renderer ui
cef0654 am 3ffcb0cb: Merge "Completely disable focus callbacks when leaving preview" into gb-ub-photos-arches
3ffcb0c Merge "Completely disable focus callbacks when leaving preview" into gb-ub-photos-arches
3ce75c9 Fix settings popup orientation issue
82ee836 Completely disable focus callbacks when leaving preview
53d9391 am 09c86199: Merge "Set switcher position directly to start module" into gb-ub-photos-arches
09c8619 Merge "Set switcher position directly to start module" into gb-ub-photos-arches
171cdb6 am 1a52c53f: Merge "Fix NPE in PreviewGestures" into gb-ub-photos-arches
1a52c53 Merge "Fix NPE in PreviewGestures" into gb-ub-photos-arches
9aca4d7 Set switcher position directly to start module
b30f0c4 Fix NPE in PreviewGestures
1155dee am e5b482c0: Merge "Make sure settings dialog gets initialized" into gb-ub-photos-arches
e5b482c Merge "Make sure settings dialog gets initialized" into gb-ub-photos-arches
60d33a6 am db31f0e5: Merge "Show camera switcher after pano stitching is finished" into gb-ub-photos-arches
db31f0e Merge "Show camera switcher after pano stitching is finished" into gb-ub-photos-arches
b006b2c am b69cbda2: Fix initializing FocusOverlayManager in onConfigurationChanged
64f517b Remove camera settings title
aaf2767 Make sure settings dialog gets initialized
4e3720e merge in jb-mr1-release history after reset to jb-mr1-dev
b69cbda Fix initializing FocusOverlayManager in onConfigurationChanged
725aec5 Show camera switcher after pano stitching is finished
2566da0 am 471c997e: Fix creating the RenderOverlay in onConfigurationChanged
471c997 Fix creating the RenderOverlay in onConfigurationChanged
abcccf3 am 78711c99: Rotate camera modes icons when phone is rotated
78711c9 Rotate camera modes icons when phone is rotated
e4dd848 Change pie highlight color
8989a26 Add renderers again after config change
eff3c5b Fix swipe to Gallery in different orientations
aa195ba am aded2c9d: Merge "Change pie highlight color" into gb-ub-photos-arches
aded2c9 Merge "Change pie highlight color" into gb-ub-photos-arches
e7ff2e9 Change pie highlight color
d9c5b03 am a82ad5a2: Add renderers again after config change
a82ad5a Add renderers again after config change
3be8759 am 72fb3f0e: Merge "Fix swipe to Gallery in different orientations" into gb-ub-photos-arches
72fb3f0 Merge "Fix swipe to Gallery in different orientations" into gb-ub-photos-arches
c0a5a85 am be6766c8: Adjust margin on shutter overlay
1cf29b9 Fix swipe to Gallery in different orientations
be6766c Adjust margin on shutter overlay
090412a merge in jb-mr1-release history after reset to jb-mr1-dev
18bded7 Move divider line behind shutter
0dd6ee9 Adjust capture animation to fullscreen
4a0cb63 Asset drop and layout adjustments
1674401 Enable full screen preview
90e1d89 am bbcc1211: Move divider line behind shutter
bbcc121 Move divider line behind shutter
71be123 am ac575473: Adjust capture animation to fullscreen
ac57547 Adjust capture animation to fullscreen
68c9a29 am d867ac51: Asset drop and layout adjustments
d867ac5 Asset drop and layout adjustments
c634223 am 9713c56d: Enable full screen preview
9713c56 Enable full screen preview
3f4a6de am 5b51a141: Merge "Fix focus ring on first tap" into gb-ub-photos-arches
5b51a14 Merge "Fix focus ring on first tap" into gb-ub-photos-arches
b8c5a15 Fix focus ring on first tap
88ca542 am 64d5cda1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
64d5cda Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
69fb896 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
04c12fe merge in jb-mr1-release history after reset to jb-mr1-dev
1c01f0a am 240babb4: Merge "Re-enable touch after video recording" into gb-ub-photos-arches
240babb Merge "Re-enable touch after video recording" into gb-ub-photos-arches
42e5d98 Re-enable touch after video recording
78205d9 am dc342415: Merge "Keep Camera buttons at the same absolute position" into gb-ub-photos-arches
dc34241 Merge "Keep Camera buttons at the same absolute position" into gb-ub-photos-arches
039211f am 3d8df287: Merge "Adjust capture animation" into gb-ub-photos-arches
3d8df28 Merge "Adjust capture animation" into gb-ub-photos-arches
bcaf81f Keep Camera buttons at the same absolute position
6f51b6d Adjust capture animation
d8b9bd2 am c6c417b6: Merge "Revert "Keep Camera buttons at the same absolute position"" into gb-ub-photos-arches
c6c417b Merge "Revert "Keep Camera buttons at the same absolute position"" into gb-ub-photos-arches
ccfae4f Revert "Keep Camera buttons at the same absolute position"
81b227f am 55c6500b: Merge "Keep Camera buttons at the same absolute position" into gb-ub-photos-arches
55c6500 Merge "Keep Camera buttons at the same absolute position" into gb-ub-photos-arches
2caab34 am 9d8583fc: Update other settings popup when prefs change
9d8583f Update other settings popup when prefs change
5b8dcdd Keep Camera buttons at the same absolute position
a17c754 am 3ea46729: Merge "Briefly show pie items when tap to focus, dots for cont AF" into gb-ub-photos-arches
3ea4672 Merge "Briefly show pie items when tap to focus, dots for cont AF" into gb-ub-photos-arches
22c838d am 8dd9204b: Merge "Play animation before switching modes" into gb-ub-photos-arches
8dd9204 Merge "Play animation before switching modes" into gb-ub-photos-arches
a0dd522 Briefly show pie items when tap to focus, dots for cont AF
6c14557 Play animation before switching modes
5417b49 Import translations. DO NOT MERGE
6ef0ee6 Import translations. DO NOT MERGE
85b0f1e Fix Monkey NPE
978cc25 Merge focus ring and radial menu
7f9f6d2 am 8433d827: Change capture animation to a simple hold & slide.
8433d82 Change capture animation to a simple hold & slide.
582cdfa am 1404be91: Fix Monkey NPE
1404be9 Fix Monkey NPE
56d8166 am fef6bda3: Merge "Merge focus ring and radial menu" into gb-ub-photos-arches
fef6bda Merge "Merge focus ring and radial menu" into gb-ub-photos-arches
8042e70 Merge focus ring and radial menu
59cade5 merge in jb-mr1-release history after reset to jb-mr1-dev
d0c4bbb am 60daa339: Merge "Update the camera stress test to use the new UI." into gb-ub-photos-arches
60daa33 Merge "Update the camera stress test to use the new UI." into gb-ub-photos-arches
bb04bc5 Update the camera stress test to use the new UI.
61fe918 Fix focus touch and enable buttons
f2d9ceb am 2d7a31b0: Merge "Fix focus touch and enable buttons" into gb-ub-photos-arches
7624960 am 8afe041f: Merge "Making back button exit camera" into gb-ub-photos-arches
2d7a31b Merge "Fix focus touch and enable buttons" into gb-ub-photos-arches
8afe041 Merge "Making back button exit camera" into gb-ub-photos-arches
01da3fb am d8f22f1e: Merge "Revert "Update launcher icons."" into gb-ub-photos-arches
d8f22f1 Merge "Revert "Update launcher icons."" into gb-ub-photos-arches
fcaf57c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
571a6f8 Fix focus touch and enable buttons
9adf458 am c38dbeb0: (-s ours) Import translations. DO NOT MERGE
ae29298 Revert "Update launcher icons."
a349059 Import translations. DO NOT MERGE
c38dbeb Import translations. DO NOT MERGE
091a2b0 merge in jb-mr1-release history after reset to jb-mr1-dev
1e86ef7 am 13b28266: Merge "Fix background replacement crash in jelly-bean." into gb-ub-photos-arches
13b2826 Merge "Fix background replacement crash in jelly-bean." into gb-ub-photos-arches
02b33f1 Fix background replacement crash in jelly-bean.
f452b5c am 696abdc5: Merge "Briefly show and fade out menu at start" into gb-ub-photos-arches
696abdc Merge "Briefly show and fade out menu at start" into gb-ub-photos-arches
c605826 Briefly show and fade out menu at start
bef6746 am 53b11253: Show correct UI in secure image capture mode.
53b1125 Show correct UI in secure image capture mode.
9ac720e am ad639dff: Remove unnecessary invalidate calls in renderers
ad639df Remove unnecessary invalidate calls in renderers
af21a3d am a5212532: Fine tuning radial menu / touch
a521253 Fine tuning radial menu / touch
60c32bc am 64f033ef: Handle swipe gesture in PreviewGestures
64f033e Handle swipe gesture in PreviewGestures
7d0d165 am 7a6696db: Touch handling cleanup.
7a6696d Touch handling cleanup.
e005780 am cdf48f39: Merge "Enable zoom in new UI" into gb-ub-photos-arches
33f6171 merge in jb-mr1-release history after reset to jb-mr1-dev
6320ec3 Cherry-pick of 4d628bc from unbundled photos-arches branch
cdf48f3 Merge "Enable zoom in new UI" into gb-ub-photos-arches
4d628bc Enable zoom in new UI
8e887b3 Making back button exit camera
1e378cd merge in jb-mr1-release history after reset to jb-mr1-dev
975474e am b52b131e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
7c4ab05 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b52b131 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
5813f31 am 0e84832a: Merge "Use circles for face detection" into gb-ub-photos-arches
c1092d8 am b51975aa: Merge "Fix for camera switcher stuck in the middle" into gb-ub-photos-arches
0e84832 Merge "Use circles for face detection" into gb-ub-photos-arches
b51975a Merge "Fix for camera switcher stuck in the middle" into gb-ub-photos-arches
ad473ad Fix for camera switcher stuck in the middle
2024a48 Import translations. DO NOT MERGE
85407e9 Import translations. DO NOT MERGE
918c02e Use circles for face detection
a86219d am c3bba50f: Merge "Fix back button behavior in image capture mode" into gb-ub-photos-arches
6c56889 am ce51afce: Add the support for secure image capture intent.
c3bba50 Merge "Fix back button behavior in image capture mode" into gb-ub-photos-arches
6c68ca7 am 7086e310: (-s ours) Reconcile with jb-release - do not merge
f20d682 am eb9455b0: Merge from AOSP
f28f826 am 08f89b72: (-s ours) Reconcile with jb-mr0-release - do not merge
1e4bf02 am 1ac70a0c: (-s ours) am 16687a1f: Import translations. DO NOT MERGE
b574a5c am a3799ba4: (-s ours) Reconcile with jb-release - do not merge
698419e am 6b9784d4: Reconcile with jb-release
3d9290b am a93501ad: Reconcile with jb-mr0-release
566b95c am 5fc4bd7f: am d97a4ef4: Fix the crash when choosing pick your video in effects recording.
e9b9489 merge in jb-mr1-release history after reset to jb-mr1-dev
ce51afc Add the support for secure image capture intent.
0cf8d88 Merge remote-tracking branch 'goog/gb-ub-photos-arches' into jb-mr1-dev
c78f050 Fix back button behavior in image capture mode
fdb79c4 Asset update for shutter; fix for capture
7c28bd1 Add VideoController to VideoModule
79292f5 Import translations. DO NOT MERGE
bed5dab Import translations. DO NOT MERGE
4fbacb3 Merge "Add VideoController to VideoModule" into gb-ub-photos-arches
cab4e37 merge in jb-mr1-release history after reset to jb-mr1-dev
7717d2f Reduce latency when camera is started from secure lock screen.
33af079 Add VideoController to VideoModule
9a98393 Merge "Revert: Do not let recent apps capture camera screen shots." into gb-ub-photos-arches
5162b3d Merge "Fix record button issue in ICS on HTC Sensation." into gb-ub-photos-arches
b1e8722 Fix record button issue in ICS on HTC Sensation.
57146db Merge "Add other settings popup to menu" into gb-ub-photos-arches
2d3af28 Add other settings popup to menu
4acd81d Import translations. DO NOT MERGE
920241b Import translations. DO NOT MERGE
9f8b479 Fix back button anomaly when menu is opened
486620f reset jb-mr1-dev branch to photos-a branch
30abd4e Fix shutter in capture mode
ec2e215 merge in jb-mr1-release history after reset to jb-mr1-dev
0f78c88 Revert: Do not let recent apps capture camera screen shots.
b209d43 Merge "Another attempt at fixing switcher/shutter interaction" into gb-ub-photos-arches
6be9dc9 Merge "Sanity check focus areas. Again." into gb-ub-photos-arches
51671bf Sanity check focus areas. Again.
8566e6d Another attempt at fixing switcher/shutter interaction
4e95086 Merge "Adjust videoModule layout for configuration changes" into gb-ub-photos-arches
b2bdc1e Adjust videoModule layout for configuration changes
b5b59b8 Position pie options
3ac354d merge in jb-mr1-release history after reset to jb-mr1-dev
652ba2f Merge "Add an activity for secure camera." into gb-ub-photos-arches
623cb33 Fixed switch text cutoff for greek language option.
08e6457 Prevent NPE in touch handler
59ac247 Import translations. DO NOT MERGE
230d043 Merge "Use correct focus area size" into gb-ub-photos-arches
15e0d3b Prevent NPE in touch handler
112868c Use correct focus area size
75f5427 Wait for Focus manager initialized
ba01e4b Merge "Dispatch touch events to activity, not views" into gb-ub-photos-arches
93a81ca merge in jb-mr1-release history after reset to jb-mr1-dev
318c560 Add an activity for secure camera.
5da800f Dispatch touch events to activity, not views
435a730 Adding support in new camera for video capture
14a1d98 merge in jb-mr1-release history after reset to jb-mr1-dev
9ab8771 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
256f692 merge in jb-mr1-release history after reset to jb-mr1-dev
1afe0c0 Merge "Add new radial menu for camera" into gb-ub-photos-arches
1373b98 Add new radial menu for camera
b232fdf Merge "Hook up the shutter button to lightcycle "done"" into gb-ub-photos-arches
dabd96c Import translations. DO NOT MERGE
90ef46f Support capture intent
cfbf201 Hook up the shutter button to lightcycle "done"
8b36f8a Merge "Launch in video mode if started with video camera intent." into gb-ub-photos-arches
7d912c1 merge in jb-mr1-release history after reset to jb-mr1-dev
b205350 Launch in video mode if started with video camera intent.
20afe02 Import translations. DO NOT MERGE
ce2cd28 merge in jb-mr1-release history after reset to jb-mr1-dev
01725fa Merge "Avoid sending messages if the activity is finishing." into gb-ub-photos-arches
7114364 Fix shutter button
38a6c24 Fix focus touch coordinates & NPE
1ef31b2 merge in jb-mr1-release history after reset to jb-mr1-dev
fe26990 Avoid sending messages if the activity is finishing.
ad2031c Hide switcher UI when sliding to Gallery
9f846cf Update shutter for panorama
230a477 Merge "Change LightCycle switcher icon so that you can differentiate it." into gb-ub-photos-arches
e26b8a8d Change LightCycle switcher icon so that you can differentiate it.
9bcfa57 Remove video controls form new UI
8bcec4f Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
566f11c New shutter button
b6a6109 Fix new camera switcher
00fea1c Separate build for AOSP and Google panorama modules.
c48ebd9 merge in jb-mr1-release history after reset to jb-mr1-dev
ce1d839 Add old panorama module
629eb38 Merge "New scroll view for camera switcher (horizontal/vertical)" into gb-ub-photos-arches
df0dca9 New scroll view for camera switcher (horizontal/vertical)
d792fee Import translations. DO NOT MERGE
b2bb00c merge in jb-mr1-release history after reset to jb-mr1-dev
b19c713 Adding render overlay and focus indicator
d3a252b New Camera UI
f584011 Merge "Do not load the thumbnail in secure camera mode." into gb-ub-photos-arches
c1f6c07 Do not load the thumbnail in secure camera mode.
bf55b0f Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
7086e31 Reconcile with jb-release - do not merge
028cb77 merge in jb-mr1-release history after reset to jb-mr1-dev
5cb1596 Merge "Fix close button in portrait orientation on Gingerbread." into gb-ub-photos-arches
8b7d02a Fix close button in portrait orientation on Gingerbread.
d80b2cd Finish the activity when screen turns off in secure mode.
3ddad2b Clear mParameters reference in CameraManager.
68f342f Change lightcycle call to be in Gallery's package
4f709c5 Import translations. DO NOT MERGE
c74adc1 Merge "Update LightCycleHelper path." into gb-ub-photos-arches
40a379d Update LightCycleHelper path.
279eb93 merge in jb-mr1-release history after reset to jb-mr1-dev
59585c8 Filter out faces with confidence value < 50.
3984a81 New UI for time lapse video interval selection.
adb4dc6 merge in jb-mr1-release history after reset to jb-mr1-dev
a3a675e Merge "Change HDR to a scene mode." into gb-ub-photos-arches
39a796b Change HDR to a scene mode.
27948cf Merge "Fix camera cannot be started from secure lock screen." into gb-ub-photos-arches
d9d5d0e Merge "Do not use FLAG_SECURE on Gingerbread." into gb-ub-photos-arches
507cbf2 Do not use FLAG_SECURE on Gingerbread.
a69fb3e Fix camera cannot be started from secure lock screen.
9043b74 Import translations. DO NOT MERGE
b5f8789 merge in jb-release history after reset to jb-dev
f53b8f9 merge in jb-release history after reset to jb-dev
e4f8ead merge in jb-mr1-release history after reset to jb-mr1-dev

   * packages/apps/CellBroadcastReceiver
2ebc9dd CB: NL translations
4491b76 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/CellBroadcastReceiver into 1.1
ac36d01 Import translations. DO NOT MERGE
a2d3a03 Import translations. DO NOT MERGE
84a0746 Import translations. DO NOT MERGE
8524c0a Enable support for area info cell broadcasts in Brazil.
e47bf83 CellBroadcastReceiver: remove values-nl array.xml derp
3500eda Delay cell broadcast config until modem is ready to handle.
54e5967 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/CellBroadcastReceiver into HEAD
9b97876 Import translations. DO NOT MERGE
4be1ab1 Update CMAS duplicate message detection for carrier requirement.
f46ac5c Import translations. DO NOT MERGE
24cb192 Import translations. DO NOT MERGE
fd29c45 Import translations. DO NOT MERGE
ca429b5 Import translations. DO NOT MERGE
8188f82 Merge "Multiple fixes to CMAS app." into jb-mr1-dev
57273eb Multiple fixes to CMAS app.
6e7e37f Let's enhance
bfc4827 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/CellBroadcastReceiver into aosp-merge
d2869a1 am f1f044dc: (-s ours) Reconcile with jb-release - do not merge
f1f044d Reconcile with jb-release - do not merge
fb35e9d Fix ETWS earthquake alert to vibrate when in silent mode.
c40199d Clean up Global settings stragglers.
0d9423a Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/CellBroadcastReceiver into aosp
53b13c3 am 97260743: (-s ours) am 60425df1: Import translations. DO NOT MERGE
9726074 am 60425df1: Import translations. DO NOT MERGE
cfd9368 Import translations. DO NOT MERGE
60425df Import translations. DO NOT MERGE
5f5b3bd am 8f8925e4: am 68dc486f: Fix ETWS earthquake alert to vibrate when in silent mode.
8f8925e am 68dc486f: Fix ETWS earthquake alert to vibrate when in silent mode.
68dc486 Fix ETWS earthquake alert to vibrate when in silent mode.
717d983 am 4e6bda50: (-s ours) am e397957b: Import translations. DO NOT MERGE
4e6bda5 am e397957b: Import translations. DO NOT MERGE
c8780f6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a2144cb am a0960454: (-s ours) Reconcile with jb-release - do not merge
a096045 Reconcile with jb-release - do not merge
8365081 Import translations. DO NOT MERGE
e397957 Import translations. DO NOT MERGE
cdc26b1 am c48f31d8: (-s ours) am a0a3a5e1: Import translations. DO NOT MERGE
c48f31d am a0a3a5e1: Import translations. DO NOT MERGE
0a2bfb9 Import translations. DO NOT MERGE
a0a3a5e Import translations. DO NOT MERGE
7d78cde am 7d39e558: (-s ours) am 12ec2fe4: Import translations. DO NOT MERGE
7d39e55 am 12ec2fe4: Import translations. DO NOT MERGE
d07c810 Import translations. DO NOT MERGE
12ec2fe Import translations. DO NOT MERGE
6dd7cb1 merge in jb-release history after reset to jb-dev
4189fdb merge in jb-release history after reset to jb-dev

   * packages/apps/CertInstaller
2e1fae1 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/CertInstaller into HEAD
9f3bb68 Czech: revised, fixed strings
e46af36 Import translations. DO NOT MERGE
ad2febc Import translations. DO NOT MERGE
bd212f8 Import translations. DO NOT MERGE
aa06c79 Import translations. DO NOT MERGE
23f8697 Import translations. DO NOT MERGE
1116baa Import translations. DO NOT MERGE
fba4bf9 Do not allow non-primary user to install certs
99b10f5 Tracking upgrade to bouncycastle 1.47

   * packages/apps/Contacts
8e9a5fb Contacts: fixed FI translations
c79f7ad Contacts: FI translations
2586e79 Fix call stats header and empty list text appearing prematurely.
e27e7aa Fix NPE.
3b440a6 Merge "Fix summary header update after filter change." into cm-10.1
b6a352a Contacts: HU Translation
1352cc0 Fix summary header update after filter change.
206b1a4 Merge "Store phone blacklist in content provider (3/4)" into cm-10.1
f5c1132 Merge "Make contacts app aware of phone blacklist setting (3/3)" into cm-10.1
aea3235 Contacts: PT-BR update translations
50e5307 Store phone blacklist in content provider (3/4)
bb9d22d Make contacts app aware of phone blacklist setting (3/3)
4081651 Contacts: zh-rTW translations
85f6f27 Contacts: Update German translation
b5027d8 Merge "Cleanup: Use framework-provided method." into cm-10.1
6a5bdc6 Contacts: NL translation
2cb11d6 Cleanup: Use framework-provided method.
6c88a2e Fix a number of issues with T9 dialer.
07c3032 Contacts: NB translation
106e8e4 Merge "Contacts: AF Translations" into cm-10.1
d88c974 Contacts: AF Translations
e05ec95 Contacts: AF Translations
29e5bec Contacts: NB translation
3f4354b Contact : refactor translation
279c519 Merge "Update German translation." into cm-10.1
b321856 Merge "Contacts: force left justification on separator headers in contact list." into cm-10.1
dd2c475 Merge "Contacts: Refactor RU translation" into cm-10.1
8a248c6 Contacts: force left justification on separator headers in contact list.
c23c932 Merge "Contacts: CS translation" into cm-10.1
5cecdea Contacts: Refactor RU translation
afad327 Merge "Allow blacklisting numbers from the call stats details menu." into cm-10.1
9ec5c0b Update German translation.
2110330 Contacts: CS translation
8b3ede9 Merge "Contacts: ES translations" into cm-10.1
68190a8 Merge "Contacts: EL translations" into cm-10.1
74ff8d8 Merge "Contacts: PT-BR update translations" into cm-10.1
8482073 Merge "Contacts: NL translations" into cm-10.1
ceeddec Merge "Contacts: Refactor AF translations" into cm-10.1
a0a4714 Allow blacklisting numbers from the call stats details menu.
e0c1082 Contacts: EL translations
78870ed Contacts Danish translation: transition to cm_ format
731c150 Contacts: NL translations
abcbe77 Contacts: Refactor default translations
6996a16 Contacts: PT-BR update translations
ba05536 Contacts: ES translations
c250b6e Contacts: Danish translation - blacklist addition (added other strings for completeness)
25a3aad Merge "Contacts: Simplified Chinese Translations" into cm-10.1
5ab2e4a Merge "Contacts : fr translation" into cm-10.1
b4e39af Merge "Contacts: Update italian translation" into cm-10.1
d77f6cd Merge "Contacts: Reorganize Hungarian translations" into cm-10.1
e62c244 Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/packages/apps/Contacts into cm-10.1
7b6314c Contacts: Reorganize Hungarian translations
d1743f8 Contacts: Update italian translation
dc3bbab Contacts: Simplified Chinese Translations
7a9bcf1 Contacts: Refactor AF translations
7f38f3d Contacts : fr translation
b685d63 Merge "Afrikaans: Fix spelling mistake" into cm-10.1
39c74cd Merge "Contacts: RU translations" into cm-10.1
8ead057 Merge "Contacts: Update Polish translation" into cm-10.1
513c7eb Contacts: ES translations
1007d56 Contacts: Update Polish translation
b70bbf0 Merge "PT-BR: Update translation" into cm-10.1
23dfd21 Merge "Contacts: NL translations" into cm-10.1
1e0e1c4 PT-BR: Update translation
52544fc Contacts: RU translations
10bd31b Merge "Contacts: Add support for Blacklist" into cm-10.1
4a7d04a Afrikaans: Fix spelling mistake
cb9c867 Contacts: Reorganize Greek translations
651685f Contacts: Add support for Blacklist
c2ef5a7 Contacts: Update Greek Translation
b892a04 Merge "Contacts: Fix hebrew typos" into cm-10.1
f873571 Merge "Allow theming via Theme Chooser: add missing values for landscape and tablets" into cm-10.1
3fb632c Contacts: Fix hebrew typos
cf4a64b Contacts: NL translations
ca0259c Afrikaans translations: Added missing items
7e6c16f Allow theming via Theme Chooser: add missing values for landscape and tablets
4b94961 Merge "Contacts: correction in call stats French translation" into cm-10.1
0faa9bb Contacts: Added missing Polish translations
f20f7bc Contacts: correction in call stats French translation
01891be Merge "Contacts : add french translation" into cm-10.1
c8c6c7e Contacts : add french translation
5bfbcaf Import translations. DO NOT MERGE
d813d29 es_ES: Restore all AOSP strings
0bf93af Revert "Contacts: Hebrew translations"
edf0784 Contacts: Hebrew translations
6517c58 es_ES: Updated spanish translations
a4b2513 Contacts: Add missing space
be0a363 Improve T9 name normalization code
7f44b0e Merge "Fix call grouping." into cm-10.1
9aad5b3 Show formatted number in T9 result list.
2a150bd Fix call grouping.
f595166 Contacts: Simplified Chinese Translations
2b5976f Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Contacts into mr1.1-staging
e4f02ae Merge commit 'android-4.2.2_r1' into mr1.1-staging
d1339c7 Merge "Contacts: Danish for Call Statistics" into cm-10.1
391c3a6 Contacts: Fix typo
dd44ad6 Merge "Contacts: Update Greek translations" into cm-10.1
508607a Merge "Contacts: Dutch translations" into cm-10.1
dbe8603 Contacts: Update Greek translations
5a6099f Merge "Contacts: Update italian translation" into cm-10.1
72d2b3e Update Russian Translation-Contacts and fix app crash-CM10.1
9f6e542 Merge "Added hungarian translations for quick selection" into cm-10.1
117e1a1 Merge "PT-BR: Update translations" into cm-10.1
cedf6a7 Contacts: Update italian translation
b3e168f Merge "Update Russian Translation-Call statistics-CM10.1" into cm-10.1
d3b07e6 Contacts: Danish for Call Statistics
63aa1b3 Contacts: Dutch translations
fa9ab0d PT-BR: Update translations
dbdf742 Added hungarian translations for quick selection
41c4765 Merge "Allow quick pre-selection of filter range." into cm-10.1
e0a767e Update Russian Translation-Call statistics-CM10.1
4997a4e Cleanup code and make call data processing asynchronous.
81b9664 Merge "Fix display of missed calls when filtering for call type and sorting by count." into cm-10.1
10d8fd3 Fix display of missed calls when filtering for call type and sorting by count.
e74ef04 Allow quick pre-selection of filter range.
7dece38 PT-BR: Update translations
d67924a Japanese: initial Japanese translation for CM10.1
7aec0bb Merge "Contacts: Hebrew translation updates" into cm-10.1
272ccf2 Fix threads running after entering call log, possibly affecting battery life.
e5eb971 Merge "es_ES: Added spanish translations for call statistics" into cm-10.1
e573ac5 Merge "Added hungarian translation for Call statistics" into cm-10.1
e840412 Fix display condition for minutes.
8f8a66c es_ES: Added spanish translations for call statistics
d6655f5 Added hungarian translation for Call statistics
1f6cc5b Fix crash of date selector.
6a52654 Contacts: Hebrew translation updates
f4425bc Merge "Add Call statistics to Contacts (Phone)" into cm-10.1
9accb58 Merge "Update Russian Translation-Contacts-CM10.1" into cm-10.1
6a3a391 Add Call statistics to Contacts (Phone)
3a1e496 Fix NullPointerException on locale change.
6322027 Update Russian Translation-Contacts-CM10.1
45ed314 Contacts: Hebrew translation update
c037d28 Merge "Contacts: Update Greek translations" into cm-10.1
cfce18a Merge "PT-BR: Added missing translation" into cm-10.1
ea0cf3e Contacts: Dutch translations
62a4534 Contacts: Set "t9_default_sort" to translatable = false
54ac271 Contacts: Update Greek translations
15f9e1f PT-BR: Added missing translation
1ae05a3 If there's a contacts DB change while the dialpad is open, reload the cache instead of dropping it.
4267ab2 es_ES: Added CM translations
b2cea59 Contacts: Danish translation
053c993 Contacts: romanian translation ported from CM10
d504a45 Fix build warnings
1ccbc5a Merge "Add Russian T9 Buttons-CM10.1" into mr1-staging
e4741bf Merge "Contacts: Fix dialpad image for korean." into mr1-staging
82bdbbf Import translations. DO NOT MERGE
cb2c5c7 Contacts: Fix dialpad image for korean.
e4891c8 Add Russian T9 Buttons-CM10.1
ccd9e54 Import translations. DO NOT MERGE
9d4c0d4 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
acacb51 am 53f97fee: Import translations. DO NOT MERGE
ca43182 Import translations. DO NOT MERGE
53f97fe Import translations. DO NOT MERGE
df5048b Merge "Fixing unit test to not rely on html markup." into jb-mr1.1-dev
226fae4 Merge "Cherry picking BitmapUtilTest fix." into jb-mr1.1-dev
7a6eb7f Merge "Prevent going into single contact mode un-necessarily." into jb-mr1.1-dev
107ad03 Port "Allow full theming of Contacts via theme chooser"
69690ef Import translations. DO NOT MERGE
e8f84e8 Fixing unit test to not rely on html markup.
d141230 Cherry picking BitmapUtilTest fix.
0fdbff2 Don't show "set default" for directory contacts
3af2d48 Prevent going into single contact mode un-necessarily.
b7a1da6 Let talkback read People app name on launch
1c9e54b Import translations. DO NOT MERGE
2ddfdb0 Merge "Change content description for phone right tab from..." into jb-mr1.1-dev
54ef7b9 Dialer - T9 / Landscape Merges
7bd625a Contacts: fix missing December in Date Picker
29cc640 Import translations. DO NOT MERGE
5870609 Import translations. DO NOT MERGE
8b4da23 Change content description for phone right tab from...
c75ff8e Allow vanity numbers via paste/DIAL intent
c5cf539 Import translations. DO NOT MERGE
e489517 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
f52b453 Merge "Added ability to paste Arabic/Farsi digits into dialer" into jb-mr1.1-dev
34b1d21 Merge "Format phone number in QuickContactsActivity" into jb-mr1.1-dev
f4fa3d8 Added ability to paste Arabic/Farsi digits into dialer
5159ac5 Merge "Keyboard nav fix for list in GroupDetailFragment" into jb-mr1.1-dev
f5d3717 Merge "Minor changes to validateAction()." into jb-mr1.1-dev
3603b6c Merge "Fix incorrect tab highlight in QuickContactActivity." into jb-mr1.1-dev
6cec318 Merge "Changed content description for add contact and group buttons" into jb-mr1.1-dev
f63bfe6 Keyboard nav fix for list in GroupDetailFragment
e094be7 Import translations. DO NOT MERGE
ae87a56 Format phone number in QuickContactsActivity
99daf33 Changed content description for add contact and group buttons
e8e9442 Minor changes to validateAction().
de54ee8 Merge "Fix blank edit view after orientation change." into jb-mr1.1-dev
4c29090 Fix incorrect tab highlight in QuickContactActivity.
5cb892c Merge "Add content description for expand name fields button" into jb-mr1.1-dev
377be1f Merge "Add content description to More options button" into jb-mr1.1-dev
d6e83c4 Add content description to More options button
e6d6a10 Add content description for expand name fields button
8477f7a Fix blank edit view after orientation change.
b6ae736 Merge "Changed Quick Contacts details Button to ImageView" into jb-mr1.1-dev
9d85a2a Changed Quick Contacts details Button to ImageView
bafdfcb Merge "Change dial pad to show chooser onStart instead of onCreate." into jb-mr1.1-dev
f80fec3 Merge "Prune selected call log filter options from overflow menu." into jb-mr1.1-dev
e7f458d Change dial pad to show chooser onStart instead of onCreate.
781c4e1 Prune selected call log filter options from overflow menu.
9b1b7bb Reconcile with jb-mr1-release - do not merge
b102499 merge in jb-mr1-release history after reset to jb-mr1-dev
ffa7e17 am 3c0e293e: Don\'t override sendAccessibilityEvent() in ContactTileRow.
fbfe585 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
3c0e293 Don't override sendAccessibilityEvent() in ContactTileRow.
d69d3ae merge in jb-mr1-release history after reset to jb-mr1-dev
b5d6632 merge in jb-mr1-release history after reset to jb-mr1-dev
c9001cd am 62db5e0e: Add missing layout_width/height
ed4f212 am c787f82d: (-s ours) Import translations. DO NOT MERGE
62db5e0 Add missing layout_width/height
fbb1281 merge in jb-mr1-release history after reset to jb-mr1-dev
134d7ff merge in jb-mr1-release history after reset to jb-mr1-dev
c787f82 Import translations. DO NOT MERGE
7c1ac8e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6e64ae0 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
af0bf19 merge in jb-mr1-release history after reset to jb-mr1-dev
090cb0e Import translations. DO NOT MERGE
003171c Let's enhance
94eb6a7 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
a44116b merge in jb-mr1-release history after reset to jb-mr1-dev
ec9bfc9 Import translations. DO NOT MERGE
fcbc9bf merge in jb-mr1-release history after reset to jb-mr1-dev
fdefd00 Import translations. DO NOT MERGE
64bdc06 merge in jb-mr1-release history after reset to jb-mr1-dev
7ef5161 Import translations. DO NOT MERGE
7e8253f merge in jb-mr1-release history after reset to jb-mr1-dev
cba8c54 Import translations. DO NOT MERGE
1d3d6a4 Merge "Implement lift-to-type for phone dialer accessibility." into jb-mr1-dev
2ce27f4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0ef16eb merge in jb-mr1-release history after reset to jb-mr1-dev
0d3eeae Merge "Add "Export database" to tablet menu" into jb-mr1-dev
01862c7 Add "Export database" to tablet menu
d594019 Import translations. DO NOT MERGE
a0d0552 Implement lift-to-type for phone dialer accessibility.
1764c2c merge in jb-mr1-release history after reset to jb-mr1-dev
2c4eb4f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
57e2390 Import translations. DO NOT MERGE
b7fe953 Merge "Fix bug 7250807 Ellipsizing is broken" into jb-mr1-dev
9d578a8 Fix bug 7250807 Ellipsizing is broken
9131470 merge in jb-mr1-release history after reset to jb-mr1-dev
97b4c44 Import translations. DO NOT MERGE
c0f595d merge in jb-mr1-release history after reset to jb-mr1-dev
e519429 Import translations. DO NOT MERGE
9137829 Merge "Don't Beam from Phone/Contacts list." into jb-mr1-dev
345ec4f Don't Beam from Phone/Contacts list.
b54d41f Import translations. DO NOT MERGE
017909b merge in jb-mr1-release history after reset to jb-mr1-dev
4c0d6a5 Import translations. DO NOT MERGE
00b302d merge in jb-mr1-release history after reset to jb-mr1-dev
e9cade0 Import translations. DO NOT MERGE
7e65e45 merge in jb-mr1-release history after reset to jb-mr1-dev
46bdf7b Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev
4857fb4 Fix bug #7206086 NumberPicker widget should use locale digits
30355b0 merge in jb-mr1-release history after reset to jb-mr1-dev
e55ef9e Fix potential issue in I3d791ce1f536680a9ca0db2c387f3aad36eda17f
0da25ef Merge "Reset call filter when a call is placed or received." into jb-mr1-dev
9713397 Reset call filter when a call is placed or received.
785fbea merge in jb-mr1-release history after reset to jb-mr1-dev
b18de8c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
47236c5 Import translations. DO NOT MERGE
cb3bc0d Merge "Prefer upsizing a down-sampled picture if size is close enough" into jb-mr1-dev
6b22e42 Prefer upsizing a down-sampled picture if size is close enough
1e33cb7 merge in jb-mr1-release history after reset to jb-mr1-dev
bf04c8a Merge "Remove call log filter option from being persisted." into jb-mr1-dev
5ef45ca Merge "Changed filte header style to match frequent header." into jb-mr1-dev
fd4d9c0 Remove call log filter option from being persisted.
80ad6b4 Merge "Fix BadTokenException crash by ImportVCardActivity" into jb-mr1-dev
288532c Fix BadTokenException in ContactEditorFragment
ef6c927 Changed filte header style to match frequent header.
9dabdc8 Fix BadTokenException crash by ImportVCardActivity
a3b2679 merge in jb-mr1-release history after reset to jb-mr1-dev
03eaa11 Merge "Allow both AOSP and Google account types for Exchange" into jb-mr1-dev
de8a664 Allow both AOSP and Google account types for Exchange
3215711 Do not change voicemail calls to voicemail: uri automatically
0ca41e1 merge in jb-mr1-release history after reset to jb-mr1-dev
88ab988 Import translations. DO NOT MERGE

   * packages/apps/DSPManager
b6f9ddb DSP Manager: EL Translation
bc46ceb DSPManager: EL translations
fcb4cb0 DSPManager: grammar correction
611a645 Add LV translation
1e25384 DSPManager: Update Polish language
3a952d4 dsp: Implement missing equalizer commands
aeffebe DSPManager: NL translation
7439797 DSPManager: Update German translation
20bd342 DSPManager: ES translations
76bfa0b DSPManager: DA translation
531e9a7 Merge "DSPManager : FR translation" into cm-10.1
968bcd0 Afrikaans: Added missing translation text
9910178 DSPManager : FR translation
569defd Merge "en_GB localisation." into cm-10.1
1f6d624 en_GB localisation.
9f5ad1e DSPManager: ES traslations
af9a0e2 DSPManager: HU update translation
d6d0db7 Czech: merge from CM10
a8928b3 DSPManager: Reorganize Greek translations
97283c1 PT-BR: Update translation
652bf32 Merge "DSP Manager: Update values" into cm-10.1
793835e Fix exception on rotation.
4f2da60 DSPManager: Dutch translations
497b712 Add Afrikaans translation
7539a3e DSP Manager: Update values
4e0209c DSP Manager : Add french translation
709d33f DSP Manager: Update values
55ad810 Merge "Fix UUID in audio_effects.conf" into cm-10.1
fe8bbc6 DSP Manager: Fix build warnings
a73473c Fix UUID in audio_effects.conf
5bbe431 DSPManager: Update German & English translation
b05b293 Fixing grammar and spelling mistakes
e3909a1 Launch music player on headset connect
177d900 Merge "DSPManager: Add Greek translation" into cm-10.1
960fea1 DSPManager: Add Greek translation
8255700 Merge "DSPManager: removed app title from strings in romanian translation" into cm-10.1
9860dea DSPManager: removed app title from strings in romanian translation
9fb6a7e DSPManager: Simplified Chinese Translations
f122de3 DSPManager: fixed string for romanian translation
8e7dc51 Rename to DSP Manager
c591346 es_ES: Added and modified spanish translations
347eab9 DSPManager: Dutch translations
1693e01 DSPManager : Added French missing translation
4688bad DSPManager overrides compiling MusicFX
4abf7cd Add French missing translation
97fb900 Update Russian Translation-DSPManager-CM10
5c809d2 DSPManager: Added danish translation for "What is DSPManager?"
7c8ce07 Merge "DSPManager: romanian translation" into jellybean
26af948 DSPManager: romanian translation
ecd92a5 DSPManager: Minor corrections of the danish translation
5c932d9 es_ES: Added missing translations
3214e7b Merge "DSPManager: Dutch translations" into jellybean
468e732 DSPManager: Dutch translations

   * packages/apps/DeskClock
b3d4172 DeskClock: CA translations
257c986 DeskClock: FI translations
b70f641 DeskClock : Simplified Chinese translation
4c7415e Merge "DeskClock: RU translation" into cm-10.1
130f943 Merge "DeskClock: DA translation" into cm-10.1
04e1249 DeskClock: DA translation
c3cb971 Merge "Set vibration toggle as gone if vibration not available" into cm-10.1
23a90d6 Fix misalignment of alarm tone and profile buttons with icons
168bb4a Set vibration toggle as gone if vibration not available
93f5407 DeskClock: RU translation
e9f47c5 DeskClock: EL translations
7865ae5 Merge "DeskClock: Update Polish language" into cm-10.1
9a7e1a4 Merge "DeskClock : FR translation" into cm-10.1
f64fa41 DeskClock : FR translation
906fcb6 DeskClock: AF Translations
a5fcf74 DeskClock: Fix landscape graphic defect
d12c0e3 Merge "DeskClock: HU translation" into cm-10.1
4a2574f DeskClock: Update Polish language
93437e8 Merge "DeskClock: NL translation" into cm-10.1
9c4e4ac Merge "DeskClock: ES translations" into cm-10.1
cb9ee10 Merge "DeskClock: Update italian translation" into cm-10.1
4cc9148 Merge "DeskClock: CS translation" into cm-10.1
0f627ae DeskClock: ES translations
191ff81 DeskClock: NL translation
17e361e Merge "Update German translation." into cm-10.1
583a3b3 Merge "DeskClock: Fix timezone of user-defined cities" into cm-10.1
6bb4399 Merge "DeskClock: PT-BR update translations" into cm-10.1
4c4ad08 DeskClock: Fix timezone of user-defined cities
3c5477b DeskClock: Update italian translation
45c54ac DeskClock: PT-BR update translations
4ddf307 DeskClock: RU translation
e5e40dc DeskClock: CS translation
df20648 DeskClock: HU translation
b2c231d Update German translation.
0e4633a DeskClock: Add an option to switch profile
00a7d92 DeskClock: User-defined world cities
6d842eb DeskClock: zh-rTW translations
7872a2a DeskClock: SK Translations
cb0695d DeskClock: Recreate alarms DB on downgrade
62934a1 DeskClock: Add support for XXHDPI devices (e.g. Galaxy S4 and HTC One)
6d26511 DeskClock : Lockscreen dismiss Fix
46e8220 Merge "DeskClock: Simplified Chinese Translations" into cm-10.1
63d63ce DeskClock: Update italian translation
619174c DeskClock: Simplified Chinese Translations
783c222 Merge "DeskClock: NB translation" into cm-10.1
2483606 DeskClock: NB translation
d057370 DeskClock: Update italian translation
bd388d0 DeskClock : refactor in cm_*.xml
c9438ca Merge "DeskClock: CS translation" into cm-10.1
a23f9bf Merge "DeskClock: Polish translation refactoring" into cm-10.1
e970374 DeskClock: CS translation
3d8b587 DeskClock: Polish translation refactoring
189c9e1 DeskClock: HU translation refactoring
05c779b Deskclock: Update italian translation
8447bcf Merge "DeskClock: AF translation" into cm-10.1
99c4877 Merge "DeskClock : FR translation" into cm-10.1
cfe7064 DeskClock: AF translation
90e35f3 DeskClock : FR translation
d7aff40 DeskClock: Refactor RU translation
2d78dd1 DeskClock: PT-BR update translations
961daea Merge "DeskClock: ES translations" into cm-10.1
8babb4a DeskClock Danish translation: transition to cm_ format
257e31a DeskClock: ES translations
2af3477 DeskClock: Refactor default translations
a0c8066 DeskClock: Reorganize Greek translations
b0842ec Merge "DeskClock: update Japanese translation" into cm-10.1
0a6b953 Merge "Czech: added missing strings, changed translation strings order" into cm-10.1
35aaf1b Merge "DeskClock: Update italian translation" into cm-10.1
838adc0 Merge "DeskClock: NL translations" into cm-10.1
4675241 Update German translation.
169a33b DeskClock: NL translations
3480473 DeskClock: update Japanese translation
798ab48 Czech: added missing strings, changed translation strings order
a5e74cf Afrikaans translations: Added missing items
72f6e04 Merge "Update Russian Translation-DeskClock-CM10.1" into cm-10.1
03895ed Merge "DeskClock: update French translation" into cm-10.1
33d23a4 Merge "PT-BR: Update translations" into cm-10.1
43ffbf5 Merge "DeskClock: New Danish string and adjustment" into cm-10.1
723948b Merge "DeskClock: Update Polish language" into cm-10.1
74c4c66 Merge "Added hungarian translation for no_alarms" into cm-10.1
1fb8689 DeskClock: Update italian translation
675c49c DeskClock: New Danish string and adjustment
3b08526 DeskClock: Update Polish language
f0d426f DeskClock: update French translation
cb0dd60 Added hungarian translation for no_alarms
7f1b98d Update Russian Translation-DeskClock-CM10.1
405e4ee PT-BR: Update translations
a7f085f es_ES: Add spanish translation
875d2cc Add empty view when no alarms are set
1ae2db6 Merge "DeskClock: Added Polish language for CyanogenMod additions" into cm-10.1
bcd9baf es_ES: Restore AOSP strings
c5b9bb2 DeskClock: Added Polish language for CyanogenMod additions
fc59199 Merge "DeskClock: Hebrew translation updates" into cm-10.1
ce2ba67 Merge "DeskClock: Simplified Chinese Translations" into cm-10.1
de8153d DeskClock: Hebrew translation updates
4ea6d22 DeskClock: Simplified Chinese Translations
f6a288c DeskClock: Update Greek translations
8e4c5a6 Merge "es_ES: Fix spanish translations" into cm-10.1
66a33ab Merge "Danish: Missing string" into cm-10.1
242ed11 es_ES: Fix spanish translations
8f7e149 Remove redundant background from ClockFragment
61f55ce DeskClock: Update italian translation
420c916 Merge "DeskClock: Dutch translations" into cm-10.1
091cbc6 Merge "DeskClock: fix alarms database to prepare m1 to m2 transition" into cm-10.1
782b108 Danish: Missing string
e03111c DeskClock: fix alarms database to prepare m1 to m2 transition
58673e0 Merge "Fix NullPointerException when using vibrate-only alarms." into cm-10.1
dff870a Merge "DeskClock: Update German translation" into cm-10.1
ccfb726 Fix NullPointerException when using vibrate-only alarms.
eaa7f7a Fix layout issues with increasing volume option.
1d561b2 DeskClock: Dutch translations
448bda1 DeskClock: Update German translation
fa0d65f DeskClock: added missing Czech translations
b27623f Fix a number of issues introduced with the increasing volume setting
9e8b08e Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_DeskClock into mr1.1-staging
383d030 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/DeskClock into 1.1
381d3b1 Merge "DeskClock : add french translation" into cm-10.1
e19e406 Merge "Update Russian Translation-DeskClock-CM10.1" into cm-10.1
1ce165d Merge "PT-BR: Update translations" into cm-10.1
d765a1b Merge "DeskClock: Update Greek translations" into cm-10.1
efef2fa Merge "es_ES: Added spanish translations" into cm-10.1
da7b931 DeskClock : add french translation
1815846 Merge "Revert "Make the settings menu accessible on every tab"" into cm-10.1
64f2ba6 Update Russian Translation-DeskClock-CM10.1
4709976 Revert "Make the settings menu accessible on every tab"
ead138f DeskClock: Update Greek translations
75da93c Merge "Added hungarian translation for increasing volume option" into cm-10.1
e2239de Merge "DeskClock: Dutch translations" into cm-10.1
73e9baf PT-BR: Update translations
f62fad7 es_ES: Added spanish translations
a8b1db5 Added hungarian translation for increasing volume option
057d88c Make the settings menu accessible on every tab
6f5d791 DeskClock: the first day of the week depends on a locale
e5f4d12 DeskClock: Add increasing volume option for alarm clocks
0ed03e8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
81a0690 Resseting volume button to "do nothing" on upgrade
198d1c5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
a3458d9 Switch volume button default behavior
b26097e DeskClock: Update italian translation
e8c9297 DeskClock: Dutch translations
565a396 Merge "DeskClock: Simplified Chinese Translations" into cm-10.1
d5a8b94 Merge "Japanese : update Japanese translation." into cm-10.1
d659fb9 DeskClock: Simplified Chinese Translations
08ed99b es_ES: Updated spanish translations
ab3bfd1 Merge "DeskClock : Add french translation" into cm-10.1
1b66243 Fix NPE for AlarmClock in silent mode
1e945b5 Merge "DeskClock: Update German translation" into cm-10.1
a29ff43 Merge "DeskClock: Danish Translation" into cm-10.1
3d7b856 Japanese : update Japanese translation.
27a2f05 DeskClock : Add french translation
ce0eb0d DeskClock: Update German translation
3c027ec Merge "PT-BR: Update translations" into cm-10.1
1509080 DeskClock: Danish Translation
9c0aa98 Merge "Update Russian Translation-DeskClock-CM10.1" into cm-10.1
2603fd8 Added hungarian translations
28eca21 Keep the display on while stopwatch or timer is running
9694a6d PT-BR: Update translations
16694fc Update Russian Translation-DeskClock-CM10.1
3ed33e1 es_ES: Added spanish translations
0f0b44b PT-BR: Update Translations
9b8a768 Merge "Added flip and shake to snooze" into cm-10.1
59056e8 DeskClock: Missing Danish strings
d8aa32d Added flip and shake to snooze
fc06d83 DeskClock: Hebrew translation update
62f7901 German: Update translation
5d33997 Merge "Update Russian Translation-DeskClock-CM10.1" into cm-10.1
4a92c2f Merge "DeskClock: update romanian translation" into cm-10.1
f951b00 Merge "PT-BR: Added missing translations" into cm-10.1
06cd503 DeskClock: Dutch translations
dc7c21f DeskClock: update romanian translation
4502684 PT-BR: Added missing translations
7b0ff4c Update Russian Translation-DeskClock-CM10.1
79c63ff Merge "DeskClock: implement onDowngrade for alarm DB" into cm-10.1
857ebf5 Hide AlarmClock icon: Ported translations from cm-10.0
c322be8 DeskClock: implement onDowngrade for alarm DB
b386427 Add option to hide AlarmClock Icon in StatusBar
11edfd8 Fix build warnings
969a1bd Clock: fix layout for 320dp devices
bc3de9a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
45f73b8 Import translations. DO NOT MERGE
8f1d814 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1d529d6 Add time zone check every 15 minutes
1e34a1b Always log the alarm time
6889839 Merge "Tweak layouts for digital clock widget." into jb-mr1.1-dev
e236143 Tweak layouts for digital clock widget.
6e61c1d Import translations. DO NOT MERGE
dbfe95f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
e3025ea am d1f08dc7: Import translations. DO NOT MERGE
69a023e Import translations. DO NOT MERGE
d1f08dc Import translations. DO NOT MERGE
7128d26 Import translations. DO NOT MERGE
aae42a8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
be45296 Distinguish replacing alarm from dismiss
f40eb1d Reset timers data instead of deleting it
45a2e4b Aligning columns in stopwatch lap times
6f0466d Merge "Translations for lap times" into jb-mr1.1-dev
bdd08dc Translations for lap times
761d991 Fixed scaling on timer/stopwatch time
e41a1a5 Timers: Sort order and auto-scrolling behavior
e0b0e9e Merge "Padding between date and digital clock" into jb-mr1.1-dev
316228f Padding between date and digital clock
0548712 Keep screen on when running stopwatch
b288c48 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b69f408 ACTION_ON_QUARTER_HOUR replaces ACTION_TIME_TICK
6f978ba merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
cb228aa am 66258da1: Import translations. DO NOT MERGE
6b3d629 Import translations. DO NOT MERGE
66258da Import translations. DO NOT MERGE
5b46dd9 Timer Setup layout change for i18n
94830db Extract boilerplate code into drawHand() utility method, for make benefit glorious readability.
e06d867 Sort timezones in timezone picker
6add973 Put the seconds hand on top in the analog clock
a2f496a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
8369d41 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
97ac21e am 93d3ba1d: Import translations. DO NOT MERGE
0f0e905 Import translations. DO NOT MERGE
93d3ba1 Import translations. DO NOT MERGE
de67b85 DeskClock: Fix Dream settings
f7dc496 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
872c29e Alarm delete confirmation
e2692e0 Expand top margin for digital clock
e562104 Merge "Revert "Fix flickers in numeric pad of time picker"" into jb-mr1.1-dev
38d343a Revert "Fix flickers in numeric pad of time picker"
13089e7 am e9a8a460: Import translations. DO NOT MERGE
4265321 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
9722dd0 Make on/off switch more visible
966f776 Import translations. DO NOT MERGE
e9a8a46 Import translations. DO NOT MERGE
1d91dcd merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3f65897 Code formatting fixes.
7842f9b Move SDK version to 17
60f175e Read cities names for DB and not from list
a2b0a7e Make Clock dream default to "dim"
cbd928f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
c1d2939 Update widget with home time changes
5348f97 am 7afa628a: Import translations. DO NOT MERGE
d696500 Reconcile with jb-mr1-release - do not merge
7afa628 Import translations. DO NOT MERGE
6b7ec7b merge in jb-mr1-release history after reset to jb-mr1-dev
f22f65d am 980ff50e: Fixed flicker in widget
980ff50 Fixed flicker in widget
7876142 Reconcile with jb-mr1-release - do not merge
152e6ce am d7bd5719: Add intents in the broadcast listener of the widget
bfc863f am 0d45ace3: Use the new TextClock widget for the appwidget\'s date.
932d639 merge in jb-mr1-release history after reset to jb-mr1-dev
d7bd571 Add intents in the broadcast listener of the widget
0d45ace Use the new TextClock widget for the appwidget's date.
d0611d5 Reconcile with jb-mr1-release - do not merge
add9db2 merge in jb-mr1-release history after reset to jb-mr1-dev
6983c8b am eafb30c1: Slide unlock cannot get accessibility focus (deskclock).
0e4230f Reconcile with jb-mr1-release - do not merge
39d2d41 am cf961531: am a7efbc4c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a3c1f85 am ea0116d9: am 7c398368: Merge "Update world clocks with time zone" into jb-mr1-dev
c30beed am 2ec425b7: am e1078a13: Merge "Revert "clock preview no more bold" since we switched back to bold hours." into jb-mr1-dev
564f351 am 9eea244d: am f84ef35b: Add am/pm support and bold hours to widget
ca8a952 am c24187bd: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
3847bc4 am 3bd7c4a3: am 672e6740: clock preview no more bold
31d2dce am d74155e4: am bdfaec3f: Fix widget layouts
2aefa7c am 807ea9f2: am 03b13641: Clock widget fixes:
45cdec5 am 9101431e: am 61619eee: Layout changes for widget
eb33365 am 53e2d6a6: am eff8529d: Merge "Fix crash on widget" into jb-mr1-dev
d75e0b7 am ea654871: am fa43ddfe: (-s ours) Import translations. DO NOT MERGE
d64ccfc am 2d3db692: Import translations. DO NOT MERGE
9069c65 am 5d2234cb: am a9ca3065: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
999249c am 0805ed71: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
608ba74 am 7208d766: am bd0e54a7: Add support for keyguard
c26a20f am ca22c416: am 5c464d35: New digital clock widget for Clock
b6e2b34 am 43dd4b52: am 37ecc738: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
7b24ff1 am 1b701976: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
6bd8e9b am 7af654f5: am f77f3f72: Center world clocks
3564287 am 41463e5e: am e85aa294: Fixed response to taps in alarm "card"
6b7d425 am e7d2f4e4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2482978 am 096a799c: (-s ours) am 0ced4040: (-s ours) Import translations. DO NOT MERGE
cf7b712 am 40942965: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
eafb30c Slide unlock cannot get accessibility focus (deskclock).
3bebf36 merge in jb-mr1-release history after reset to jb-mr1-dev
cf96153 am a7efbc4c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0b7eb90 am a7efbc4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a7efbc4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
914a891 am 7c398368: Merge "Update world clocks with time zone" into jb-mr1-dev
ceafa34 am e1078a13: Merge "Revert "clock preview no more bold" since we switched back to bold hours." into jb-mr1-dev
3ce3aa5 am f84ef35b: Add am/pm support and bold hours to widget
ea0116d am 7c398368: Merge "Update world clocks with time zone" into jb-mr1-dev
2ec425b am e1078a13: Merge "Revert "clock preview no more bold" since we switched back to bold hours." into jb-mr1-dev
9eea244 am f84ef35b: Add am/pm support and bold hours to widget
7c39836 Merge "Update world clocks with time zone" into jb-mr1-dev
e1078a1 Merge "Revert "clock preview no more bold" since we switched back to bold hours." into jb-mr1-dev
5d1260f Reconcile with jb-mr1-release - do not merge
c24187b Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
7fd963b Update world clocks with time zone
344c20d merge in jb-mr1-release history after reset to jb-mr1-dev
d0e5d73 Revert "clock preview no more bold" since we switched back to bold hours.
f84ef35 Add am/pm support and bold hours to widget
3bd7c4a am 672e6740: clock preview no more bold
d74155e am bdfaec3f: Fix widget layouts
575e3c6 am 672e6740: clock preview no more bold
b7e88e6 am bdfaec3f: Fix widget layouts
6ca26e1 Import translations. DO NOT MERGE
6252206 Import translations. DO NOT MERGE
672e674 clock preview no more bold
8e48559 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
bdfaec3 Fix widget layouts
3d1eb9b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
609d8a1 merge in jb-mr1-release history after reset to jb-mr1-dev
807ea9f am 03b13641: Clock widget fixes:
9101431 am 61619eee: Layout changes for widget
03b1364 Clock widget fixes:
61619ee Layout changes for widget
53e2d6a am eff8529d: Merge "Fix crash on widget" into jb-mr1-dev
eff8529 Merge "Fix crash on widget" into jb-mr1-dev
ea65487 am fa43ddfe: (-s ours) Import translations. DO NOT MERGE
2c25763 Fix crash on widget
2d3db69 Import translations. DO NOT MERGE
fa43ddf Import translations. DO NOT MERGE
d4c9a2e merge in jb-mr1-release history after reset to jb-mr1-dev
5d2234c am a9ca3065: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a9ca306 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0805ed7 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
73bf5ec merge in jb-mr1-release history after reset to jb-mr1-dev
d9c2cfd Import translations. DO NOT MERGE
8751493 Import translations. DO NOT MERGE
7208d76 am bd0e54a7: Add support for keyguard
bd0e54a Add support for keyguard
ca22c41 am 5c464d35: New digital clock widget for Clock
5c464d3 New digital clock widget for Clock
3834b90 merge in jb-mr1-release history after reset to jb-mr1-dev
43dd4b5 am 37ecc738: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1b70197 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
37ecc73 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2b25f10 merge in jb-mr1-release history after reset to jb-mr1-dev
7af654f am f77f3f72: Center world clocks
41463e5 am e85aa294: Fixed response to taps in alarm "card"
f77f3f7 Center world clocks
e85aa29 Fixed response to taps in alarm "card"
5b36beb Import translations. DO NOT MERGE
660dcf0 Import translations. DO NOT MERGE
e7d2f4e Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
096a799 am 0ced4040: (-s ours) Import translations. DO NOT MERGE
caac92f Import translations. DO NOT MERGE
0ced404 Import translations. DO NOT MERGE
4094296 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
bdd4d2d merge in jb-mr1-release history after reset to jb-mr1-dev
76547b1 Merge "widget previews" into jb-mr1-dev
0cef5ce widget previews
8e5d09f Import translations. DO NOT MERGE
68a1908 am 4955078b: Fix flickers in numeric pad of time picker
4955078 Fix flickers in numeric pad of time picker
6b6de0f am ebfbc968: Strings for widget.
ebfbc96 Strings for widget.
b3fe05e am 687d3b67: Saving selected alarm.
687d3b6 Saving selected alarm.
d3ee5b4 merge in jb-mr1-release history after reset to jb-mr1-dev
cf85390 am bb82c8cc: Fix jerkiness in alarm list
3a2528a am 73f70be8: Remove Qatar from cities list
c314191 am 3df1d0ee: Fix NPE crash on timer deletion
bb82c8c Fix jerkiness in alarm list
73f70be Remove Qatar from cities list
3df1d0e Fix NPE crash on timer deletion
c01b763 merge in jb-mr1-release history after reset to jb-mr1-dev
3858ecb am 090b98f4: Merge "remove content description from empty buttons" into jb-mr1-dev
090b98f Merge "remove content description from empty buttons" into jb-mr1-dev
0d31ac3 am e06ab884: (-s ours) Import translations. DO NOT MERGE
5ee7aec am 1762f53a: Strings for translation
b862cf4 am fc7cad8a: Enable access for alerts in multi-user configuraiton
4256815 Import translations. DO NOT MERGE
e06ab88 Import translations. DO NOT MERGE
67d358e merge in jb-mr1-release history after reset to jb-mr1-dev
61cdc84 remove content description from empty buttons
93a1840 am 8d5301a9: Make fast scroll on cities activies always visible
5b93090 am f5e75fc8: Fix touch feedback on cities list
1762f53 Strings for translation
fc7cad8 Enable access for alerts in multi-user configuraiton
3d8d568 merge in jb-mr1-release history after reset to jb-mr1-dev
8d5301a Make fast scroll on cities activies always visible
f5e75fc Fix touch feedback on cities list
a80b7ef am c0d954df: Change clock layouts
c0d954d Change clock layouts
13ad8a3 merge in jb-mr1-release history after reset to jb-mr1-dev
3851642 am 2bf39f77: Timers animations
2bf39f7 Timers animations
7763a51 am db40a76e: (-s ours) Import translations. DO NOT MERGE
d175e0e Import translations. DO NOT MERGE
db40a76 Import translations. DO NOT MERGE
b40e10a merge in jb-mr1-release history after reset to jb-mr1-dev
af8787e am fccd1dcd: Add LAP label to lap info
fccd1dc Add LAP label to lap info
ab9135a merge in jb-mr1-release history after reset to jb-mr1-dev
fa626d9 am 0000f13d: Fix background for alarm list items
0000f13 Fix background for alarm list items
1d10338 am 9dad8db4: Fix crash in GetViewById
9dad8db Fix crash in GetViewById
f862fa5 am 7bcc2d8c: Replace lights out mode with screensaver.
7bcc2d8 Replace lights out mode with screensaver.
cf2e9d3 am c1c37b50: Do not show time picker after alarm undo
c1c37b5 Do not show time picker after alarm undo
a7d6922 am 99a1be6f: Do not kill timer alert in onStop
99a1be6 Do not kill timer alert in onStop
07b9905 am 19f48b8a: (-s ours) Import translations. DO NOT MERGE
18297af Import translations. DO NOT MERGE
19f48b8 Import translations. DO NOT MERGE
6dc064f merge in jb-mr1-release history after reset to jb-mr1-dev
c0cf258 am 35f68aa9: Lock alert orientation for un-docked phones.
35f68aa Lock alert orientation for un-docked phones.
37189a5 am 96509e15: Open time picker when creating a new alarm
489b81c merge in jb-mr1-release history after reset to jb-mr1-dev
96509e1 Open time picker when creating a new alarm
b95a877 am 9e33fe39: Renumbered Timer+Stopwatch notification id
9e33fe3 Renumbered Timer+Stopwatch notification id
3a9c015 merge in jb-mr1-release history after reset to jb-mr1-dev
c8d7124 am a8c8c063: Add touch feedback to cities list items
4590be3 am 8dac45cc: Revert Alarm behavior for Back and Home keys
967f539 am fa850403: Add support of long press to delete alarms
d6ab08b am feabb7a3: Show TimerAlertFullScreen upon any timer expiry
a8c8c06 Add touch feedback to cities list items
8dac45c Revert Alarm behavior for Back and Home keys
fa85040 Add support of long press to delete alarms
feabb7a Show TimerAlertFullScreen upon any timer expiry
402d7a6 am 1638996c: Merge "Updated automatic_home_clock option description" into jb-mr1-dev
1638996 Merge "Updated automatic_home_clock option description" into jb-mr1-dev
4d8eef5 am 80795bba: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
80795bb Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
19dfd85 merge in jb-mr1-release history after reset to jb-mr1-dev
c4eda59 am aedad41c: Fixed missing layout_width
aedad41 Fixed missing layout_width
adfee97 Import translations. DO NOT MERGE
bd39c68 merge in jb-mr1-release history after reset to jb-mr1-dev
a4893b1 am 97ac38c6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
97ac38c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
eabc160 Updated automatic_home_clock option description
ea6e9a1 Optimize world clock layout
b390675 Merge "Add missing layout sizes in XML" into jb-mr1-dev
69d529c merge in jb-mr1-release history after reset to jb-mr1-dev
b51e94b Add missing layout sizes in XML
3012eef Adding unlock-like slider control for alarm dismiss/snooze.
3fd3006 Fix crash in alarm adapter
97a8855 merge in jb-mr1-release history after reset to jb-mr1-dev
4d312a2 Adding a dedicated ring for timer alerts
93b0b26 Increasing padding for quickscroll
7fe538f backspace disabled asset
e1ef09f Import translations. DO NOT MERGE
a809cb8 Fixed up launcher icon
ae45ac1 Debug info for AlarmAlert
10375b3 Merge "Fixed bugs for time pickers." into jb-mr1-dev
dbefd32 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ebd2383 merge in jb-mr1-release history after reset to jb-mr1-dev
eb4781a Fixed bugs for time pickers.
621e5d6 Merge "Fix NPE when stopping off-screen times-up timers" into jb-mr1-dev
3681538 Merge "Match dream style default to settings value" into jb-mr1-dev
c8525b8 Merge "launcher alarm clock icon update" into jb-mr1-dev
74aeadc Fix NPE when stopping off-screen times-up timers
1048518 Match dream style default to settings value
a8c9efe Merge "Fixed up launcher icon" into jb-mr1-dev
d116936 launcher alarm clock icon update
f67abfd Clear data on boot
5d471eb Fixed up launcher icon
419c63a merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ef9888e Only show home time when different from main time
a65d3eb Change timers to use system clock
a21a809 merge in jb-mr1-release history after reset to jb-mr1-dev
71427e2 Merge "Let's enhance" into jb-mr1-dev
abb3d37 merge in jb-mr1-release history after reset to jb-mr1-dev
7ef9130 merge in jb-mr1-release history after reset to jb-mr1-dev
2a6b929 Add swipe protection around alarm on/off switch.
976c89d Fix date format for all languages
249212b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
981bf4b merge in jb-mr1-release history after reset to jb-mr1-dev
8febfc9 Let's enhance
a5d68d7 Update cities list
c81760e Make the last ringtone selection the default
3c1c5c9 merge in jb-mr1-release history after reset to jb-mr1-dev
191c15a Import translations. DO NOT MERGE
797e22b Add underline graphics to day of week buttons in alarm.
471a461 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
205d1ae Merge "Adding ability to label timers." into jb-mr1-dev
0f6e335 Adding ability to label timers.
f0edd93 merge in jb-mr1-release history after reset to jb-mr1-dev
8c6d18c Import translations. DO NOT MERGE
7d308c6 Switched stopwatch notifications to use correct icons.
2c24f71 Sort alarms by time again.
72b1c25 merge in jb-mr1-release history after reset to jb-mr1-dev
45df166 Stop stopwatch service when not running.
15fe965 Fixed start/stop button bugs.
932e012 Improve accessibility for visually impaired.
4045078 Do not translate ananlog/digital keywords
aba3c45 Major layout change for alarm list.
a156501 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
659e190 merge in jb-mr1-release history after reset to jb-mr1-dev
08af312 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0aa0b54 Change city array to string-array
1ee06c5 Use Holo theme for Dream Clock settings
e10e1df Removed default selection from alarm ringtone picker
8370eeb Returned the menu strings
243e97b No light's out for full-screen Timer activity
d90caa4 Merge "Explain purpose of string. Also noting unused." into jb-mr1-dev
799c62f Merge "Removing left margin mistake" into jb-mr1-dev
d41fc07 merge in jb-mr1-release history after reset to jb-mr1-dev
f57aebc Explain purpose of string. Also noting unused.
b6af69f Merge "release wakelock at night, for super-dim mode. tone down bright white in daylight mode, now that screen is bright." into jb-mr1-dev
ce2fb5b Import translations. DO NOT MERGE
d743c72 Removing left margin mistake
6005ac6 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
12fc527 merge in jb-mr1-release history after reset to jb-mr1-dev
6e47702 Fix clock date format
014575a Add new fonts to prevent "stuttering"
ffe12a3 Setting all days when repeat checkbox is turned on.
9814bd4 Sort world clocks by timezone, name
2c56828 release wakelock at night, for super-dim mode. tone down bright white in daylight mode, now that screen is bright.
8491a9f merge in jb-mr1-release history after reset to jb-mr1-dev
2e5e0ec Merge "Hide alarm vibrate option when device does not support it." into jb-mr1-dev
242e9de Merge "Properly alphabetizing cities with accent marks" into jb-mr1-dev
05232d7 Merge "Fix kolkata time in world clock" into jb-mr1-dev
ad92f96 merge in jb-mr1-release history after reset to jb-mr1-dev
dbd989a Hide alarm vibrate option when device does not support it.
aa9f4d7 Properly alphabetizing cities with accent marks
b088603 Fix kolkata time in world clock
357497c Implemented lights out and dimming.
da3ef04 Allow alerts to show in multi-user lock screen
a3169b7 Making press states white and balancing spacing
88e4ba7 merge in jb-mr1-release history after reset to jb-mr1-dev
a3b4c99 Bolding days of week in alarm when selected.
51193c6 Scroll to alarm when set alarm intent is passed in.
da56b59 Preserve TimerFragment state
af70181 Make accidental alarm deletion harder
164554c Fix broken layouts
cc1c2b4 Merge "Direct alarm set intent to new UI" into jb-mr1-dev
ab4f7e6 Merge "Show keyboard in label dialog." into jb-mr1-dev
391fcd3 Merge "Layout changes for analog clock and world clock" into jb-mr1-dev
dcc0d52 Direct alarm set intent to new UI
f4b6159 Show keyboard in label dialog.
3373d28 Import translations. DO NOT MERGE
4c2de2b Layout changes for analog clock and world clock
2f40785 Updated cities list for world clock
b8692eb fixing global clock layouts on main frame
ca57dc2 merge in jb-mr1-release history after reset to jb-mr1-dev
1884e57 Wake screen when timer klaxon starts
386d8b0 Moving buttons for timer and stopwatch to the circle.
754d8f6 Updating widget preview to newest visuals
c042c78 Clear undo bar display state after action click.
06077d2 Adding a ticker to buzzing timer notification.
d84d21f merge in jb-mr1-release history after reset to jb-mr1-dev
8cbcdce merge in jb-mr1-release history after reset to jb-mr1-dev
a9547df Removed CircleTimerView thread
d58f6c4 World Clock list fixes.
fa2e368 Changed "Off On" button to single text toggle.
00c0d86 Fixing unique primary key error.
be89125 updating bg color so it does not blend with sysui
c4c8867 new 3d alarm clock launcher icon
2831a54 More world clock fixes
174e0c2 red press states
ca66795 Layout fixes
09d6df2 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
aa3c309 Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.
9b175a0 List headers for list of cities
1e14fb7 Adding undo feature for alarm swipe delete.
a67fd3b Minor alarm in-place editing tweaks.
810b30a Make timer text into a virtual button that starts/stop timer.
360468b Allow power button to dismiss/snooze.
8f97a72 Fix up the headers in Clock
22ad7c9 Visual distinction for the five timer states
71aa6a6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
646258f removing box press states and changing icon color instead
9904733 List headers for list of cities
c6e9631 make touch targets bigger for alarm time setup, and align layouts
fea545c Add analog clock to world clock
8fef767 Add a dot at 12 o'clock.
0cb7099 Adding undo feature for alarm swipe delete.
d091ee8 Minor alarm in-place editing tweaks.
eb15acf Import translations. DO NOT MERGE
e40b312 Make timer text into a virtual button that starts/stop timer.
49bf59f make touch targets bigger for alarm time setup, and align layouts
8c652db Import translations. DO NOT MERGE
5c1f16b merge in jb-mr1-release history after reset to jb-mr1-dev
fc5cce3 Add analog clock to world clock
f935180 Add a dot at 12 o'clock.
506aeb5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
9fcb7dd Keep up with API changes.
79328e8 Add list headers to cities list
b9dfac1 Fix merge bug that caused the 1.60 minutes to come back.
2e553c2 Maintain timer creation order in list.
4642e84 Properly handle orientation change for alarm display/edit.
73e5acf WorldClock part 2
3286630 Jank improvements.
ce943dc Removing blue background for on/off button.
f69905c Removing dialog again.
3dd58cf Import translations. DO NOT MERGE
c603012 Merge "Disable DeskClock's dock mode in JB-MR1 and later." into jb-mr1-dev
79523b7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3553754 Disable DeskClock's dock mode in JB-MR1 and later.
01252aa merge in jb-mr1-release history after reset to jb-mr1-dev
c00bd3e global clock layout fixes and other padding fixes
2b99424 Changed alarm alert back to buttons.
6755efd Import translations. DO NOT MERGE
6b9508b Move buttons to icons.
5c3795c Completely new alarm list with in-place editing.
64575cf Several bug fixes for timer notification.
a1e56f0 Updating stopwatch notification icon.
84f26ac speed-up and fix leak to draw the circle timer's diamond
fb1c283 Making tablet layouts work and spaced out evenly
647353d Adding full-screen timer alert activity.
421751e New world clock
3e76494 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
8fb8b04 merge in jb-mr1-release history after reset to jb-mr1-dev
c4861cb Handle configuration changes in AlarmAlert
1c98a17 Fixing alarm_alert time layout
29bdb84 updated assets and new btn asset for alarm alert
c78b68b Alignment and size fixes for CountingTimerView
93a6138 Import translations. DO NOT MERGE
bb8a0e2 Night (dim) mode and style settings for the clock screensaver.
7d44b05 Fix bugs pertaining to timer +1 button.
c4e1d4c merge in jb-mr1-release history after reset to jb-mr1-dev
f72e688 Add timezone information to home city selection list
644a5d8 Fixed bugs to maintain timer state after quitting.
955e893 Merge "Fixed bug where timer showed 60 in place of 0." into jb-mr1-dev
1ce69ab Adding timer notifications.
20ea36e Fixed bug where timer showed 60 in place of 0.
8648cb3 Remove handling of configuration changes from DeskClock
5446f4f Make medium_font_size use dps instead of sps
11ed7c0 Merge "Move am/pm labels to align with the top of text" into jb-mr1-dev
aa9acda Merge "Making timer dial numbers larger on phone" into jb-mr1-dev
9748009 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
45eb3c0 Fix syntax error in AndroidManifest.xml.
b140c44 Move am/pm labels to align with the top of text
31bd09e Making timer dial numbers larger on phone
b3c674c Import translations. DO NOT MERGE
0d2ffed Merge "making body gray brighter and aligning stopwatch timetable" into jb-mr1-dev
ff98034 merge in jb-mr1-release history after reset to jb-mr1-dev
28a3090 making body gray brighter and aligning stopwatch timetable
0fd8cb9 merge in jb-mr1-release history after reset to jb-mr1-dev
551a5c3 Set home time zone when app starts if it is not set.
8569154 Time picker fixes.
1ebbca6 Fix activity transitions
a894673 assets for textbutton conversions into icons
922de8a center delete key above '3' in timer setup
370bdb2 Various bug fixes
d7dbd34 Hopefully fix issue #6978018: Several configuration_changed...
b5c985c Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
35b9e3b Fix issue #7255954: API Review: rename Dream to DreamService
dfb79cf Draw red diamond on top of white ticker
3816213 Merge "Updated assets and new assets for notifications and new buttons for clocks" into jb-mr1-dev
233dfeb Import translations. DO NOT MERGE
c1fdec8 Updated assets and new assets for notifications and new buttons for clocks
79d3a36 merge in jb-mr1-release history after reset to jb-mr1-dev
08d1b38 Merge "Resize stopwatch ticker" into jb-mr1-dev
09e26fe Import translations. DO NOT MERGE
94622b4 Resize stopwatch ticker
e18687c Replace circle timer indicator with diamond
b8f330f Fix localization of numbers in setup views
48c96a5 changed the spacing within the time display clock
31116af Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5bbcee4 merge in jb-mr1-release history after reset to jb-mr1-dev
8978640 Updated notification for alarms.
ea9a92e Fix UI for timer entry
f3d6fa1 Swapping dismiss/snooze sides and using lights out view.
15e21c1 Fix text overflow in large text mode
cc6afbd Import translations. DO NOT MERGE
30f1f6a Adding unlock-like slider control for alarm dismiss/snooze.
113e1da Add notification for timer.
b5535bc merge in jb-mr1-release history after reset to jb-mr1-dev
2f0266f Adding diamond asset for stopwatch
8e49095 Fixed app theme to more accurately display app's look.
85d5bb1 Don't overlay red arc on white circle
bed1a89 New time picker
c67e11e Merge "Icons for lockscreen dismiss and snooze and adjusting dim level of tabs" into jb-mr1-dev
0a5a5cc Icons for lockscreen dismiss and snooze and adjusting dim level of tabs
ee6917f Import translations. DO NOT MERGE
255b30b merge in jb-mr1-release history after reset to jb-mr1-dev
9a66ee0 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a95c0c7 merge in jb-mr1-release history after reset to jb-mr1-dev
3194325 Fix timer animation at zero time.
3f99104 Fix timer ring stuttering
0e043cd Set default clock style to digital
48a8e47 Add contentDescriptions for ActionBar Tabs
b274e5e Change menu button to overflow icon
8be30ee Change menu button to overflow icon
2527ef1 Make up button in AlarmClock return to DeskClock
9aa3876 Fix crash in .TimerFragment.setTimerButtons
9e39f54 Import translations. DO NOT MERGE
e495d05 merge in jb-mr1-release history after reset to jb-mr1-dev
74bc742 Merge "Migrate away from lightsOut() in desk clock dream." into jb-mr1-dev
decf574 merge in jb-mr1-release history after reset to jb-mr1-dev
4243fb0 Timer/stopwatch text size
89f855e Stop timer circle animation when time's up
860de0e Timer fixes
04b4717 merge in jb-mr1-release history after reset to jb-mr1-dev
e20d859 Fix paddings for actionbar tabs
d932d22 Fix stopwatch red circle after clear app data
812c078 merge in jb-mr1-release history after reset to jb-mr1-dev
fc17798 Fixes to help menu button
a80f15d landscape layouts
4c17280 Migrate away from lightsOut() in desk clock dream.
7e9dd35 Import translations. DO NOT MERGE
be82445 Setting style and label fixes
4e36542 merge in jb-mr1-release history after reset to jb-mr1-dev
7f64a4c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a2fa906 Fix START/STOP button disappears when timer expire
b6be3d0 timer spacing fix
7b45359 Import translations. DO NOT MERGE
51eb2d5 Move to timer view when timer expires
526cf41 Changed stopwatch share menu to inline modal.
a71a82d Fix crash in Timer fragment
69d0b27 Add cancel button to timer setup view
9d5d3fd merge in jb-mr1-release history after reset to jb-mr1-dev
6fc34de Support for help menu item with smartlink
f65a38c Change second hand location
bf44605 ringtone and expand icons
c694c60 Import translations. DO NOT MERGE
fe7b72d Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
732ce5e New stopwatch share strings
8ac515d merge in jb-mr1-release history after reset to jb-mr1-dev
84e9271 Fix crash in stopwatch on resume
e35b85f Fix crash in stopwatch on resume
a4faa05 Timer and stopwatch fixes
c80c8b5 Import translations. DO NOT MERGE
670bc5b merge in jb-mr1-release history after reset to jb-mr1-dev
7c71fba Make stopwatch state persistant
be8b49f Fix crash in Stopwatch fragment
871d7d0 Add alert ring when a timer expires.
b368ebb Temporary fix for landscape more for alert
8dcb7f8 Set min SDK for Clock
327e711 merge in jb-mr1-release history after reset to jb-mr1-dev
c51c059 Temporarily prevent alarm alert in landscape mode Bug: 7175456
9c83d56 Change widget bahvior to start DeskClock
075923a Stopwatch share strings
5a46981 App strings
1299bda Fix dream's screen saver and remove text clock style Bug: 7173717
6fa0c41 Merge clock to JB-MR1
63211ef Merge clock to JB-MR1

   * packages/apps/Email
c46630e Email: CA translations
a370abc Email: FI translations
7ed5bcd Email: zh-rTW translations
a5ebedb Email: RU translation
8ab78c6 Email: DA translation
647730c Merge "Email: Simplified Chinese Translations" into cm-10.1
153cd22 Email: Simplified Chinese Translations
849d559 Email: CS translation
90b7d2c Merge "Email: NB translation" into cm-10.1
94f2b5e Email: NB translation
05a5e79 Email: refactor translations
08f9192 Merge "Email: HU translation refactoring" into cm-10.1
8576237 Email: NL translations
f1769b8 Email: HU translation refactoring
195c57b Email: Update italian translation
9a2a4a0 Merge "Email : FR translation" into cm-10.1
eacc48f Merge "Email: Refactor RU translation" into cm-10.1
b7c027f Email: AF translation
dcc9aea Email : FR translation
c7582a0 Email: Refactor RU translation
d96dae1 Email: PT-BR update translations
5d18d53 Email: ES translations
93385dd Email: Refactor default translations
c41cad8 Merge "Email: Reorganize Greek translations" into cm-10.1
9d6d357 Email: Reorganize Greek translations
e865c4a avoid cursor leak in email provider
c71f465 Fix a Cursor leak
1b96aee Fix SMTP RFC violation for better interoperability
96201b0 Potential NPE in Account.
66cd438 Turkish characters show problem in addressList and subject
52fc327 email: "Exchange Services has stopped" - Rain of Exchange Javacrashes
b66a1d9 Force close_crash happened when add new mail from Email widget
0286421 Merge "Email : reorganize and add french translation" into cm-10.1
6ab6c33 Email : reorganize and add french translation
a32943d Update German translation.
fffd1c6 es_ES: Fix spanish translations
8b3ef41 Email : add french translation
4aaf60e Merge "Email: Dutch translations" into cm-10.1
bbd81ac Email: Dutch translations
51208f1 Update Russian Translation-Email-CM10.1
0a45038 es_ES: Updated spanish translations
7f1a255 Email: Fix newline (2)
8c97128 Merge "Email: Fix newline" into cm-10.1
a502f5c Email: Fix newline
5f985ff Enabling the saving of attachments
b1bd668 Email: Remove redundant lines
ce7d1eb Merge remote-tracking branch 'github/mr1.1-staging' into HEAD
cae48e1 Revert "Added missing titles"
1f1cf88 Merge "Added missing titles" into cm-10.1
c280b35 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Email into 1.1
9a8ba49 Added missing titles
69414a6 Email: Update Greek translations
f4ce104 Email: Update italian translation
0f6f04f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4c13e1c Make subject in actionbar smaller.
7320fa6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
09a0962 Use standard actionbar when possible
7ef671d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
ed06051 alias clicks on inert ActionBar modes to 'up' action
3f2566e Email: Hebrew translation
9be3515 Add CRAM-MD5 support for SMTP to email app.
6bc5c08 Merge "PT-BR: Added missing translations" into cm-10.1
4d184b8 PT-BR: Added missing translations
d274493 Email: Simplified Chinese Translations
9531c41 Added hungarian translations
382d2ce Issue 6748: Unable to download ZIP (and many other filetypes) files attached to emails
c114c21 Email: Display a more proper message when attachment has no size
9a0fbcf Email: Use */* mime/type on add_attachment
5c5e10f es_ES: Added CM translations
0d7d7ab merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
7abcd22 Import translations. DO NOT MERGE
0d3751c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3c0b8ee Change Email vibrate setting from tri-state to checkbox
4124f4a Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev
6a59dca merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
397cce4 Specify a timeout for the connection handshake
978959e Do not vibrate in vibrate mode if ringtone is silent
ec2f232 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b746309 Import translations. DO NOT MERGE
00516e5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
494d972 Fix building, the product listing in build/ wants Email2
4d8bbc0 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Email into HEAD
cc2ae32 Fix Email Widget crash.
3e7b0c1 Fix Email Widget crash.
de4a631 Import translations. DO NOT MERGE
9549fae merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
a1f2012 Fix build caused by https://googleplex-android-review.googlesource.com/#/c/252374/
d5f267e Email Widget will use startActivity instead of startService so that it works correctly from the keyguard.
e7816fa merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6ca495d Import translations. DO NOT MERGE
48c04a2 Reconcile with jb-mr1-release - do not merge
883b766 merge in jb-mr1-release history after reset to jb-mr1-dev
b8f3c0e am 5c5d3c64: Add content description to Compose button in Widget.
5c5d3c6 Add content description to Compose button in Widget.
458816b Enable Email Widget on lockscreen. Work around keyguard detection issues.
1785b17 Reconcile with jb-mr1-release - do not merge
5da9e73 merge in jb-mr1-release history after reset to jb-mr1-dev
3fea2f1 am acd8e786: Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13
2159898 Reconcile with jb-mr1-release - do not merge
acd8e78 Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13
b67ea82 merge in jb-mr1-release history after reset to jb-mr1-dev
cb80029 am 8c7f8d74: Enable Email lockscreen widget
8c7f8d7 Enable Email lockscreen widget
992df2f Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
d252350 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f7610ff Show newer/older text in toast upon long-press
1171c5e Show newer/older text in toast upon long-press
5f04488 Update Dutch translation
ce9fadc merge in jb-mr1-release history after reset to jb-mr1-dev
7e0009b Simple fix for 7381557
da98f78 merge in jb-mr1-release history after reset to jb-mr1-dev
d5c0a0e Import translations. DO NOT MERGE
969bf2b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
588b4d8 merge in jb-mr1-release history after reset to jb-mr1-dev
c99bf32 Let's enhance
ec1ccb2 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Email into aosp-merge
5c7e083 merge in jb-mr1-release history after reset to jb-mr1-dev
2cc86bc Revert the Email lockscreen widget
d746481 merge in jb-mr1-release history after reset to jb-mr1-dev
3e04e18 Make Email widget available on lock screen
cb90e5c merge in jb-mr1-release history after reset to jb-mr1-dev
968a357 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
9071805 Always call setActivePolicies() when creating SecurityPolicy
5c5b810 Force user to accept new policies
e1c41f8 Merge "Force user to accept new policies" into jb-mr1-dev
df982bd Force user to accept new policies
ac7d3eb Import translations. DO NOT MERGE
acdb953 merge in jb-mr1-release history after reset to jb-mr1-dev
e530158 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c48ee41 Import translations. DO NOT MERGE
a95ab84 DPM doesn't support hasGrantedPolicy to keyguard widgets
8e4fac4 Always call setActivePolicies() when creating SecurityPolicy
9829145 DPM doesn't support hasGrantedPolicy to keyguard widgets
2376c5e merge in jb-mr1-release history after reset to jb-mr1-dev
5ef68c2 Disable keyguard features if we're enabled and require password
12bed3a Email - Added missing Croatian translations
f73c33d merge in jb-mr1-release history after reset to jb-mr1-dev
88608cf Import translations. DO NOT MERGE
4e16fcf merge in jb-mr1-release history after reset to jb-mr1-dev
b2af6cc Import translations. DO NOT MERGE
6833295 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1868dd0 merge in jb-mr1-release history after reset to jb-mr1-dev
0678bf5 Fix build breakage.
629c46e Import translations. DO NOT MERGE
18288d4 merge in jb-mr1-release history after reset to jb-mr1-dev
8cdece2 Import translations. DO NOT MERGE
8094e07 merge in jb-mr1-release history after reset to jb-mr1-dev
e38fc80 Merge "Email: Fix another Swedish translation" into jellybean
bc47398 Merge Email1 into MR1
5307c06 Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Email into aosp
335ba2c am 986881ef: Fix multi message notifications
ee6ca4e am 35177585: Merge "Remove Imap2 from AOSP tree" into jb-ub-mail
24e1103 am 016310a0: Fix account order.
d47027b am 114e3149: Return contentUri for all attachments
bb34ef2 am 54347010: Allow legacy imap to sync
2bbb937 am 9f05983f: Merge "Prevent duplicate imap folders" into jb-ub-mail
07fa32f Email: Fix another Swedish translation
986881e Fix multi message notifications
3517758 Merge "Remove Imap2 from AOSP tree" into jb-ub-mail
0629f67 Remove Imap2 from AOSP tree
016310a Fix account order.
bcf622f merge in jb-mr1-release history after reset to jb-mr1-dev
114e314 Return contentUri for all attachments
5434701 Allow legacy imap to sync
9f05983 Merge "Prevent duplicate imap folders" into jb-ub-mail
6bbbc0d Prevent duplicate imap folders
b0d793a am c4e9ebc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
c4e9ebc Merge "Import translations. DO NOT MERGE" into jb-ub-mail
0151730 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3073a04 Import translations. DO NOT MERGE
c34081f Import translations. DO NOT MERGE
2b5e54f am 78b8c048: Add another test for "incomplete" accounts
78b8c04 Add another test for "incomplete" accounts
8218fac am 733a1146: Add id to HashCode equals()
733a114 Add id to HashCode equals()
c10a57f am b6992942: Merge "Restore Imap1" into jb-ub-mail
b699294 Merge "Restore Imap1" into jb-ub-mail
5c52385 Restore Imap1
c44d364 am 37d6afb9: (-s ours) Import translations. DO NOT MERGE
5772825 merge in jb-mr1-release history after reset to jb-mr1-dev
37d6afb Import translations. DO NOT MERGE
40f8505 Import translations. DO NOT MERGE
f5bea52 am ec0af782: Merge "Quote username and password in login command" into jb-ub-mail
ec0af78 Merge "Quote username and password in login command" into jb-ub-mail
6c477f5 Quote username and password in login command
b6b843d am 0a54d7ee: Merge "increment versionCode" into jb-ub-mail
0a54d7e Merge "increment versionCode" into jb-ub-mail
6e0816d am 652a9076: Hide reply all setting on tablets
d10f945 merge in jb-mr1-release history after reset to jb-mr1-dev
56991a7 am 4b4d984d: Merge "Correct icon for folder/account selection" into jb-ub-mail
652a907 Hide reply all setting on tablets
d4565b3 increment versionCode
4b4d984 Merge "Correct icon for folder/account selection" into jb-ub-mail
d33c8de Correct icon for folder/account selection
94f7984 am f4325491: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
d453442 am 533c4ff9: Merge "Fix Email widget preview using wrong resource." into jb-ub-mail
af6c077 am 67439a3e: Add translatable=false as required
f432549 Merge "Import translations. DO NOT MERGE" into jb-ub-mail
ce5901f Import translations. DO NOT MERGE
b6e7bfa Import translations. DO NOT MERGE
533c4ff Merge "Fix Email widget preview using wrong resource." into jb-ub-mail
67439a3 Add translatable=false as required
0a836b8 am 72d7dda9: Improve service dump a bit
72d7dda Improve service dump a bit
b2d4258 Fix Email widget preview using wrong resource.
a2679bc am 9a6ad1fa: Merge "Add bugreport dump of wake lock times" into jb-ub-mail
9a6ad1f Merge "Add bugreport dump of wake lock times" into jb-ub-mail
4639556 Add bugreport dump of wake lock times
63aafc9 am 5e1db519: Fix crash when the Email process is killed
daba753 merge in jb-mr1-release history after reset to jb-mr1-dev
5e1db51 Fix crash when the Email process is killed
c83f4fd am fb42a915: Merge "Fix crash with Email widget" into jb-ub-mail
fb42a91 Merge "Fix crash with Email widget" into jb-ub-mail
48b4864 Fix crash with Email widget
0b623fa am 58e3a2da: Merge "Return Mindy\'s senders" into jb-ub-mail
58e3a2d Merge "Return Mindy's senders" into jb-ub-mail
d6243bd am 8ff282a2: Lots of fixes to line up with new multi/single move to folder dialog.
af7d768 Return Mindy's senders
8ff282a Lots of fixes to line up with new multi/single move to folder dialog.
7048ceb am b203b2b1: Remove useless class and crazy UIDL logging
b203b2b Remove useless class and crazy UIDL logging
843e137 Don't smartsend reply inappropriately
d42afad am 887ea25e: Merge "Show display name in convo list" into jb-ub-mail
887ea25 Merge "Show display name in convo list" into jb-ub-mail
d40524b Show display name in convo list
668dd92 am eaf7e3bc: Don\'t smartsend reply inappropriately
bc5080f am 67a33ca9: Merge "Properly check for deleted messages" into jb-ub-mail
eaf7e3b Don't smartsend reply inappropriately
67a33ca Merge "Properly check for deleted messages" into jb-ub-mail
e161ca5 Properly check for deleted messages
398aff5 merge in jb-mr1-release history after reset to jb-mr1-dev
df0f27e am eb14c19e: increment versionCode
eb14c19 increment versionCode
6ef169c am d6e4c7ae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
32820ef Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d6e4c7a Merge "Import translations. DO NOT MERGE" into jb-ub-mail
11ce631 am b9929c8c: (-s ours) DO NOT MERGE Explicitly export content providers
b9929c8 DO NOT MERGE Explicitly export content providers
82ab334 Import translations. DO NOT MERGE
2d25401 Import translations. DO NOT MERGE
783f865 merge in jb-mr1-release history after reset to jb-mr1-dev
29b3a34 am a1b2b325: Revert "Export providers explicitly"
a1b2b32 Revert "Export providers explicitly"
1c469f7 am a256453a: Export providers explicitly
a256453 Export providers explicitly
60941b7 am 558a14fc: Merge "Don\'t delete smart-forward attachments" into jb-ub-mail
60061a4 am 00d17498: Merge "Make sure provider is initialized before setServicesEnabled()" into jb-ub-mail
558a14f Merge "Don't delete smart-forward attachments" into jb-ub-mail
00d1749 Merge "Make sure provider is initialized before setServicesEnabled()" into jb-ub-mail
93bb868 Make sure provider is initialized before setServicesEnabled()
4792546 Don't delete smart-forward attachments
65ca9fd am 6171a9fc: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
6171a9f Merge "Import translations. DO NOT MERGE" into jb-ub-mail
24f7456 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1a34f56 am f53dc340: Merge "Prevent infinite loops (ugh); fix list parsing" into jb-ub-mail
f53dc34 Merge "Prevent infinite loops (ugh); fix list parsing" into jb-ub-mail
d020d64 merge in jb-mr1-release history after reset to jb-mr1-dev
8fe771a Prevent infinite loops (ugh); fix list parsing
9db1132 Import translations. DO NOT MERGE
2eb1fa3 Import translations. DO NOT MERGE
f6d1772 am f81b5409: Build against the MR1 sdk
e3ecff0 merge in jb-mr1-release history after reset to jb-mr1-dev
f81b540 Build against the MR1 sdk
735463b am d59dd833: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
d59dd83 Merge "Import translations. DO NOT MERGE" into jb-ub-mail
6fff0d1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b1c8ce6 am 939d15eb: Bump version
939d15e Bump version
03de1f0 Use correct test for updating attachment contentUri
9e97979 am be84c68b: Use correct test for updating attachment contentUri
be84c68 Use correct test for updating attachment contentUri
78d8312 Import translations. DO NOT MERGE
8cb5bbf Import translations. DO NOT MERGE
d4ed6d7 merge in jb-mr1-release history after reset to jb-mr1-dev
7570548 am a98f024b: Merge "Remove duplicate classes; trim addresses in RCPT TO:" into jb-ub-mail
a98f024 Merge "Remove duplicate classes; trim addresses in RCPT TO:" into jb-ub-mail
787c534 Remove duplicate classes; trim addresses in RCPT TO:
312ee6a am d14bb107: Merge "Don\'t sync at all if 1) upsync and 2) held" into jb-ub-mail
d14bb10 Merge "Don't sync at all if 1) upsync and 2) held" into jb-ub-mail
1bcf32e Don't sync at all if 1) upsync and 2) held
826c5d5 am 885a86c4: Fix swipe settings text
885a86c Fix swipe settings text
e30dcd4 am a1464d13: Merge "Bump version" into jb-ub-mail
a1464d1 Merge "Bump version" into jb-ub-mail
b912df5 am f5ae8038: Merge "Make sure EmailContent is initialized" into jb-ub-mail
1e52815 Bump version
f5ae803 Merge "Make sure EmailContent is initialized" into jb-ub-mail
92561ec Make sure EmailContent is initialized
212cac6 am 85805115: Handle loadMore when no messages are loaded
8580511 Handle loadMore when no messages are loaded
1c6da90 merge in jb-mr1-release history after reset to jb-mr1-dev
cd38241 am a88fb327: Merge "Modify intent names" into jb-ub-mail
a88fb32 Merge "Modify intent names" into jb-ub-mail
74c79a5 Modify intent names
3500c6c am 6f40c2e7: Bump version
6f40c2e Bump version
88fa3cb am 4417adce: Don\'t clear errorMap due to upload sync
4417adc Don't clear errorMap due to upload sync
9742518 am d8b2b8ae: Merge "Add "System Folders" settings" into jb-ub-mail
d8b2b8a Merge "Add "System Folders" settings" into jb-ub-mail
266064b Add "System Folders" settings
e0c1550 Email: Correct swedish translation
cfb07ca am b41c9be8: (-s ours) Import translations. DO NOT MERGE
b41c9be Import translations. DO NOT MERGE
a6a832f Import translations. DO NOT MERGE
3361db3 merge in jb-mr1-release history after reset to jb-mr1-dev
32fcba1 am 5c9b9a44: increment versionCode
5c9b9a4 increment versionCode
38bc84a am b621f625: Merge "Don\'t reset user\'s port number in settings" into jb-ub-mail
b621f62 Merge "Don't reset user's port number in settings" into jb-ub-mail
d3f928e am 19e9291c: Merge "Use correct attachment provider authority" into jb-ub-mail
19e9291 Merge "Use correct attachment provider authority" into jb-ub-mail
665b19e Don't reset user's port number in settings
21e7e2c am 393b8595: dump is @hide; remove @Override
393b859 dump is @hide; remove @Override
7bc7ddf am 323954df: Merge "Create requireSetup attribute; use it for gImap" into jb-ub-mail
f7030e7 am 16b07e11: Merge "Use resource based mime type for application" into jb-ub-mail
323954d Merge "Create requireSetup attribute; use it for gImap" into jb-ub-mail
0413dae am af092bd5: EmailProvider dump
16b07e1 Merge "Use resource based mime type for application" into jb-ub-mail
6e5bccf Use correct attachment provider authority
807ff70 merge in jb-mr1-release history after reset to jb-mr1-dev
81b0f74 Create requireSetup attribute; use it for gImap
7e5df63 Use resource based mime type for application
af092bd EmailProvider dump
01779e1 am fdb16358: More work on FolderPicker
fdb1635 More work on FolderPicker
ba85cd6 am 8c8a68a7: Prevent looping w/ exceptions during IDLE
8c8a68a Prevent looping w/ exceptions during IDLE
c9ce90a am dc1655bc: Bump version
dc1655b Bump version
7b53e9c am 9a341d85: Merge "Improve trash folder picker upon account creation" into jb-ub-mail
9a341d8 Merge "Improve trash folder picker upon account creation" into jb-ub-mail
512b1e3 am 14e5f567: Merge "Log capabilities (w/ STOPSHIP)" into jb-ub-mail
14e5f56 Merge "Log capabilities (w/ STOPSHIP)" into jb-ub-mail
983c78e Log capabilities (w/ STOPSHIP)
2616405 Improve trash folder picker upon account creation
8c4046a am 2f589758: Merge "Clean up imap2 logging" into jb-ub-mail
2f58975 Merge "Clean up imap2 logging" into jb-ub-mail
1b864c8 am 05fdc7de: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
43736e3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
05fdc7d Merge "Import translations. DO NOT MERGE" into jb-ub-mail
41e78c1 Clean up imap2 logging
d0c2d8c am 3487ae89: Merge "Add supplementary account info to outbound google.com links" into jb-ub-mail
3487ae8 Merge "Add supplementary account info to outbound google.com links" into jb-ub-mail
cbaecbc am 1b2210b6: (-s ours) Reconcile with jb-release - do not merge
1b2210b Reconcile with jb-release - do not merge
7ba9a40 merge in jb-mr1-release history after reset to jb-mr1-dev
b8680dc am a2c28649: Bump version
a2c2864 Bump version
5b3fda1 Add supplementary account info to outbound google.com links
8d8ae02 am b210f3ad: Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail
b210f3a Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail
c0a4250 Revert "Initialize mDatabase on provider startup"
f41d00b am c0e2b147: Clear visibleLimit when folder entered
c0e2b14 Clear visibleLimit when folder entered
d061989 am d2bf25ac: Make sure body loading finishes when searching
c713035 Import translations. DO NOT MERGE
ae31923 Import translations. DO NOT MERGE
d2bf25a Make sure body loading finishes when searching
8d51344 am 7110183f: Merge "Put combined account last" into jb-ub-mail
7110183 Merge "Put combined account last" into jb-ub-mail
2651bcc Put combined account last
cce1c83 merge in jb-mr1-release history after reset to jb-mr1-dev
a0f276f am db1c8452: Handle mime encoded sender in convo list
db1c845 Handle mime encoded sender in convo list
bb3a39a am 31f53df3: (-s ours) am 8e66b6fe: Merge "Make ImapFolder locale safe"
e41172e resolved conflicts for merge of 68e66351 to jb-mr1-dev
31f53df am 8e66b6fe: Merge "Make ImapFolder locale safe"
68e6635 am 99aba18a: Merge "Make Pop3Store locale safe"
8e66b6f Merge "Make ImapFolder locale safe"
99aba18 Merge "Make Pop3Store locale safe"
0ccfd8f am 2c250860: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
ce1bd99 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2c25086 Merge "Import translations. DO NOT MERGE" into jb-ub-mail
a6d34de am 9765f7b2: Merge "Initialize mDatabase on provider startup" into jb-ub-mail
9765f7b Merge "Initialize mDatabase on provider startup" into jb-ub-mail
c869910 am 5a2b9579: Prevent possible NPE
5af5e10 merge in jb-mr1-release history after reset to jb-mr1-dev
10e5166 Merge "es_ES: Fixed translations" into jellybean
5a2b957 Prevent possible NPE
6c319d7 Initialize mDatabase on provider startup
3348d6d am 9e4556ae: Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail
9e4556a Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail
fcba7fa Revert "Initialize mDatabase on provider startup"
941e1c7 am 5bf0cef2: Merge "Show "Creating account..." dialog during account creation" into jb-ub-mail
5bf0cef Merge "Show "Creating account..." dialog during account creation" into jb-ub-mail
156bf90 am efb46b08: Merge "Clear visible limit when  entering mailbox; enable imap load more" into jb-ub-mail
fa543af am 644f172c: Merge "Initialize mDatabase on provider startup" into jb-ub-mail
88505b8 am b82437f5: Merge "Allow NULL values in genSelect" into jb-ub-mail
efb46b0 Merge "Clear visible limit when  entering mailbox; enable imap load more" into jb-ub-mail
d490f87 am 0ef02e57: Merge "Decode base64 message text" into jb-ub-mail
644f172 Merge "Initialize mDatabase on provider startup" into jb-ub-mail
b82437f Merge "Allow NULL values in genSelect" into jb-ub-mail
7a0d86c am 75909076: Merge "Fix Imap mail sending" into jb-ub-mail
77401dc am ada7dfef: Merge "Reconcile all types of local accounts in MailService" into jb-ub-mail
0ef02e5 Merge "Decode base64 message text" into jb-ub-mail
7590907 Merge "Fix Imap mail sending" into jb-ub-mail
ada7dfe Merge "Reconcile all types of local accounts in MailService" into jb-ub-mail
f53490d Reconcile all types of local accounts in MailService
6eac1c9 Show "Creating account..." dialog during account creation
cc986cf Clear visible limit when  entering mailbox; enable imap load more
33f3b0c Initialize mDatabase on provider startup
df9c1f3 Allow NULL values in genSelect
e6c576a Decode base64 message text
5abccf7 Fix Imap mail sending
8e10406 am 96e13d4d: Don\'t logout of Imap while body loading continues
96e13d4 Don't logout of Imap while body loading continues
9cc3e8e merge in jb-mr1-release history after reset to jb-mr1-dev
7a7ca1c Email: Revert change 21113
df9f077 es_ES: Fixed translations
8116f57 am b82ae909: Add support for "load more" for Imap2
b82ae90 Add support for "load more" for Imap2
e0b8fd2 am e714bb9d: Convert authorities, intents, and account manager types
e714bb9 Convert authorities, intents, and account manager types
a0a7135 Import translations. DO NOT MERGE
a5f2daf Import translations. DO NOT MERGE
6a32325 merge in jb-mr1-release history after reset to jb-mr1-dev
5d4aad9 Make ImapFolder locale safe
ae678ba am 5ac8d387: Always return correct folder capabilities
7203e4f merge in jb-release history after reset to jb-dev
0952595 merge in jb-release history after reset to jb-dev
3f645c8 Make Pop3Store locale safe

   * packages/apps/Exchange
430cff0 Avoid searching non-existent dir
44b2c19 Correct a German translation error in Exchange app
d1acb5c Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Exchange into 1.1
ecd3ae3 Exchange: calendar sync window linked to email sync window
2fd0058 Only clear sync error map on success
977cf62 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Exchange into HEAD
fcc33af Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
cb857ce Exchange: Dutch translations
8658893 merge in jb-mr1-release history after reset to jb-mr1-dev
f57bb02 Simple fix for 7381557
0325193 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ae0f5d0 merge in jb-mr1-release history after reset to jb-mr1-dev
2a1209a Fix saving contact from Exchange GAL contact
92fb55d merge in jb-mr1-factory-release history after reset to jb-mr1-dev
43e2be6 merge in jb-mr1-release history after reset to jb-mr1-dev
4acfe7e Fix stack overflow exception
658a721 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Exchange into aosp-merge
5da6fa8 merge in jb-mr1-release history after reset to jb-mr1-dev
a5afc70 Try to fix LGE crash bug
2e67daa merge in jb-mr1-release history after reset to jb-mr1-dev
4526666 Export provider
7da5a06 Merge "Rename USER_QUERY -> LIVE_QUERY" into jb-mr1-dev
edb4899 Rename USER_QUERY -> LIVE_QUERY
5b31253 Revert "cherrypick: Check for duplicated mailboxes and correct if found"
d149d00 cherrypick: Don't reset account sync key from 0 when folders are bad
75437ce Merge "cherrypick: Check for duplicated mailboxes and correct if found" into jb-mr1-dev
d661f21 Merge "cherrypick:Fix longstanding EAS battery burner" into jb-mr1-dev
327a90c cherrypick: Check for duplicated mailboxes and correct if found
aac23de cherrypick:Fix longstanding EAS battery burner
27888de Merge "cherrypick: Try to use names from time zone strings if all else fails..." into jb-mr1-dev
950435b Merge "cherry pick: Fix potential looping issue" into jb-mr1-dev
c621d4e Merge "Export provider" into jb-mr1-dev
1f341fd cherry pick: Fix potential looping issue
7b873db cherrypick: Try to use names from time zone strings if all else fails...
18bb75c Cherrypick: Sigh; new events aren't modifiable on the server
a386939 Export provider
eb2a044 merge in jb-mr1-release history after reset to jb-mr1-dev
f99e839 Import translations. DO NOT MERGE
a533cac merge in jb-mr1-release history after reset to jb-mr1-dev
b931f82 Restore MRO's Exchange
b96c48f merge in jb-mr1-release history after reset to jb-mr1-dev
7f3ecdf am 2b0a9de6: (-s ours) Import translations. DO NOT MERGE
7ec9940 merge in jb-mr1-release history after reset to jb-mr1-dev
2b0a9de Import translations. DO NOT MERGE
5998aa5 Import translations. DO NOT MERGE
16ff867 am 74af6f19: increment versionCode
fe30fc9 merge in jb-mr1-release history after reset to jb-mr1-dev
74af6f1 increment versionCode
f37d8c4 am 5e87f84d: Add translatable="false" as appropriate
5e87f84 Add translatable="false" as appropriate
fa2753c merge in jb-mr1-release history after reset to jb-mr1-dev
68e8e41 am 54cd29e0: increment versionCode
54cd29e increment versionCode
58989f0 merge in jb-mr1-release history after reset to jb-mr1-dev
e12ce3e am f1cb3d6b: increment versionCode
f1cb3d6 increment versionCode
8f097d1 Fix directory provider authority name & export provider
29ad084 am 59730a4a: Fix directory provider authority name & export provider
59730a4 Fix directory provider authority name & export provider
751f87c Make sure we send attachments when not smart-forward
1aaff0d am 045e94a5: Merge "Make sure we send attachments when not smart-forward" into jb-ub-mail
798c92b am 6a5c3435: Merge "Let Exchange run on ICS+" into jb-ub-mail
045e94a Merge "Make sure we send attachments when not smart-forward" into jb-ub-mail
6a5c343 Merge "Let Exchange run on ICS+" into jb-ub-mail
99e275d Make sure we send attachments when not smart-forward
5af7b8d Let Exchange run on ICS+
9c4d958 merge in jb-mr1-release history after reset to jb-mr1-dev
a94b7e6 am 7f29df6b: Revert "Initialize matcher in onCreate()"
7f29df6 Revert "Initialize matcher in onCreate()"
3f99d80 am 8012f8c0: Initialize matcher in onCreate()
8012f8c Initialize matcher in onCreate()
e1d42a6 am d5ce27c8: Merge "Properly handle smart-forwarded attachments" into jb-ub-mail
d5ce27c Merge "Properly handle smart-forwarded attachments" into jb-ub-mail
7e62548 Properly handle smart-forwarded attachments
73e9ec5 am 976e98bf: Lib has been renamed to calendar2; fix build
976e98b Lib has been renamed to calendar2; fix build
1ca637d merge in jb-mr1-release history after reset to jb-mr1-dev
285163e am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
f4fd55c Merge "Import translations. DO NOT MERGE" into jb-ub-mail
9950278 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
798807e am 7a4181e7: Bump version code
7a4181e Bump version code
b835d45 Import translations. DO NOT MERGE
85298b8 Import translations. DO NOT MERGE
b9ad471 merge in jb-mr1-release history after reset to jb-mr1-dev
e8e7b38 am 4feac159: Oops
4feac15 Oops
45f742e am acf857c8: Merge "Initialize EmailContent in onCreate()" into jb-ub-mail
acf857c Merge "Initialize EmailContent in onCreate()" into jb-ub-mail
56b43d9 Initialize EmailContent in onCreate()
234fff5 am 57f30d49: Sigh; new events aren\'t modifiable on the server
57f30d4 Sigh; new events aren't modifiable on the server
32557a1 am d3da696f: Bump version
d3da696 Bump version
8d1382b merge in jb-mr1-release history after reset to jb-mr1-dev
51d3ccb am c8d2b1e2: Bump version; make same as Email
c8d2b1e Bump version; make same as Email
7bd852f am ec1c0f53: Merge "Fix adapters; sigh." into jb-ub-mail
ec1c0f5 Merge "Fix adapters; sigh." into jb-ub-mail
ff6b7ee Fix adapters; sigh.
8a0d172 am 4036e054: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
9199a50 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
4036e05 Merge "Import translations. DO NOT MERGE" into jb-ub-mail
94f5d3e Import translations. DO NOT MERGE
4a4297c Import translations. DO NOT MERGE
bb7fde5 am bbafcf7d: Make sure EmailContent.init() is called on startup
bbafcf7 Make sure EmailContent.init() is called on startup
228a4fa merge in jb-mr1-release history after reset to jb-mr1-dev
32d7025 am c2dd2b18: increment versionCode
c2dd2b1 increment versionCode
7665792 am dbf33a92: Update to new Attachment getContentUri method
72b689f merge in jb-mr1-release history after reset to jb-mr1-dev
dbf33a9 Update to new Attachment getContentUri method
f58bb03 am bcc7188e: Try to use names from time zone strings if all else fails...
bcc7188 Try to use names from time zone strings if all else fails...
0bf0a17 am 0ba3de25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
0ba3de2 Merge "Import translations. DO NOT MERGE" into jb-ub-mail
8f333f4 am fd7aac1f: Fix potential looping issue
fd7aac1 Fix potential looping issue
da1eb79 Import translations. DO NOT MERGE
254c27b merge in jb-mr1-release history after reset to jb-mr1-dev
ca385e1 am a4aa555e: Merge "Revert "Revert "Fix build""" into jb-ub-mail
a4aa555 Merge "Revert "Revert "Fix build""" into jb-ub-mail
8336b2f am 8f8c4432: Merge "Revert "Fix build"" into jb-ub-mail
89a0ed7 Revert "Revert "Fix build""
8f8c443 Merge "Revert "Fix build"" into jb-ub-mail
2c2292d Revert "Fix build"
4d9814e am 90da1699: Merge "Fix build" into jb-ub-mail
90da169 Merge "Fix build" into jb-ub-mail
a24dd1b Fix build
03ad44e am a3602760: Bump version code
a360276 Bump version code
a765747 am 14a69ae1: Move product strings to build/res
14a69ae Move product strings to build/res
a225421 merge in jb-mr1-release history after reset to jb-mr1-dev
bf446dc am 527b5952: Fix longstanding EAS battery burner
527b595 Fix longstanding EAS battery burner
87b1e77 resolved conflicts for merge of 2bf91acb to jb-mr1-dev
2bf91ac Convert authorities, intents, and account manager types
3e9bf71 Fix problem w/ all-day event in invitation
005bf7f am 92f04b67: Fix problem w/ all-day event in invitation
92f04b6 Fix problem w/ all-day event in invitation

   * packages/apps/Gallery
f45e536 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Gallery into HEAD
5b973f3 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Gallery into aosp-merge

   * packages/apps/Gallery2
3c851e8 Merge "Fix activity stack when restarting the screen nail" into cm-10.1
77f2afb Typo in manifest
1453b10 Gallery : Filter picasa specific options
c8e463d Fix activity stack when restarting the screen nail
3ece4d2 Fix activity stack when restarting the screen nail
82215dd Revert "Revert "Add storage selection (2/2)""
6d94354 Merge "Gallery2: ES translations" into cm-10.1
89fb182 Merge "Spline: limit control point X co-ordinates to the graph area." into cm-10.1
72bba89 Gallery2: ES translations
b58bcb9 Gallery2: Refactor default translations
0820181 Spline: limit control point X co-ordinates to the graph area.
1a9cc7c Gallery2: ES translations
27f80c3 Revert "Add storage selection (2/2)"
bffa111 Add storage selection (2/2)
835d769 es_ES: Fix spanish translations
fb97914 [2/2] Camera: add software HDR rendering
2bc71d8 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Gallery2 into 1.1
982d7f3 Gallery2: Filtershow toast translations
91eccaa Gallery2: Localize strings
cf85adb Some changes added to compile and run with Java 6 and Java 7.
3afe270 Gallery: Removed "Settings" item from menu. (GallerySettings are empty)
dde77bd Gallery: Removed "Settings" item from menu. (GallerySettings are empty)
643443e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
d4715aa am 5b188c94: Disabled further filters after Tiny Planet.
5b188c9 Disabled further filters after Tiny Planet.
f1a6858 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f6bc102 am 695e1aa0: Force a layout pass if the display rotation changes
695e1aa Force a layout pass if the display rotation changes
2ebe99a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
30c71e7 am db99a10b: Fix NPE in PhotoPage
db99a10 Fix NPE in PhotoPage
b5f672a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1d84ed0 am 870e62ac: Handle the case where the orientation column is not here...
870e62a Handle the case where the orientation column is not here...
527b201 am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
7a53773 Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
6bf226e Prevent Camera UI in Gallery
a8ecc0b am c6fe9f7d: Remove unneeded border asset
c6fe9f7 Remove unneeded border asset
0fcf256 Gallery : Remove LOCAL_SDK_VERSION
17290ae am 04df59eb: Merge "Change themes" into gb-ub-photos-arches
04df59e Merge "Change themes" into gb-ub-photos-arches
d10468b Change themes
bf3e6ab merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
cad5c1a am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
599393e (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
8c592dc am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
6502545 Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
5d834ce Added dashed diagonal for crop.
992d32d am 39d46790: Fix transparency issue under the spinner.
39d4679 Fix transparency issue under the spinner.
466f3d9 am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)
0a624bb Fix potential crash (regression introduced with fix for 7406402)
33a487f am 6d867ce0: Set crop ratio to unconstrained by default.
6d867ce Set crop ratio to unconstrained by default.
83705e9 am 205d0cdf: Fix overdraw the correct way...
205d0cd Fix overdraw the correct way...
85135c1 am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
6e9123a Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
b25cb64 am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
68e4ae6 Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
69a77e9 am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
3507b92 Merge "Add new borders assets" into gb-ub-photos-arches
48b29c8 Add new borders assets
a12b354 am cd84d676: Fix history panel overlap
cd84d67 Fix history panel overlap
9cd7308 Fix overdraw in FilterShow activity
78cabea Fix flashing in geometry panel
e4b3e7a am 987bc8aa: Fix wrong colors in Curves
e0a22a0 am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
987bc8a Fix wrong colors in Curves
d24fdf6 Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
17b8c51 am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
7a36d42 Merge "Added locking to ImageLoader." into gb-ub-photos-arches
a8a9c93 am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
e5b979e Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
952144d Fix moving points in the Curves editor
c22c429 am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
5d2227a Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
2380d02 Added locking to ImageLoader.
9dd37b6 am 6a94446d: Minor fix for some FP rounding errors in crop.
6a94446 Minor fix for some FP rounding errors in crop.
a938efc am 3c6a0610: Remove orientation compensation
3c6a061 Remove orientation compensation
f2d922a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
ed3ac46 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Gallery2 into HEAD
c0e0779 am c0c7418a: Import translations. DO NOT MERGE
d16c2c9 am c6e93291: (-s ours) Import translations. DO NOT MERGE
2ccc425 Import translations. DO NOT MERGE
c0c7418 Import translations. DO NOT MERGE
c6e9329 Import translations. DO NOT MERGE
0b01476 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
5e88c74 am 18b38883: Guard tiles by synchronized block.
e034b47 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
18b3888 Guard tiles by synchronized block.
3253b26 Reconcile with jb-mr1-release - do not merge
53d53cf Added system to build LegacyCamera if specified
ccddd6f merge in jb-mr1-release history after reset to jb-mr1-dev
bd20334 am 8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1b488e2 am 46281de7: Import translations. DO NOT MERGE
f26cba6 am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
f912146 am b0aae659: (-s ours) Import translations. DO NOT MERGE
b818326 Import translations. DO NOT MERGE
8182ed3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
139efdb Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
f5974dc Import translations. DO NOT MERGE
6694bb7 Import translations. DO NOT MERGE
46281de Import translations. DO NOT MERGE
b0aae65 Import translations. DO NOT MERGE
b7a115c Reconcile with jb-mr1-release - do not merge
56a58de merge in jb-mr1-release history after reset to jb-mr1-dev
4c1614b am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
8253c35 reduce size of tiny planet if malloc fails - DO NOT MERGE
4cdb225 reduce size of tiny planet if malloc fails
d754504 Reconcile with jb-mr1-release - do not merge
7cf5542 merge in jb-mr1-release history after reset to jb-mr1-dev
3375b22 am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2a8405d Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5636617 Reconcile with jb-mr1-release - do not merge
39758e2 merge in jb-mr1-release history after reset to jb-mr1-dev
a6bb171 am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
75bf003 am 88571794: am 9ec5de9d: Fix scenario where launching Gallery launches Camera
da700ab am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
8857179 am 9ec5de9d: Fix scenario where launching Gallery launches Camera
85d20a0 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
4dd6c53 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
a9c603e Import translations. DO NOT MERGE
134e1c9 Import translations. DO NOT MERGE
9ec5de9 Fix scenario where launching Gallery launches Camera
6430623 Revert "Added system to build LegacyCamera if specified"
530ec55 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2a7748a merge in jb-mr1-release history after reset to jb-mr1-dev
78b21f3 am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
954afb2 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
613df30 Fix the remaining black blip in secure camera transition.
fad9479 merge in jb-mr1-release history after reset to jb-mr1-dev
5c00984 am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
70fb377 am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
b41864f Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
5bfc65c am f350beb8: (-s ours) am 3252800c: (-s ours) Import translations. DO NOT MERGE
f350beb am 3252800c: (-s ours) Import translations. DO NOT MERGE
19ded6d Lock icon in secure album should redirect to gallery after unlock.
ca6b4f8 Import translations. DO NOT MERGE
ca76355 Import translations. DO NOT MERGE
3252800 Import translations. DO NOT MERGE
11cb57d merge in jb-mr1-release history after reset to jb-mr1-dev
53e69d6 am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
bd52f5e am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
25fab80 Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
306ec5f am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
77262bd am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
40bb715 Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
d1dbc51 am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore
452ce86 am 769d38db: Fix tiny planet not using XMP metadata anymore
78ea143 Fix extra gray item in secure album.
3935ca3 Jump to lockscreen in secure album if tap on video
d60349f merge in jb-mr1-release history after reset to jb-mr1-dev
769d38d Fix tiny planet not using XMP metadata anymore
051b6cd am 8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
af479cb am f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
8405f65 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f09fa2b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
990cdc3 am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
692a853 am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
c350cd2 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
262c7bd Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
bfd7788 am a65e41a8: (-s ours) am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
a65e41a am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
dc304a7 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
8d0392d Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
585638c am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest.
88cef18 am 471d8986: Add keyguard camera widget meta-data to gallery manifest.
471d898 Add keyguard camera widget meta-data to gallery manifest.
754f658 merge in jb-mr1-release history after reset to jb-mr1-dev
04024d6 am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
0514c28 am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
682eff9 Import translations. DO NOT MERGE
7575e00 Import translations. DO NOT MERGE
f4e1641 Import translations. DO NOT MERGE
8a99048 Import translations. DO NOT MERGE
ca0922a Import translations. DO NOT MERGE
6b44329 Import translations. DO NOT MERGE
f675cd1 Add a triangle to the popup button view
589381b Change protection level for GALLERY_PROVIDER to signatureOrSystem
2f09f14 am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
3245b90 am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
310db39 Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
1f57b48 DO NOT MERGE: Do not set the background to null for video.
368127e am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
3ac3cdd am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
c7536cf Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
59e2383 am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
14a5342 am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
aa8228a Merge "Don't use an album for UriImages." into gb-ub-photos-arches
4cbb98e merge in jb-mr1-release history after reset to jb-mr1-dev
05da3f5 Show sync error toast only when both loading and syncing are done.
7db87e5 Don't use an album for UriImages.
ff601b2 am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
2bd00f7 am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1a2512c am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
06e7810 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
115299f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
38c5d92 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
8d6f9c6 merge in jb-mr1-release history after reset to jb-mr1-dev
ded6d0f am b3e7d7d8: am dc03ae14: Reset rotation flag
b3e7d7d am dc03ae14: Reset rotation flag
dc03ae1 Reset rotation flag
2147266 am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches
ddc5404 am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches
9899004 Merge "Fix zooming position" into gb-ub-photos-arches
d80728f Import translations. DO NOT MERGE
6c9a804 Import translations. DO NOT MERGE
1087c47 Import translations. DO NOT MERGE
6f444bb am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter
031a074 am 17540e58: Do not copy XMP data if it has TinyPlanet filter
17540e5 Do not copy XMP data if it has TinyPlanet filter
cbf27c9 am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE
3540bf0 am b3e89cab: (-s ours) Import translations. DO NOT MERGE
2f83017 Fix zooming position
fbab7ba am 49af06e2: (-s ours) Import translations. DO NOT MERGE
6898348 Import translations. DO NOT MERGE
b3e89ca Import translations. DO NOT MERGE
49af06e Import translations. DO NOT MERGE
4ecaa68 am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ebe62dc Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
5ac0bda Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
fc8e6db am 10f64ff1: (-s ours) am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
10f64ff am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
798ec54 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
f2f31a6 am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
adfcb00 am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6d9d8e3 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
8275abe am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
1cf344e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5583758 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
c2931f8 am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet
33d33c7 am 2d2b69b0: Fix rounding issue affecting TinyPlanet
2d2b69b Fix rounding issue affecting TinyPlanet
92503c9 am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
e5ac5d0 am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
4fc2db3 am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
d40d73e merge in jb-mr1-release history after reset to jb-mr1-dev
90af32f am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
d2a1f33 am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
a0fe81a Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
26cfff7 Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
f245d2b am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
591974b Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
c438433 Show panoViewer icon after "Back" from viewer
9f039e3 am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.
6027d76 am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.
178bb7a merge in jb-mr1-release history after reset to jb-mr1-dev
af0dc7f change thumbnail and reset behaviour
b6d4949 Remove black borders in Manta LightCycle capture after orientation change.
f1a99b9 am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
2c8a246 am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
8887036 Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
d9f4bd8 Changed rotated display parameter increments to 90.
f1d6566 am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
38e64b2 am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
10f975a Merge "Add proxy launcher" into gb-ub-photos-arches
ef9cf18 am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
d58b942 am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
798f4a9 Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
04d324e Fix the black lines near edge of thumbnails
56553ce Import translations. DO NOT MERGE
e3efc86 Import translations. DO NOT MERGE
2be09a9 Import translations. DO NOT MERGE
c964e75 Import translations. DO NOT MERGE
dcf4473 Import translations. DO NOT MERGE
3d4bfbc Import translations. DO NOT MERGE
149b516 am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror
8fe5c75 am 8d8cdf7f: Fix colors in rotate and mirror
8d8cdf7 Fix colors in rotate and mirror
c11b4c8 am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches
7dcaeec am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches
8b3ce9b Merge "Fix crash when showing history" into gb-ub-photos-arches
f0eb72e Fix crash when showing history
f4651c6 Do not add crop into preset if in inital setup
aad5aa6 am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
45dfd43 am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
635aab5 Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
6966406 am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
7849722 am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
24f2885 Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
0385a1a Hold WakeLock for batch delete operation
a2a4c9a Do not add crop into preset if in inital setup
f85d974 Add proxy launcher
62b4605 am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
c62b066 am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
485797d am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
6106c83 Merge "Add loading spinner" into gb-ub-photos-arches
dd7139b am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
5388677 Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
00914f5 Add loading spinner
07b70a5 Handle 360 panorama specific MIME type.
348b64a am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches
eee46d7 am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
bdd2191 am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches
812d65b am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
4164fab Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
d72971e Merge "Fixed crop intent." into gb-ub-photos-arches
7f99955 Fix issue where aspect bounds don't get applied.
5aa454b Fixed crop intent.
dc87b33 am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
1ff4d0f am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
15aff7c Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
22e8044 Fix conflict with other build fix
38e5082 merge in jb-mr1-release history after reset to jb-mr1-dev
b83e363 am f38cb998: Fix conflict with other build fix
8ee8208 am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
f38cb99 Fix conflict with other build fix
d43a8f9 am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
6cfd3b8 Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
559d76f am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches
a31708c am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches
0c7e8aa Merge "Fix build." into gb-ub-photos-arches
1c4fafe am 17c550d3: Merge "Fix build" into jb-mr1-dev
17c550d Merge "Fix build" into jb-mr1-dev
9f4d5f1 am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor
6585f08 Fix build.
a36cc0e am 8bc296e2: Fix crash when starting filtereditor
c7a8d81 Fix build
1d45da5 Tagged strings in XML with translation info.
8bc296e Fix crash when starting filtereditor
d5346b3 Get rid of black lines near edge of thumbnails
9b12b99 am c6b77275: am 71c17775: Force renderring request for Camera Animation.
c6b7727 am 71c17775: Force renderring request for Camera Animation.
71c1777 Force renderring request for Camera Animation.
9ed1166 am dff8cf82: am dffe6a6f: Fix default for tiny planet
dff8cf8 am dffe6a6f: Fix default for tiny planet
e3642a3 am 73a2ad06: am e7a71372: Fix update view
73a2ad0 am e7a71372: Fix update view
dffe6a6 Fix default for tiny planet
e7a7137 Fix update view
d71a718 Fix tiling effect when open a photo.
d491af0 am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches
d4c9319 am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches
ea3c51f Merge "Remove the old photo editor" into gb-ub-photos-arches
fb49447 am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
2df8a18 am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
b13e178 Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
a9bc6de am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
e1de865 am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
4a60144 Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
13b2fd3 Fixed blackscreen when launching crop from menu.
c6b4ecf am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view
0445139 Fixes TinyPlanet crashed due to too excessive memory usage.
dd12e5b am 2c6ea941: Add rotation to tinyplanet view
50116ff Remove the old photo editor
2c6ea94 Add rotation to tinyplanet view
e8df5a6 am 6bedee87: am 7592704e: Fixes UI stuff
6bedee8 am 7592704e: Fixes UI stuff
6f5713e merge in jb-mr1-release history after reset to jb-mr1-dev
7592704 Fixes UI stuff
0a82481 am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches
5122c99 am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches
ecbdca3 Merge "Initialize the modified date correctly." into gb-ub-photos-arches
a19301b am 6cea6759: am 0a23b42e: Change background and panel colors
6cea675 am 0a23b42e: Change background and panel colors
0a23b42 Change background and panel colors
89c755c Initialize the modified date correctly.
f254567 am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
baffd01 am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
86282c8 Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
d2173fc am 1376c4dc: am d49d5320: Move loadBitmap to async task
1376c4d am d49d5320: Move loadBitmap to async task
d54825d Fix attempted uploading of recycled tiles
d49d532 Move loadBitmap to async task
a8227bb am f77721af: am 5bd00332: Launch built-in camera app via filmstrip
f77721a am 5bd00332: Launch built-in camera app via filmstrip
5bd0033 Launch built-in camera app via filmstrip
0b549f6 am cc33fd6d: am eb6a24e1: Took out aspect ratio switching.
cc33fd6 am eb6a24e1: Took out aspect ratio switching.
eb6a24e Took out aspect ratio switching.
fbe416a am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
2281b68 am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
ca05711 Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
98ba1a5 Save the image when applying tiny planet
9da2364 am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
0b8c145 am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
de00ad0 Merge "limited the size of textures to 2048" into gb-ub-photos-arches
20ae55e limited the size of textures to 2048
624ad6d am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
5b41962 am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5c9c8ac am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
03470f4 am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
2fc6e3a am f3958f87: am adee31f0: Use TiledTexture for thumbnails.
a03998c am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.
b004a6f am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.
f60139c am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
c0c5c13 am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
c3d2b08 am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
d8ddd8d am c3a48597: am f46da69a: Increased touch tolerance in cropping.
a0d8436 am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
a1d04a4 Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
b48c872 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5116f2f am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
a4e538e Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
9495843 Do not show bottom controls when undo bar is visible
51881e0 am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
f4a7326 Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
e1036a5 Import translations. DO NOT MERGE
924589a Import translations. DO NOT MERGE
a141bf7 Import translations. DO NOT MERGE
213e9a2 merge in jb-mr1-release history after reset to jb-mr1-dev
f3958f8 am adee31f0: Use TiledTexture for thumbnails.
adee31f Use TiledTexture for thumbnails.
c2a8d0a merge in jb-mr1-release history after reset to jb-mr1-dev
b682706 am c60752b2: Use XMP meta-data for correct tiny planets.
c60752b Use XMP meta-data for correct tiny planets.
1d86603 am eb75699b: Fixed scaling factor for ImageShow and rotations.
784047b merge in jb-mr1-release history after reset to jb-mr1-dev
eb75699 Fixed scaling factor for ImageShow and rotations.
3ad7bbc Do not show Camera placeholder when not appropriate
5a093c6 am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
842257c am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
3fb2007 Merge "Fix so mirror gets applied." into gb-ub-photos-arches
d3aebee Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
75bfc68 Fix so mirror gets applied.
413c710 am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
5d3e665 Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
3d4f2c7 Support XMP data, fixed read file on another thread
c3a4859 am f46da69a: Increased touch tolerance in cropping.
f46da69 Increased touch tolerance in cropping.
5b1e444 Stay in AlbumPage when dismissing a popup from AP
2fe28fc am bdfccda8: am a4122499: Reworked crop/transform UI.
bdfccda am a4122499: Reworked crop/transform UI.
522ea18 merge in jb-mr1-release history after reset to jb-mr1-dev
a412249 Reworked crop/transform UI.
ea4097c am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet
beda88a am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip
4b2c4ec am 67fefdb9: add support for black and white filters, add rotation API to tiny planet
c67bc34 am a850a543: Fix jank when launching editor from Camera filmstrip
67fefdb add support for black and white filters, add rotation API to tiny planet
a850a54 Fix jank when launching editor from Camera filmstrip
7c30dc0 am f22aa1a2: am 41a3a3be: Fix slider layout
f22aa1a am 41a3a3be: Fix slider layout
41a3a3b Fix slider layout
808a586 am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
590acf8 am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
a482d85 am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
94fa056 am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
cb993ff Merge "Express the borders size in percentages" into gb-ub-photos-arches
d6453ed Merge "Fix NPE" into gb-ub-photos-arches
0827ebf am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
71647c7 am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
7d7f91e Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
e6c566e Fix NPE
bc65ad4 merge in jb-mr1-release history after reset to jb-mr1-dev
30fd4b4 am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
bd4ea01 am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
f129cb7 Express the borders size in percentages
ea63602 Merge "Hide the history panel on rotation" into gb-ub-photos-arches
231fe15 Fix NPE in detecting panoramas.
a9bc8ef Hide the history panel on rotation
22fae18 am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
25d08e2 am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
a681f36 Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
7a5dedf Make sure we use xmp_toolkit from external instead of the precompiled JAR.
0575703 am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves
bc9d4cc am 5d7e98f7: Fix another potential crash in Curves
5d7e98f Fix another potential crash in Curves
4626ebd am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
0b44017 am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
361f623 Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
fb90fd6 Fix flickering in geometry panel
75a448e am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
f30096b am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
c162c8b Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
b8f4ea3 am e5a3ff76: am a9f280f9: Add copyright notices
e5a3ff7 am a9f280f9: Add copyright notices
c02be7d Show Panorama viewer button in filmstrip mode
a9f280f Add copyright notices
c54c783 am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves
cdaa77d am ec995b6b: Fix slow / jerky tracking in Curves
ec995b6 Fix slow / jerky tracking in Curves
cd35c2f am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
488547b am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
2569df2 Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
b2fb154 am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
3bfbae1 am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
24af89b Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
3152994 Shows filtered images in geometry modules and comparison.
a11d5c1 Ensure photo sphere icon shows for panoramas.
0f40db8 am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE
e631995 am caace51d: (-s ours) Import translations. DO NOT MERGE
306176f am 7c08064b: (-s ours) Import translations. DO NOT MERGE
69cec70 Import translations. DO NOT MERGE
caace51 Import translations. DO NOT MERGE
7c08064 Import translations. DO NOT MERGE
7c2e0b8 merge in jb-mr1-release history after reset to jb-mr1-dev
5790076 am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
ea7366a am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
5fbfe6f on entry check if Tiny Planet if not remove UI
f7c1c58 am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
4a138a8 am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
6377075 Merge "Add activity-alias for video camera" into gb-ub-photos-arches
6377a7e am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
0df51da am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
afa5ac4 Merge "Minor transition tweaks" into gb-ub-photos-arches
574be81 am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
7ad3eb2 am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
3a64ad3 Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
b1b0ab9 Minor transition tweaks
2f060cc Show panorama thumbs in Gallery grid view
6afba64 merge in jb-mr1-release history after reset to jb-mr1-dev
c09daea am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
23cfddb am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
38d2956 am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
bdc0f6f Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
fdfced2 am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
ff4e046 Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
b75f5de Drive GLRootView with Choreographer
20a9181 am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
b21c127 am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
e96e907 Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
2bb9b8c Add activity-alias for video camera
6d9a6ff am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
91814c2 am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
168db2f Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
b2993d2 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
cc6ad82 Scroll to placeholder in gallery filmstrip launches camera
1b73272 am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
cfbbe15 am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
3536bd3 Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
d5d4246 am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
f227257 am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
58d326e Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
541b556 am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
1d25a68 am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
e2dd511 am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
73c89b4 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
2ed1570 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5eeb17f Increase album label size on high-res screens
4ed09a1 Fix geometry xforms & minor bug.
cb3a3da Add null-check for StitchingServiceProvider.
e7e4f11 am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
82a7226 am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml.
3434759 am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
85930f9 am 0a32b7af: Fix to ensure visible history adapter strings are from xml.
1dace57 Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
0a32b7a Fix to ensure visible history adapter strings are from xml.
48129f3 Better transition between Gallery and editor
2d61ca9 am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
cd80141 am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
51e5b71 Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
e24330a Import translations. DO NOT MERGE
fdcb71a Import translations. DO NOT MERGE
e6cacd1 Import translations. DO NOT MERGE
8ff2dd7 merge in jb-mr1-release history after reset to jb-mr1-dev
8374ab7 am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
b96be14 am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
e42eca3 Merge "Tweak transition animations" into gb-ub-photos-arches
a41c877 Tweak transition animations
e686a42 Move new exif lib to gallerycommon.
23e58b3 Fix the undo/redo/reset menu item state
7741a8e am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up
e461440 am c778aab1: Prevent unveil direction to change as long as no touch up
c778aab Prevent unveil direction to change as long as no touch up
286af73 am e54e5002: am 15a056e3: Fix crash in Curves module
e54e500 am 15a056e3: Fix crash in Curves module
15a056e Fix crash in Curves module
4e612a3 am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten
2f4ec4f am 104165f1: Fix several issues with crop/straighten
104165f Fix several issues with crop/straighten
1684248 am afc8c49f: am 4d276f33: Only translate the main panel if we have to.
afc8c49 am 4d276f33: Only translate the main panel if we have to.
4d276f3 Only translate the main panel if we have to.
25c35df am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
b1b1b8f am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
267c4c6 Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
0c0e97e merge in jb-mr1-release history after reset to jb-mr1-dev
eae7682 am 5d4ba127: am 2daced6b: Fix for active action bar in camera
5d4ba12 am 2daced6b: Fix for active action bar in camera
dd9c5ca Added system to build LegacyCamera if specified
2daced6 Fix for active action bar in camera
3f8990b am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter.
a4c85fc am 2f879102: Adds a tiny planet (stereographic projection) image filter.
2f87910 Adds a tiny planet (stereographic projection) image filter.
172b1b6 am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet
e6f7fe7 am e9c55b28: Add the infrastructure to support Tiny Planet
c908d79 am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip
0def633 am 41b3cff6: Fix delete and undo behavior on filmstrip
e9c55b2 Add the infrastructure to support Tiny Planet
41b3cff Fix delete and undo behavior on filmstrip
4ff1732 am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
be53236 am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
3926a68 Merge "Improves swipe gesture" into gb-ub-photos-arches
f70aaf1 merge in jb-mr1-release history after reset to jb-mr1-dev
1b5a21d am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode.
f7403a5 Improves swipe gesture
6e80670 am 4dd4d80a: Remove progress bar when switching to grid mode.
4dd4d80 Remove progress bar when switching to grid mode.
23d7dd4 am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches
ddb30c5 am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches
4883daf Merge "Change number of album rows on large screens" into gb-ub-photos-arches
21cb756 am 921b0a70: am ea78390e: Re-enable crop for new panorama
921b0a7 am ea78390e: Re-enable crop for new panorama
ea78390 Re-enable crop for new panorama
c6381a2 am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
9149188 am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
b48d73d Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
239bc47 am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
ea57ad4 Change number of album rows on large screens
5ae82e1 am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
5e1709a am f795b403: am b037754e: Fix sharing state in Gallery ActionBar
0844137 Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
f795b40 am b037754e: Fix sharing state in Gallery ActionBar
e3ac744 Saner behavior when deleting in filmstrip mode
b037754 Fix sharing state in Gallery ActionBar
11dd763 merge in jb-mr1-release history after reset to jb-mr1-dev
00d64dd Fix geometry xforms & minor bug.
2f7e299 am 0f327c32: am c5590eb1: Improves Curves & Crop UI
0f327c3 am c5590eb1: Improves Curves & Crop UI
c5590eb Improves Curves & Crop UI
a175392 am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
c0ecc70 am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
4b6c20d Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
52e44d2 am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
5128305 am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
b42ea02 Merge "Fix Gallery crash" into gb-ub-photos-arches
b07da38 am 44adb1ee: (-s ours) am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
44adb1e am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
a680a0c Adding support for tiny planet in gallery
35e7b4a Fix Gallery crash
9baf2fd DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
5fd5a8b am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
856ec7e am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
7970485 Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
d2f8bc0 am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos
5415b4c am 014a111f: Save XMP & Exif data on edited photos
1bde451 am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history
8f6e1dc am d7899c56: Fix undo/redo/back button behaviour with effects and enable history
014a111 Save XMP & Exif data on edited photos
d7899c5 Fix undo/redo/back button behaviour with effects and enable history
c29588d Do not show "Filmstrip view" text when photo is fullscreen
39f548a am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
e6e10e3 am f52d90a1: am 60d25279: Handle screen rotation
b69af65 am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
f52d90a am 60d25279: Handle screen rotation
0745eba Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
4b4dbd2 Remove panorama checks from supported operations.
60d2527 Handle screen rotation
a15b519 am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
9967973 am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
c6ea040 Merge "Fix broken build" into gb-ub-photos-arches
d259438 Fix broken build
5206cc5 am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
3234d83 am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
ff5061c am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
255dad6 am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
4aad896 Merge "Hide curve channel picker" into gb-ub-photos-arches
0136dc7 Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
33e58a6 Hide curve channel picker
26e119c Various transition tweaks/fixes in Gallery
8bbc73f am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter.
e3106a8 am 2576a29c: First cut at a skeleton for the TinyPlanets filter.
28c4d6b am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
aae561e Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
2576a29 First cut at a skeleton for the TinyPlanets filter.
d69d5b6 am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
7b474a2 am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
08e6b86 Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
41a99ab Fix for initial edited picture is gray
4adc279 am bc1091bf: am eb4a9359: Fixed initial aspect button text.
bc1091b am eb4a9359: Fixed initial aspect button text.
eb4a935 Fixed initial aspect button text.
453ec00 remove old fashioned Dream, no longer supported
7218147 am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
7ad1b75 am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
ed22e43 Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
01609bc merge in jb-mr1-release history after reset to jb-mr1-dev
2709de5 am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
ab81203 am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
12a6e77 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
19460c5 am 6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6e64dcf Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
8cd8a93 am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
cc70347 am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
737552d Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
1febb98 am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album
637a7f1 am 0addfc7f: Save edited picasa to "Edited Online Photos" album
0addfc7 Save edited picasa to "Edited Online Photos" album
be7c16d am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.
5d59655 am ef8597fe: Fixed disappearing aspect ratio button.
ef8597f Fixed disappearing aspect ratio button.
4831c74 Big refactor, additions to state transition animations
1fd563a am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
80e6218 am 193c3f0c: am 3518ff57: Merge "Added support for crop actions.  Changed overflow menu to use new editor." into gb-ub-photos-arches
0411476 am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
193c3f0 am 3518ff57: Merge "Added support for crop actions.  Changed overflow menu to use new editor." into gb-ub-photos-arches
6df6841 Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
3518ff5 Merge "Added support for crop actions.  Changed overflow menu to use new editor." into gb-ub-photos-arches
5acccef am e12e6962: am da974d84: fix crash from configurable slider ranges
e12e696 am da974d84: fix crash from configurable slider ranges
4f767e1 Update video editor actionbar background assets
63926d2 Added support for crop actions.  Changed overflow menu to use new editor.
da974d8 fix crash from configurable slider ranges
d0b53c0 am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.
1056ce1 am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.
87ad37b Import translations. DO NOT MERGE
569b468 Import translations. DO NOT MERGE
43b906d Moved many strings to xml. Changed UI filter order. Renamed things.
9d8e7da merge in jb-mr1-release history after reset to jb-mr1-dev
272546b am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
abe9628 am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
de8dbdf Merge "fix rotating normal images" into gb-ub-photos-arches
8e71835 am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
21c91bf am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
ef87709 Merge "Fix back button behaviour" into gb-ub-photos-arches
d6d9db9 am d07026bf: am 57731ee2: Only fade out if texture creation succeeded
5555069 Fix back button behaviour
d07026b am 57731ee2: Only fade out if texture creation succeeded
57731ee Only fade out if texture creation succeeded
c2c0b1b am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
d0ff9e6 am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
f71589e am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
07c2c44 am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
72b0fbe am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
e5da585 fix rotating normal images
4104415 Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
77a8da7 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
55ec71e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3ad462d am 24958c5d: Change double tap scale from 1.5 to 1.0
1098a18 Adding accessor methods for camera latency vars.
24958c5 Change double tap scale from 1.5 to 1.0
f38a686 am 95404c66: Fix UI stuff
95404c6 Fix UI stuff
47c98b3 am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches
eb321f7 Merge "rotate images before saving" into gb-ub-photos-arches
1c38d44 Add read URI permission to intent returned for GET_CONTENT
72e6392 am e3b50f1b: Adds GMS Core PanoramaClient to Gallery
d53bfbf rotate images before saving
e3b50f1 Adds GMS Core PanoramaClient to Gallery
7bc0a52 am 3038d014: add support for configurable slider ranges
3038d01 add support for configurable slider ranges
ad3f626 am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
2f54ad4 am 178a1c11: Fixed flip (mirror) orientation.
34c807c Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
18dc039 merge in jb-mr1-release history after reset to jb-mr1-dev
178a1c1 Fixed flip (mirror) orientation.
8a3a000 am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
a69a86d Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
ac351f4 am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches
a88bd1c Merge "Update empty placeholder asset" into gb-ub-photos-arches
856ab5b Update empty placeholder asset
c57afc7 am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
a05bf47 Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
1f7c5d1 Update Camera album overlay icon asset
f99791b am e20cc0cb: Add blue highlight when tapping 360 panorama button
ca181a6 Add permission to GalleryProvider.
e20cc0c Add blue highlight when tapping 360 panorama button
0f7dc6e Added fixed aspect ratio support for cropping.
46720ce am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
74d5dfd Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
324a780 am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
2b54389 Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
4d16deb merge in jb-mr1-release history after reset to jb-mr1-dev
4ce4841 Add hook to manipulate SurfaceTexture transform
5585826 Consistent animations & up button behavior in Gallery
3dccbdd am e34a5a5e: Fix when we cannot load an image
e34a5a5 Fix when we cannot load an image
3f89f75 am 20fb632c: prevent original now acts like any other FX filter
20fb632 prevent original now acts like any other FX filter
62f1fa3 am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches
374c3c8 Merge "Fix curves tool" into gb-ub-photos-arches
3992ae6 Fix curves tool
119ea22 am b7a0b092: Make save button in video trimming consistent
2acc5dc Import translations. DO NOT MERGE
be7bd19 Import translations. DO NOT MERGE
b7a0b09 Make save button in video trimming consistent
e56b51b Fix build
48bb7c0 am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches
d95752a Fix SRI Pano orientation
ea3c037 Merge "Update save button in photo editor" into gb-ub-photos-arches
a13bb24 Update save button in photo editor
85f2f5e am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches
b9c316a Merge "filters now support orientation" into gb-ub-photos-arches
b894202 filters now support orientation
8a4a4cd am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches
c7d9003 Merge "Correct toast text for clarity" into gb-ub-photos-arches
0a85e59 Correct toast text for clarity
33cde20 merge in jb-mr1-release history after reset to jb-mr1-dev
c07b937 am 84440670: Remove old camera classes.
8444067 Remove old camera classes.
4a03e18 am 030f8dad: Fixes bugs in TiledTexture.
030f8da Fixes bugs in TiledTexture.
4e13f7b am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
ff02541 Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
94dbd96 am a38801ed: Merge "Fix build" into gb-ub-photos-arches
a38801e Merge "Fix build" into gb-ub-photos-arches
ea9e881 Fix build
c80b4f8 am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches
80789c0 Merge "fix for the cache" into gb-ub-photos-arches
f2bc13f fix for the cache
cc7731a am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
c42bb22 Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
2f17145 am b1a28418: Fix SRI Pano orientation
b1a2841 Fix SRI Pano orientation
710c18b Update the assets of unlock and camera icons in filmstrip.
9121776 Cherry-pick of 092fd92 to fix bug 7344730 also.
1413a6e merge in jb-mr1-factory-release history after reset to jb-mr1-dev
3105cbb am f034e3d9: Update the assets of unlock and camera icons in filmstrip.
c71b193 merge in jb-mr1-release history after reset to jb-mr1-dev
f034e3d Update the assets of unlock and camera icons in filmstrip.
8a5b667 Merge "Let's enhance." into jb-mr1-dev
504d7c8 am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
7f1ad54 Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
9dee437 merge in jb-mr1-release history after reset to jb-mr1-dev
3c72720 Added missing hungarian translation
1aff8e6 am 5ec40a6b: Fix dimensions to use dips instead of pixels
5ec40a6 Fix dimensions to use dips instead of pixels
cd3803c am b470b229:     Fix cropping and saving issues
b470b22     Fix cropping and saving issues
2f8f930 merge in jb-mr1-release history after reset to jb-mr1-dev
294b994 Add stitching panorama image to secure album.
367707d am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
48b63ee Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
4f69a05 Hide Camera button on empty gallery when not available
8004820 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
3d4d9b3 merge in jb-mr1-release history after reset to jb-mr1-dev
50f691d Let's enhance.
1e89d46 am 9b302e31: Icon fix
9b302e3 Icon fix
2b65242 am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches
1d2e990 Merge "Improve performance of filmstrip" into gb-ub-photos-arches
eea31d9 am 7776408c: Merge "Adding crop UI.  Fixes a number of other UI bugs." into gb-ub-photos-arches
7776408 Merge "Adding crop UI.  Fixes a number of other UI bugs." into gb-ub-photos-arches
62e962b Adding crop UI.  Fixes a number of other UI bugs.
a538ea2 merge in jb-mr1-release history after reset to jb-mr1-dev
5273e83 Improve performance of filmstrip
a1a4eb6 am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE
664b854 Import translations. DO NOT MERGE
43b6cf3 Import translations. DO NOT MERGE
add0373 am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches
4247c23 Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches
65bd101 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
46163a3 Moves matrix function to GeometryMetadata. Fixes scaling issues.
4b2aad5 am 143a4eb4: Fix XML layout
81d5738 merge in jb-mr1-release history after reset to jb-mr1-dev
9a635f7 Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev
d246677 Make getSupportedOperations() call getSupportedOperations(boolean) by default.
143a4eb Fix XML layout
a3c0447 am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches
808dbe1 Merge "Add back button handling" into gb-ub-photos-arches
7560816 Add back button handling
e447477 am 423e45e4: Refresh panorama image after stitching completion
423e45e Refresh panorama image after stitching completion
0bb1552 am 6111c54d: Fix UI
6111c54 Fix UI
756fb49 am ea5df36a: layouts, image icons, and layer behavour
ea5df36 layouts, image icons, and layer behavour
f8500e4 am 7d161351: Adjust text on Apply button
7d16135 Adjust text on Apply button
0acba30 am 8985e064: Hide history panel for now
8985e06 Hide history panel for now
90d6892 am 8e1536da: Add new borders
8e1536d Add new borders
5a1b150 am e533f659: Fixes Rotate, Flip, Straighten tools.
f18fa41 am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
e533f65 Fixes Rotate, Flip, Straighten tools.
fe81244 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ecaa3f5 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
3d6fd0b am 11a21df4: Merge "Fixed apply bar text.  Moved strings to xml." into gb-ub-photos-arches
11a21df Merge "Fixed apply bar text.  Moved strings to xml." into gb-ub-photos-arches
2028657 am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
2a39753 Import translations. DO NOT MERGE
2b8da2b Import translations. DO NOT MERGE
8e9072b Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
f685a36 am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
a4ccb4a Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
8d3c283 Fixed apply bar text.  Moved strings to xml.
468e33b am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches
310a93d Merge "Remove old 360 icons" into gb-ub-photos-arches
60c536e am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches
93f074e Merge "Removing the disabled undo button." into gb-ub-photos-arches
09473aa Alias com.android.camera.Camera to point at CameraActivity
76ae439 merge in jb-mr1-release history after reset to jb-mr1-dev
e3350bd Remove old 360 icons
d3a5231 Removing the disabled undo button.
87da405 am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
dd15869 Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
e7b51ae am 825afb1b: Move calls to LightCycleHelper off the UI thread.
825afb1 Move calls to LightCycleHelper off the UI thread.
5d4b8fd Change ActionBar spinner text size on rotate
abe4016 am 47df0d2f: Add more space between save icon and text
47df0d2 Add more space between save icon and text
fafb2ed fixed manta image size and double FX issue
b4ac748 am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
37a9333 Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
ea05869 am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
bebc94b Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
62e34df Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1106512 am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
7f34a6a Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
e812497 am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
f3dd4ce Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
075b593 am 5cca8b99: Fix portrait orientation on landscape devices
1c35ad5 Clear cached stitching preview thumbnails.
5cca8b9 Fix portrait orientation on landscape devices
a19830b Fix application of FX to not wipe out borders etc.
ebe1638 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
9d395ac merge in jb-mr1-release history after reset to jb-mr1-dev
a8f3473 Revert "Revert "Upload screennails in tiles to prevent jank""
b6adfcf am fb6edb42: Remove compare and reset from apply bar and fix text.
fb6edb4 Remove compare and reset from apply bar and fix text.
6190cbd am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
23c1f70 am 7761357f: Behavior of camera filmstrip in gallery closer to camera
73c60ce Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
7761357 Behavior of camera filmstrip in gallery closer to camera
a261467 am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations
3ed6ae2 Fix size of peripheral items when first opening filmstrip
91e5e89 Hide unwanted scrollbars in editor
4d302b8 Fix NPE in PhotoPage.updateMenuOperations
bba4936 am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
c735669 Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
3def40b am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
f8a4687 Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
d4bf594 am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches
f984e5c Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches
836489b am 4e0ca74a: Change "Save" button in editor
2539fd7 Fix NPE due to progress bar not existing.
8a8b9cf Make album set grid view reflect latest UI mocks
66a3c4b Removed "Show Image State" and "Settings" from overflow menu.
4e0ca74 Change "Save" button in editor
e23a9d4 Defer expensive UI updates in filmstrip
2306d78 am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
2ebc18f am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
2cb4269 Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
df2aecb Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
cceb724 am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
b4a3f47 Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
785a1f8 Fix NPE due to progress bar not existing.
688274a Change "Done" to "Save" in editor
810f8df am 53f24f0f: forced fx bitmaps to load unscaled
fea98f5 Change FilterShow theme and extra remove gray line
53f24f0 forced fx bitmaps to load unscaled
073e787 am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
f0bec55 Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
14b42fc am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
f804465 Merge "add White balance & disable UI elements" into gb-ub-photos-arches
419a804 Change text size in spinner to avoid overlap
0d77d6d am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
9b900e0 Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
4988eff add White balance & disable UI elements
682163e Disable in-place crop for 360 panorama
0d351ad merge in jb-mr1-release history after reset to jb-mr1-dev
977382f am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
db3b0d4 Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
45d7d0a am ce81f255: Set width of filmstrip/grid spinner to wrap content
2aec848 Fix missing camera thumbnail in filmstrip
2939ccd Import translations. DO NOT MERGE
83106f7 Import translations. DO NOT MERGE
ce81f25 Set width of filmstrip/grid spinner to wrap content
fcdc86e am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
21832eb Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches
4e091eb Change how stitched images are inserted into Gallery.
f122d56 Move panorama stitch progress outside the image.
194b77c am eece6da4: Support REVERSE in lockOrientation
3ad97aa merge in jb-mr1-release history after reset to jb-mr1-dev
eece6da Support REVERSE in lockOrientation
a6cd70f merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ca41df8 am 866ed7ab: Fix inverted panorama preview
979406f Gallery2: Updated italian translation
3bc38f0 merge in jb-mr1-release history after reset to jb-mr1-dev
866ed7a Fix inverted panorama preview
db30b3b Gallery2: Fix hard code message.
efce987 am 1b72a2f1: small fix to red eye code
1b72a2f small fix to red eye code
b3d3079 am 08458dc6: Latest UI
08458dc Latest UI
a83c9be am 457e88cd: add filters
457e88c add filters
41fda3d am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
08e5108 am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
d78c573 Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
501bd1b Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
07f340a am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
3d81fdf Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
77fa1d2 Correct stale background on completely empty gallery
a9c3ad0 Fix share crash after closing photo editor
b54b72d merge in jb-mr1-release history after reset to jb-mr1-dev
dc55d3b Fix lack of snapback on very short scroll
8363c46 merge in jb-mr1-release history after reset to jb-mr1-dev
a2ce811 Update design for grid/filmstrip switcher
bc56bd0 am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches
bd14e82 Merge "Implementing Geometry save operations." into gb-ub-photos-arches
1f6a2d8 am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
d490f1a Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
18fc4c1 Implementing Geometry save operations.
773a672 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp-merge
a90d5d2 am 6e733b74: Fix share crash after closing photo editor
6e733b7 Fix share crash after closing photo editor
e5c5798 am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches
ee7c1e0 Merge "Add procedural borders" into gb-ub-photos-arches
59aefb0 am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
5635aa9 Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
6ddbf0d am 2c83c5f0: Handle stitching progress in secure album.
2c83c5f Handle stitching progress in secure album.
fcc92a7 am 71ce96fc: Fix sharing as photo option for 360 degree panorama
71ce96f Fix sharing as photo option for 360 degree panorama
4b6f4fc merge in jb-mr1-release history after reset to jb-mr1-dev
3985d73 Dejank camera roll scrolling in grid view.
0eaafe8 Change versionCode to 40001 and versionName to 1.1.40001.
93dfe7a Add procedural borders
e28986d am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches
a74f1f4 am 895e13e8: Fix crash when starting the editor
3a1279f Merge "Start Camera album in grid mode" into gb-ub-photos-arches
895e13e Fix crash when starting the editor
7a84c57 Start Camera album in grid mode
cf66c41 am a66df0c9: Added the rest of the Geometryfilter stubs.
a66df0c Added the rest of the Geometryfilter stubs.
8e5ccb2 am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
f70a356 Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
fe02f8c am 4438a7cc: Fix details dialog not being dismissed
4438a7c Fix details dialog not being dismissed
de15477 Fix crash introduced with the GeometryMetadata
73d3785 am a29eeac8: Use framework orientation
a29eeac Use framework orientation
821b775 am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches
8eb8c39 Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches
3122f4d am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
1a291db Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
90b1d25 add redeye and improve shadow removal
ab7596d Fix the filtershow activity to portrait
05ae080 am 639095c6: Correct undo behavior
639095c Correct undo behavior
0efc113 am 7bd60250: Added stub for applying geometry flip.
7bd6025 Added stub for applying geometry flip.
3f496bb am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
8e7b509 Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
9e733e8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
cbc3109 am d199202e: (-s ours) Import translations. DO NOT MERGE
8537d09 Adding Crop, Rotate, Flip.
5563353 Import translations. DO NOT MERGE
d199202 Import translations. DO NOT MERGE
d061ad6 merge in jb-mr1-release history after reset to jb-mr1-dev
e0ad491 am 51ebe5f7: Share only 360-degree panoramas with new MIME type
51ebe5f Share only 360-degree panoramas with new MIME type
a255a55 am 76f18810: Launch correct photo when tapping grid item in Camera roll
1414391 am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
96cc896 am d81b2649: No Camera recenter on resume after editing or viewing items
6030930 am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches
76f1881 Launch correct photo when tapping grid item in Camera roll
ed8c881 Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
d81b264 No Camera recenter on resume after editing or viewing items
4b39551 Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches
ec29b73 Show progress indicator dialog when saving edited image
a270042 merge in jb-mr1-release history after reset to jb-mr1-dev
28fa638 am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches
f5017c4 Merge "Show stitched panorama in secure album." into gb-ub-photos-arches
d7b3cb8 am bbc99316: Fix orientation locking issues when going back to Camera
bbc9931 Fix orientation locking issues when going back to Camera
9333917 am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches
4de3612 Merge "Change display of 360 panorama button" into gb-ub-photos-arches
e55e048 am 43ba9f66: Implement new grid layout in Gallery
4cd1cee am 3711d3ea: Tune swipe to delete in filmstrip
04f97ab am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches
9fe7d85 am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches
ed1ab4c am 9b672371: Change LOCAL_SDK_VERSION to current.
75b984c am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
ec147fd am ad7cf187: Revert "Upload screennails in tiles to prevent jank"
2c848b2 Show stitched panorama in secure album.
8bda229 merge in jb-mr1-release history after reset to jb-mr1-dev
43ba9f6 Implement new grid layout in Gallery
d2724f6 Change display of 360 panorama button
3711d3e Tune swipe to delete in filmstrip
278e4fe Merge "Animation support" into gb-ub-photos-arches
38ff40d Animation support
701f83f Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches
9b67237 Change LOCAL_SDK_VERSION to current.
87b226c Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
ba65c37 Fix display of spinner and SQL exception for view intent
ad7cf18 Revert "Upload screennails in tiles to prevent jank"
3208850 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6b84da4 Set the thumbnail/screennail sizes based on screensize
aeae150 Move LightCycle undo to settings area.
bdcc92e am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
df479dd Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
d3ef8b1 am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
e6b2212 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
81eb997 Add scale factor / quality parameters in filters
4a48f37 am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches
39e5dfd Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches
46a02a8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3ea0bfb Set the thumbnail/screennail sizes based on screensize
d464277 New UI...
b25a3a4 am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
d3fe19b Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
6cf0593 am a6591448: Don\'t film strip animate when switching cameras
a659144 Don't film strip animate when switching cameras
56d420a Import translations. DO NOT MERGE
4927076 Import translations. DO NOT MERGE
3c33620 am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
7ca5aed Merge "New UI..." into gb-ub-photos-arches
92e2341 New UI...
e68a7c1 Import translations. DO NOT MERGE
aae12ee Import translations. DO NOT MERGE
e89052b merge in jb-mr1-release history after reset to jb-mr1-dev
5515801 Fix ANR in creating the fallback animation.
a556c05 am e29fc4a5: Upload screennails in tiles to prevent jank
e29fc4a Upload screennails in tiles to prevent jank
002e90b am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
9bcba5b Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
ca3c75f am f47e790e: Add a reset item menu
f47e790 Add a reset item menu
02b24ed am b559b2dd: add vibrance fix a free in shadows
b559b2d add vibrance fix a free in shadows
f8d0367 am 5448bf80: Implement sharpen
5448bf8 Implement sharpen
9edd1a6 am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
94805da Merge "Fix build break in tests" into gb-ub-photos-arches
731bd8a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
bdd935b Fix build break in tests
38192a5 am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
d21ad73 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
b005740 am 9c6c01dd: Fix build. Missing dummy class for Gallery2.
9c6c01d Fix build. Missing dummy class for Gallery2.
22d6dfc Upscale images to fill screen for slideshow
d29584d Snap back photo after swipe in y-direction in filmstrip
d5e9f02 am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
29b553a Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
41190e1 am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches
8a415f4 Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
3158c0f am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
0eefb17 Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
7e6537c Upscale images to fill screen for slideshow
4c9e3e1 Don't allow switching to filmstrip in get content intent
ca4241c am b1a51397: Snap back photo after swipe in y-direction in filmstrip
c64d127 Support panorama progress items in Gallery.
de1903c Import translations. DO NOT MERGE
6c92836 Import translations. DO NOT MERGE
b1a5139 Snap back photo after swipe in y-direction in filmstrip
a4ca12e Merge "@#!$# Bug #7275145" into jb-mr1-dev
eeaac71 merge in jb-mr1-release history after reset to jb-mr1-dev
31bf2be am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
2abc135 Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
27565de Open album in filmstrip only if the item exists.
8c37735 Accelerate PNG image rendering.
7a44c6a am accef756: Fix NPE in ImageLoader.
accef75 Fix NPE in ImageLoader.
2d4c11a am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches
fab3639 Merge "Set type as well while launching editor." into gb-ub-photos-arches
4c39c88 am 9778705a: (-s ours) Import translations. DO NOT MERGE
b669265 Set type as well while launching editor.
1c44dc1 @#!$# Bug #7275145
967a065 Import translations. DO NOT MERGE
9778705 Import translations. DO NOT MERGE
bcf5c96 Fix ANR in image editor
ce56101 am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
6090237 Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
541315c Revert "Add a overflow menu item to view 360-degree panorama."
32ffa82 am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches
124a9d3 Merge "Fix ANR in image editor" into gb-ub-photos-arches
1046a23 Fix ANR in image editor
711c498 am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
56bc8b7 Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
499ac9e Fix snapping behavior in filmstrip
81912a4 am b57e72bb: Disable destructive rotate for lightcycle panorama
b57e72b Disable destructive rotate for lightcycle panorama
d0bd885 am d84ae72a: Add a overflow menu item to view 360-degree panorama.
d84ae72 Add a overflow menu item to view 360-degree panorama.
fc1edb4 am 217acd7c: Change LightCycle assets.
217acd7 Change LightCycle assets.
042b3ad am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
b93fa45 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e0d9d42 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
318f004 merge in jb-mr1-release history after reset to jb-mr1-dev
b80ac7f am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage
f4e22eb Correct behavior when swiping to placeholder item in PhotoPage
f6af2a3 am 847587b5: Remove redundant handling of share action.
847587b Remove redundant handling of share action.
edceb4d am c7b2c287: Add Shadow feature
c7b2c28 Add Shadow feature
75a946f am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches
45e666c Merge "Implements image sharing" into gb-ub-photos-arches
0ee91a2 Implements image sharing
11a41ac am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode
9481d05 Do not show grid/filmstrip spinner in secure camera mode
f4bde18 Fix crash, remove logging added to diagnose bug
4b759a1 am 45f089d6: Show Camera placeholder as first filmstrip item in roll
45f089d Show Camera placeholder as first filmstrip item in roll
65c16ee am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
51915a6 Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
31e3baa am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches
536ff15 Merge "Fix NFC regression" into gb-ub-photos-arches
2619f20 Fix NFC regression
753d2e7 Import translations. DO NOT MERGE
ef8151d Import translations. DO NOT MERGE
2ddf485 am 6423defe: Fix crash, remove logging added to diagnose bug
6423def Fix crash, remove logging added to diagnose bug
2833355 Trimming: Exit current activity after click done
1856b8f am 462923e5: Check item is editable before attempting to launch editor
462923e Check item is editable before attempting to launch editor
f69d96e merge in jb-mr1-release history after reset to jb-mr1-dev
a3d2afd am 13360629: Remove ActionBarSherlock
1336062 Remove ActionBarSherlock
70814a1 am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
935b9cf Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
ba36d9b am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
2fc053e Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
abf8e3f am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
7b4bdd0 Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
ee899c0 Improve display of ActionBar album mode switcher
3508b21 Revert "Enable swiping from LightCycle to Gallery"
d0b8143 am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
3cf0722 Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
bf97d3a Fix exposure and fixed warnings
838f598 am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches
83f50a9 Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches
700ae7e am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
526c306 Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
e61c870 am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"
1b3ea98 More logs for gallery crash error, remove a potential cause
3cf502a Move grid/filmstrip switching to ActionBar title "spinner"
f18dd1e am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
c58fe39 Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
71ba6e9 Remove OnFrameAvailableListener in tear down
02506a9 Fix for exceptions when image has no orientation data.
73a9a0f am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
d87b77c Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
6fd25fd Enable swiping from LightCycle to Gallery
a58b741 am d87c8624: More logs for gallery crash error, remove a potential cause
ab8aec9 Import translations. DO NOT MERGE
98c47be Import translations. DO NOT MERGE
d87c862 More logs for gallery crash error, remove a potential cause
445605f Update assets of the lock screen image in the secure album.
d35cd9f merge in jb-mr1-release history after reset to jb-mr1-dev
4038913 am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
f497fdf Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
21601de merge in jb-mr1-release history after reset to jb-mr1-dev
ceebfdd am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches
1cd0fd2 Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches
284efcc Trimming: support more box by keeping more classes
3c9d65d am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches
21421a1 Merge "Fix crash in album page" into gb-ub-photos-arches
ed07af0 am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
5168509 Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
6186111 Fix crash in album page
ff43ce9 am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches
94e0526 am 0aaf8fb8: Update FX/pano button appearance, placement, animation
3e2e9e9 Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches
0aaf8fb Update FX/pano button appearance, placement, animation
c1c67ea Remove video play icon and tap to play behavior for panorama.
699d4d2 am 207b73ba: Add new gallery assets
207b73b Add new gallery assets
2ef8ea0 am f6b2ec81: Disable effects recording UI.
f6b2ec8 Disable effects recording UI.
0ec82e5 merge in jb-mr1-release history after reset to jb-mr1-dev
bf93da7 Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
d44b0d8 Trimming: clean up strings and prevent too short or no trimming.
7e035f2 am 0c3203f1: Remove the individual Curves channel filters Reorder the filters
0c3203f Remove the individual Curves channel filters Reorder the filters
004174d Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
c898318 Fix issue #7255954: API Review: rename Dream to DreamService
eb9d5d2 am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
d42f6c6 Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
c92d9de am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
786fe64 Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
8c35f79 am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
d5480bd Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
b27df46 Debounce after quick fling towards camera but zoom if slow
639c9c6 am f98aafb7: Fix NPE in GalleryActionBar
f98aafb Fix NPE in GalleryActionBar
81286e1 am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
5e91df3 Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
91cb11f am 7caab0dc: Change the slider values range to -100 -> 100
7caab0d Change the slider values range to -100 -> 100
20ee087 am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
75a93c7 Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
ec6034e Add FilterShow and clean up native lib handling
86a6930 am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
3e77e84 Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
c697efd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
123f653 am f8706c89: (-s ours) Import translations. DO NOT MERGE
4a5ec39 Import translations. DO NOT MERGE
f8706c8 Import translations. DO NOT MERGE
4450e43 Trimming: Use OnClickListener for saving
eae15a6 merge in jb-mr1-release history after reset to jb-mr1-dev
3235768 am c7e3c76d: Show a placeholder when the camera filmstrip is empty
c7e3c76 Show a placeholder when the camera filmstrip is empty
bd1c876 am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches
2e8472f Merge "Update to sharing panorama" into gb-ub-photos-arches
5172dee Update to sharing panorama
625a1ec am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
5a429e5 Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
9594c8d Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
2a4847a am 8473d944: (-s ours) Import translations. DO NOT MERGE
00495d8 Import translations. DO NOT MERGE
8473d944 Import translations. DO NOT MERGE
8a7f0bd am 624ed9df: Fix up button behavior in camera app
7e1f12f Fix Monkey NPE
624ed9d Fix up button behavior in camera app
56c1aed am 863b4e65: We weren\'t applying the parameter on an existing filter
863b4e6 We weren't applying the parameter on an existing filter
d019ac6 am 9579b815: Only apply the parameter to the currently edited filter
9579b81 Only apply the parameter to the currently edited filter
9ad74d1 am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches
98d17b8 Merge "Fix Monkey NPE" into gb-ub-photos-arches
8d7ea82 am 02f778af: Remove the pie slider, add a linear slider
02f778a Remove the pie slider, add a linear slider
53fe9f7 Fix Monkey NPE
cf5247a am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
65f1bad Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
4112a24 am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
f37e1e9 Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
028ecd4 Trimming: clean up the UI for trimming.
bb742fc am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
8f6dc9e Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
f1ace7e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b6f203d am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
27e933b Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
9fe814e merge in jb-mr1-release history after reset to jb-mr1-dev
3027091 am 743f8152: Several secure album changes.
743f815 Several secure album changes.
8c60119 am 4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches
4419f55 Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches
f452f5d am b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
b904ecb Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
c51c17d am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches
53605ba Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches
81e863b Fix background replacement crash in camcorder.
990c072 am e3f9f579: Load the correct library...
e3f9f57 Load the correct library...
f1e7d8e am 69d781ad: Fix the build
69d781a Fix the build
5e92668 Trimming: switch to use sherlock action bar
d2fd71f am 2ce4bec8: Only create debugTag if necessary
2c55a48 am 8fe22ecb: Don\'t requery a constant
2ce4bec Only create debugTag if necessary
8fe22ec Don't requery a constant
0ccadcf am 0d7cdf8e: Initial import of the new image editor
0d7cdf8 Initial import of the new image editor
bc0d5b1 am 833f775a: Fix behavior of up button in Camera app
833f775 Fix behavior of up button in Camera app
2560d05 Import translations. DO NOT MERGE
49f2394 Import translations. DO NOT MERGE
def1872 am 726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
726cbd1 Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
a9b3742 am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
eb90d7e Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
9f59a5f Trimming: switch to use selectors.
ddf0225 Avoid unnecessary allocation
a04d66e Fixed behavior for back key when viewing download.
432eb11 Don't set treat back as up if there is no parent album.
4115370 am 3fd76400: Fix display of clustering items in album set page
3fd7640 Fix display of clustering items in album set page
23f19fb merge in jb-mr1-release history after reset to jb-mr1-dev
cc2f059 Show unlock image in secure album only when camera roll has items.
ca9054f am 9c3912a2: Remove icon attributon.
9c3912a Remove icon attributon.
71e92bd Grid/filmstrip switching behavior improvements
eef77bc am e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches
e5bb9ff Merge "Making switchState public" into gb-ub-photos-arches
53f497a am 99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
9942075 Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
726d29f am 00ccf35f: Grid/filmstrip switching behavior improvements
9950027 Revert "Update gallery launcher icons."
00ccf35 Grid/filmstrip switching behavior improvements
d878e03 merge in jb-mr1-release history after reset to jb-mr1-dev
9bea5d1 am 62e8403c: Add API check for "context" input port of effects recording.
9c6615e am 7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
62e8403 Add API check for "context" input port of effects recording.
7c79f6c Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
8868aa1 Add an unlock image in the end of secure album.
ea35d45 am 03f6fce6: Enable effects recording in JellyBean.
03f6fce Enable effects recording in JellyBean.
b45d2ba am 5eff2242: Register secure image capture intent.
5eff224 Register secure image capture intent.
73685c0 am f6a5c701: Merge "Remove old camera activity from launcher" into gb-ub-photos-arches
f6a5c70 Merge "Remove old camera activity from launcher" into gb-ub-photos-arches
5dbbfcd Remove old camera activity from launcher
9c8506d am e06c9f10: Restore missing "Group by" option in camera roll grid view
e06c9f1 Restore missing "Group by" option in camera roll grid view
de1a390 am 3eb2e643: Fix occasional crash when restoring photo page state
3eb2e64 Fix occasional crash when restoring photo page state
fd020e6 am 15ff1b1c: The trimming solution with the mp4parser library.
15ff1b1 The trimming solution with the mp4parser library.
830908e Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Gallery2 into aosp
0d1d540 am 4f32d514: Use vendor specific MIME type for sharing LightCycle panoramas
4f32d51 Use vendor specific MIME type for sharing LightCycle panoramas
9b8a427 Making switchState public
153f41c merge in jb-mr1-release history after reset to jb-mr1-dev
8a51f5f am 2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
846aa61 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2267ac9 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
16635c6 am 9b270f4f: Snap a photo to the center after fling ends in filmstrip
22804c1 Import translations. DO NOT MERGE
6265f67 Import translations. DO NOT MERGE
9b270f4 Snap a photo to the center after fling ends in filmstrip
d62ab87 am 23e595f0: Support secure image capture mode.
14461c5 am 766566ac: (-s ours) Reconcile with jb-mr0-release - do not merge
dd8676e am 2e3b5a9e: am e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode.
5d1a63e am 2f4c73d9: Merge from AOSP
b479a91 am 2ee9fcd1: Reconcile with jb-release
3eb9d1b am de5318ce: Reconcile with jb-mr0-release
c91a825 merge in jb-mr1-release history after reset to jb-mr1-dev
23e595f Support secure image capture mode.
44d9273 Merge remote-tracking branch 'goog/gb-ub-photos-arches' into jb-mr1-dev
7fb8a42 Import translations. DO NOT MERGE
7e52a84 Import translations. DO NOT MERGE
766566a Reconcile with jb-mr0-release - do not merge
d931159 merge in jb-mr1-release history after reset to jb-mr1-dev
7359198 Merge "Remove CAN_USE_FLAG_SECURE constant." into gb-ub-photos-arches
7d3f604 Merge "Hide grid view menu item in secure album." into gb-ub-photos-arches
32727c5 Remove CAN_USE_FLAG_SECURE constant.
fc3651d Hide grid view menu item in secure album.
133c49e Fix metadata of cropped image for details display.
7a0b5fe Merge "Tests for ExifData" into gb-ub-photos-arches
c6c6341 Merge "Simplify the usage of ExifData" into gb-ub-photos-arches
f44499d Add bottom bar UI for photo page
56bdcb7 Make ActionBar always present in filmstrip
a45ae2c Import translations. DO NOT MERGE
f5af221 Import translations. DO NOT MERGE
b32ed62 reset jb-mr1-dev branch to photos-a branch
5c07109 merge in jb-mr1-release history after reset to jb-mr1-dev
ce64bc9 Tests for ExifData
8959132 Simplify the usage of ExifData
577f939 Merge "Use 565 pixel format for pre-JB; use 888 otherwise." into gb-ub-photos-arches
2e1771b Use 565 pixel format for pre-JB; use 888 otherwise.
f8a39c6 Add UriImage support for viewing LightCycle panoramas.
17ac550 Merge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos-arches
c018774 merge in jb-mr1-release history after reset to jb-mr1-dev
7077701 Fix incorrect texture size causing artifacts in animation
58f898c Do not show edit button in secure album.
2e34628 Use a different task affinity for secure camera.
8fd3e79 Reskin: increase album icon size
e508d01 Merge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-arches
83380c9 Don't switch back to fullscreen camera when flinging
a9b52df Fix bugs relating to grid/filmstrip switching
6d63484 Merge "Reskin: do not show edit (FX) button in filmstrip mode" into gb-ub-photos-arches
8b94f99 Merge "Reskin: update colors to match latest mocks" into gb-ub-photos-arches
b10323d Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
d4553b1 Reskin: do not show edit (FX) button in filmstrip mode
6f1fedc Reskin: update colors to match latest mocks
7c614e8 Import translations. DO NOT MERGE
8cfc7f0 Fix build breakage
d208e12 Show large button to open the camera when gallery is empty
617040c Fix manifest to launch correct activity
951f46f merge in jb-mr1-release history after reset to jb-mr1-dev
1a875b2 Update AndroidManifest for video caputure intent in the new camera
c605ef0 merge in jb-mr1-release history after reset to jb-mr1-dev
093829c Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
4d75104 merge in jb-mr1-release history after reset to jb-mr1-dev
c6ece8c Add launcher icon for old camera UI
fd99249 Handle image capture intent using new camera UI.
9e1cc03 Merge "Update AndroidManifest.xml" into gb-ub-photos-arches
379bb55 Import translations. DO NOT MERGE
40c697f merge in jb-mr1-release history after reset to jb-mr1-dev
0454dde Update AndroidManifest.xml
0b0283d Merge "Only show FX button for photos" into gb-ub-photos-arches
e18ad87 Merge "Show animation when opening albums directly in filmstrip" into gb-ub-photos-arches
2873cd1 Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches
14ad4ef Only show FX button for photos
6b64c06 Show animation when opening albums directly in filmstrip
292dc44 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
51bc561 Animate correctly when opening single-photo album
0d1ed05 Import translations. DO NOT MERGE
1acc7da merge in jb-mr1-release history after reset to jb-mr1-dev
222c072 Cancel the loading task when clicking on back in Cropping.
cfa55ef Reskin: Fix stability bugs introduced by reskin
b265ebb When tapping single-photo albums, launch photo directly
9b3c279 Merge "Make ndk-build happy for Gallery jni." into gb-ub-photos-arches
d397378 Reskin: Fix stability bugs introduced by reskin
553070b merge in jb-mr1-release history after reset to jb-mr1-dev
b5c28de Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
a9948ef Launch next-gen editor if present and show FX button
f472a4b Make ndk-build happy for Gallery jni.
9159ccc Reskin: fix bug introduce by Gallery reskin
9e2feb1 Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
dc10b30 Reskin: stop at first photo after swipe from camera
b6b2e0f Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
3f1f1ba Add the UI elements for video trim activity.
4f9d4d5 Separate build for AOSP and Google panorama modules.
e7b57c8 merge in jb-mr1-release history after reset to jb-mr1-dev
e949416 Do not accept fling gesture after we changed from/to filmstrip mode.
df6a98a Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
676d476 Ensure peekObject is called in the syncrhonization block.
d9473d4 Merge "Remove the space before colons in details." into gb-ub-photos-arches
3d9a8e2 Add attribution of icons.
10d8759 Don't start filmstrip mode in Get Content mode.
e5f22a3 Merge "Enable new camera UI" into gb-ub-photos-arches
8b092bc Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches
0999529 Improvements to empty album behavior in Gallery
a9144c8 More logging added for monkey crash
ae04537 Do not accept fling gesture after we changed from/to filmstrip mode.
a1f4258 Enable new camera UI
7108c40 Remove VIEW activity from LightCycle.
a535522 Show play icon for panorama.
3e654aa Merge "Back button should progress through the app" into gb-ub-photos-arches
8c7f513 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
26e4fe1 Import translations. DO NOT MERGE
3dc1b4f Import translations. DO NOT MERGE
30bd7c6 merge in jb-mr1-release history after reset to jb-mr1-dev
bef18c1 Do not allow panorama viewer in secure album.
23e1cc8 Fix build error in old version of java.
c6781c0 Fix import statement breaking build
2350397 merge in jb-mr1-release history after reset to jb-mr1-dev
7eea4d3 Reskin: switching between filmstrip and grid in album
aeb4ccc Back button should progress through the app
4badebb Merge "Use XmpUtil to detect panorama instead of caption." into gb-ub-photos-arches
f10ed2d Use XmpUtil to detect panorama instead of caption.
88e08dc Update media items when a picture is deleted in secure album.
2e3b5a9 am e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode.
3f9e0a3 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
8979410 merge in jb-mr1-release history after reset to jb-mr1-dev
e311bb7 Do not accept fling gesture after we changed from/to filmstrip mode.
f6ed8a0 Merge "Fix some typos and style in ExifTag" into gb-ub-photos-arches
580daa1 Merge "Rearrange the constants in ExifTag" into gb-ub-photos-arches
a01ddb8 Fix some typos and style in ExifTag
2486ee3 Rearrange the constants in ExifTag
cda9315 Fix tap to focus, back button to camera on Manta
581f8fc Merge "Change lightcycle call to be in Gallery's package" into gb-ub-photos-arches
2e6c190 Change lightcycle call to be in Gallery's package
d496898 Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
cc8ac0a Merge "Reskin: darker gray placeholder colors in gallery" into gb-ub-photos-arches
3fd59b8 Import translations. DO NOT MERGE
4f59a41 Move LightCycle checking to the closed source.
2b95674 merge in jb-mr1-release history after reset to jb-mr1-dev
02ec00b Remove the space before colons in details.
73277e5 Merge "Revert "Remove the previewImage and staticWallpaperPreview."" into gb-ub-photos-arches
730bd52 Reskin: darker gray placeholder colors in gallery
e5e2659 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
6b41f11 Increase threshold for logging texture size warnings
672b8b8 merge in jb-mr1-release history after reset to jb-mr1-dev
5cbe945 Merge "Make a time jump when user clicks outsides the scrubber." into gb-ub-photos-arches
ac0d63e Merge "Set inMutable to true if we may reuse the bitmap." into gb-ub-photos-arches
bcca048 Make a time jump when user clicks outsides the scrubber.
a625b65 Set inMutable to true if we may reuse the bitmap.
ecb4052 Fix NPE in CropImage.changeExifImageSizeTag().
92bcd81 merge in jb-mr1-release history after reset to jb-mr1-dev
38e7740 Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
331de49 Merge "Handle other header tag in ExifParser before APP1" into gb-ub-photos-arches
512b025 Merge "Handle mis-ordered APP segment in ExifOutputStream" into gb-ub-photos-arches
e4ffc8e Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
49c8a24 Merge "Fix some typos and style in previous CL" into gb-ub-photos-arches
993d5f7 Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into gb-ub-photos-arches
16bd84b Import translations. DO NOT MERGE
4cec566 Handle other header tag in ExifParser before APP1
b6cb812 Handle mis-ordered APP segment in ExifOutputStream
470e5d8 Merge "Use FLAG_SHOW_WHEN_LOCKED for secure album." into gb-ub-photos-arches
efd480e Use FLAG_SHOW_WHEN_LOCKED for secure album.
b11eb49 Merge "Add api check for FLAG_SECURE." into gb-ub-photos-arches
ce1e6cb Add api check for FLAG_SECURE.
9d51e09 Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
9bc2a5c Remove the parameter of getAllExifTags() in IfdData
e48c0f9 Fix some typos and style in previous CL
3b8bd33 Save EXIF info to cropped picasa image with the new EXIF lib.
e2e7336 merge in jb-mr1-release history after reset to jb-mr1-dev
5babc39 Add prefix to GPS tag in ExifTag
5f18b4c Re-save Exif info for cropped local image
9408190 Merge "ExifOutputStream" into gb-ub-photos-arches
28cb416 Remove unused resources and fix some warnings.
b9e4110 Fix NPE when deleting a photo in Clustering mode.
e786d3c Merge "Add equals() function in ExifData, IfdData, and ExifTag" into gb-ub-photos-arches
9e15920 Merge "Redesign the set function of ExifTag" into gb-ub-photos-arches
4f529e7 ExifOutputStream
cde6ac5 Add equals() function in ExifData, IfdData, and ExifTag
5df339d Redesign the set function of ExifTag
39f8f0b Merge "Fix OOM in TileImageView." into gb-ub-photos-arches
94eba12 Import translations. DO NOT MERGE
352e514 Merge "Reskin: Correctly position rotated thumbs in album listing" into gb-ub-photos-arches
39765b3 Reskin: Correctly position rotated thumbs in album listing
fc3adbe merge in jb-mr1-release history after reset to jb-mr1-dev
83be4e0 Invoke LightCycle viewer for panoramas.
b048b26 Merge "Fix pinch out gesture for film strip mode on gingerbread." into gb-ub-photos-arches

   * packages/apps/HTMLViewer
e688d4d am 4222180d: Merge "HTMLViewer could not open UTF-8 encoded file path."
4222180 Merge "HTMLViewer could not open UTF-8 encoded file path."
0207e4a HTMLViewer could not open UTF-8 encoded file path.

   * packages/apps/KeyChain
afb8a6c Key Chain: German translation
5c2c923 KeyChain: Simplified Chinese Translations
1b9937d KeyChain: PT-BR update translations
31f8c64 KeyChain: Update italian translation
76a7123 Merge "KeyChain: AF translation" into cm-10.1
4893fa8 KeyChain: Refactor translations
5074cc7 KeyChain: AF translation
73ff3c2 KeyChain: ES translations
b97cde0 KeyChain : add french translation
769cdd6 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/KeyChain into HEAD
ac55e35 KeyChain: Added Norwegian translations

   * packages/apps/Launcher2
ceabf41 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Launcher2 into 1.1
7774fd1 Added hungarian translation
002c25e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
7819abd Fixing issue where the cling is offset. (Bug 7633074)
2f22e71 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1ef2123 Fixing NPE in updateCurrentPageScroll (Bug 7465970)
75e3003 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
ce552e9 Merge "Fix janky transition on All Apps tab switch" into jb-mr1.1-dev
7f9ddd8 Fix janky transition on All Apps tab switch
24a1c4e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2ee5fe7 Merge "Refactoring push reordering (issue 7139335)" into jb-mr1.1-dev
f3900c2 Refactoring push reordering (issue 7139335)
0a457bf Fix StrictMode violation
ffc2682 Fix NPE
360310b Extend background to full screen.
3c42e11 Merge "Cleaning up unused code" into jb-mr1.1-dev
3c1681d Cleaning up unused code
8784bf6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9df38df Updating wallpaper picker icon to higher res
f8fbfd9 Reconcile with jb-mr1-release - do not merge
348075f merge in jb-mr1-release history after reset to jb-mr1-dev
8ef7f71 am 7774041f: Import translations. DO NOT MERGE
7774041 Import translations. DO NOT MERGE
209cdc3 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
2a1f2ba merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3a28950 merge in jb-mr1-release history after reset to jb-mr1-dev
c36184a Import translations. DO NOT MERGE
0231227 merge in jb-mr1-release history after reset to jb-mr1-dev
e8f4050 Import translations. DO NOT MERGE
62a27b6 merge in jb-mr1-release history after reset to jb-mr1-dev
36095e8 Merge "Stop animating All Apps during transition to Home" into jb-mr1-dev
bc2f082 Stop animating All Apps during transition to Home
7ff8515 Cap launcher swipe animations to max duration
e57e793 Merge "Cap launcher swipe animations to max duration" into jb-mr1-dev
97687ef Cap launcher swipe animations to max duration
9774171 merge in jb-mr1-release history after reset to jb-mr1-dev
8634f84 Merge "Delay ACTION_MAIN processing when not focused." into jb-mr1-dev
853e2a7 Merge "Resize wallpaper assets to avoid runtime resizing" into jb-mr1-dev
8d7d39d Resize wallpaper assets to avoid runtime resizing
cb222e8 Delay ACTION_MAIN processing when not focused.
a7835cd merge in jb-mr1-release history after reset to jb-mr1-dev
9dc882b Merge "Get rid of explicit GC requests" into jb-mr1-dev
848a2ba merge in jb-mr1-release history after reset to jb-mr1-dev
ee45139 Import translations. DO NOT MERGE
965c56a merge in jb-mr1-release history after reset to jb-mr1-dev
303f621 Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
381fe4c Adding width / height to cling text style
5b449dc Merge "Bring dummy cling strings back as 'strings'" into jb-mr1-dev
964e2a6 Merge "Fix NPE" into jb-mr1-dev
023c71e Fix NPE
7eed604 Get rid of explicit GC requests
d6dd7c8 Fix NPE
22057fe merge in jb-mr1-release history after reset to jb-mr1-dev
4cd7f28 remove old fashioned dream, no longer supported
41aeb57 Bring dummy cling strings back as 'strings'
eb43960 merge in jb-mr1-release history after reset to jb-mr1-dev
1d4fde6 Send correctly populated Accessibility event on Launcher state change.
e34a213 Add missing layout attributes Bug #7334849
08c0e3c merge in jb-mr1-factory-release history after reset to jb-mr1-dev
0c762a9 merge in jb-mr1-release history after reset to jb-mr1-dev
0c2388a Let's enhance
eabb31b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
5f2aa98 merge in jb-mr1-release history after reset to jb-mr1-dev
0d06152 Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev
dfe0c29 Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
3e40565 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
efd3b17 merge in jb-mr1-release history after reset to jb-mr1-dev
22beb90 Add entries for string resources that appear in clings
260eb9c Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
f371a36 Revert "Import translations. DO NOT MERGE"
f8a49f8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
eeacd56 Remove unnecessary allocations during draw Bug #7327799
a433be7 Merge "Update custom cling params" into jb-mr1-dev
b86d516 Update custom cling params
f72d698 merge in jb-mr1-release history after reset to jb-mr1-dev
5b589a0 Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev
2826bc4 Import translations. DO NOT MERGE
560e161 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
c242ae4 merge in jb-mr1-release history after reset to jb-mr1-dev
2db90f3 Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)
37f9329 merge in jb-mr1-release history after reset to jb-mr1-dev
a113121 Stop using mcc for custom workspace cling on sw600dp devices
98d7bd7 Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
6c5679e Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
ec437d0 Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
dad6ca7 Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev
e330432 Import translations. DO NOT MERGE
244ebcd Bug 7301303: more rows in all apps for sw720dp-port
dd3a2bd Fix bug 7288630: Folder icons clipped on manta
45355c4 Re-merge "Add support for custom manta cling"
2214313 Fix bug 6886990: cling accessibility
76b33bf merge in jb-mr1-release history after reset to jb-mr1-dev
914d555 Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev
2ebcf50 Revert "Add support for custom manta cling"
b387579 merge in jb-mr1-release history after reset to jb-mr1-dev
b7fbb82 Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev
8d0cd4a Genericize naming of sw720dp wallpapers
8b4d914 Merge "Fix to ensure default widgets get size callbacks (issue 7287744)" into jb-mr1-dev
aaa5c21 Fix to ensure default widgets get size callbacks (issue 7287744)
cfb57b8 merge in jb-mr1-release history after reset to jb-mr1-dev
68255cb Add support for custom manta cling
28b3e10 Removing db corruption exceptions, logging instead (issue 7112132)
dd70d66 Fix for widgets with config not getting size info (issue 7266053)
fcb4538 merge in jb-mr1-release history after reset to jb-mr1-dev
a2042d0 Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev
9f4766c merge in jb-mr1-release history after reset to jb-mr1-dev
30e64f5 Fix size of QSB icons in landscape on sw600dp devices
5524b49 Specify workspace resource in preload broadcast
daec1e8 Fix issue where clicking home button caused search icon blip
d98aaae merge in jb-mr1-release history after reset to jb-mr1-dev
db5dd02 Fix issue #7255954: API Review: rename Dream to DreamService
2a8826d merge in jb-mr1-release history after reset to jb-mr1-dev
b2f0bd4 Fixing typo in Mako resource bucket (Bug 6955380)
41ccfff Merge "Updating launcher layouts (Bug 6955380)" into jb-mr1-dev
411a300 Updating launcher layouts (Bug 6955380)
93333d9 merge in jb-mr1-release history after reset to jb-mr1-dev
b1dfe25 Fix 7223056: Enable scroll indicator on tablets
b0db60d merge in jb-mr1-release history after reset to jb-mr1-dev
37990b4 Fix # 6925851: Workspace page spacing gets messed up
e19bbca Merge "7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest" into jb-mr1-dev
369dd0c 7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest
aee3a0e Remove action bar from wallpaper picker
23a4653 merge in jb-mr1-release history after reset to jb-mr1-dev
fa7969f Fix NPE
e5574e0 Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev
b2ae8ac Try to fix RTE when updating shortcuts
c4a9233 Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev
95a556a Remove "fade in" animation for search + voice search.
bdb1030 Removing functionality to click under AllApps to return to the workspace. (Bug 7012020)
be3c59b merge in jb-mr1-release history after reset to jb-mr1-dev
9e05a5e Making launcher use new widget binding APIs
802f16a merge in jb-mr1-release history after reset to jb-mr1-dev
671a3a2 Merge "Fixing some warnings" into jb-mr1-dev
da1eae4 merge in jb-mr1-release history after reset to jb-mr1-dev
8242250 Fixing some warnings
1190487 Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
c08ca67 merge in jb-mr1-release history after reset to jb-mr1-dev
804503c Add user initialing receiver to select a unique wallpaper.
9cf962b Workaround for generating QSB icon press states. (Bug 7132477)
4cc332a Workaround for generating QSB icon press states. (Bug 7132477)
7fe33a3 Adding more debug code for dup. ItemInfo bug
061e900 Merge "Adding more debug code for dup. ItemInfo bug" into jb-mr1-dev
f1237be merge in jb-mr1-release history after reset to jb-mr1-dev
6323a55 Merge "Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)" into jb-mr1-dev
d37b176 merge in jb-mr1-release history after reset to jb-mr1-dev
7a397e0 Merge "Debug code for bug b/6830207" into jb-mr1-dev
059798a Debug code for bug b/6830207
96610d5 Adding more debug code for dup. ItemInfo bug
8a43510 Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)
215b416 Fix an error that is not being expressed
a92dc33 merge in jb-mr1-release history after reset to jb-mr1-dev

   * packages/apps/LegacyCamera
b03ba46 LegacyCamera: CA translations
4fae08c LegacyCamera: PT-BR update translations
22e672b Merge "LegacyCamera: Load correct panorama JNI libs" into cm-10.1
109ecb4 LegacyCamera: German translation
c0eb6e8 LegacyCamera: DA translation
876db0b LegacyCamera: NB translation
f1b7a05 LegacyCamera: Add missing AF translations
99fa630 LegacyCamera : refactor in cm_strings.xml
193adc8 LegacyCamera: HU translation refactoring
4d07a98 LegacyCamera: Update italian translation
85de593 LegacyCamera : FR translation
81548c4 Merge "LegacyCamera: NL translations" into cm-10.1
6b6070c Merge "LegacyCamera: ES translations" into cm-10.1
1c734a4 LegacyCamera: NL translations
7c5e1af LegacyCamera: Refactor default translations
601556e LegacyCamera: ES translations
762c85b Merge "LegacyCamera : add french translation" into cm-10.1
ba57e96 Merge "LegacyCamera: Reorganize Greek translations" into cm-10.1
ff9533e LegacyCamera: ES translations
cb32aa3 LegacyCamera: Reorganize Greek translations
9c18fed LegacyCamera : add french translation
7b637a3 LegacyCamera: Fix build error
a48ca66 LegacyCamera: Update Greek translations
f6c1843 LegacyCamera: Hebrew Translation
4733cd7 LegacyCamera: Load correct panorama JNI libs
c60c381 CameraLegacy: add support for all camera resolutions

   * packages/apps/LockClock
1a6aa5b cLock: CA translations
9b9671e cLock: CA translations
2005bfe Merge "LockClock: Update Polish translation" into cm-10.1
8aefffb cLock: Fix hdpi weather layout
3a4c5fd LockClock: Update Polish translation
ea9f32c Merge "Remove line, not needed in translation file." into cm-10.1
0b31d63 Remove line, not needed in translation file.
f22ae20 cLock: EN-GB translations
d4fd4c5 LockClock: Add Swedish translation
f34311b LockClock: Fix french translation
eb06ab3 Don't sign cLock with the platform certificate.
2b6e26f LockClock: Add default clock app detection
ff4830f LockClock: SK translations
4ff0a67 LockClock: ES translations
7e77483 LockClock : FR translation
ddff252 cLock: Check NETWORK_PROVIDER before call requestSingleUpdate
7fdbb0e Merge "cLock: Force a location update when lastKnownLocation = null" into cm-10.1
bfc44e0 cLock: Force a location update when lastKnownLocation = null
2f3e53c LockClock: Update Japanese translation.
6c4b82a LockClock: NB translation
1794754 Merge "LockClock: Add support for the HTC One and Galaxy S4" into cm-10.1
88bfc1b LockClock: Add support for the HTC One and Galaxy S4
aa4b84e cLock: NB translation
0018755 Merge "Revert "LockClock: Add XXHDPI support for the HTC One and Galaxy S4"" into cm-10.1
48c235b Revert "LockClock: Add XXHDPI support for the HTC One and Galaxy S4"
f72e6e5 Merge "LockClock: Make Temp text a bit smaller to better fit condition text" into cm-10.1
a0b0384 LockClock: Make Temp text a bit smaller to better fit condition text
6349c62 LockClock: Add XXHDPI support for the HTC One and Galaxy S4
8666c9a cLock: Fix for MDPI minimized weather display
e26369d Merge "cLock: check calendar visibility on start of CalendarWidgetService" into cm-10.1
6b84056 Merge "cLock: optimize widget display if parts are not visible" into cm-10.1
8d46b61 cLock: optimize widget display if parts are not visible
b6fc125 cLock: check calendar visibility on start of CalendarWidgetService
9558599 Updated czech translation
e44467a Merge "cLock: refactorings and cleanup (no functional changes)" into cm-10.1
1e97e62 cLock: refactorings and cleanup (no functional changes)
8135da6 cLock: Latest merges
21fc6fb Merge "cLock: Reorganize Greek translations" into cm-10.1
4f35d4d Merge "cLock: NL translations" into cm-10.1
e152f70 cLock: Reorganize Greek translations
808bc3d cLock: NL translations
c296f88 LockClock: Added missing strings for Polish language
1a3c546 Merge "LockClock: Add Chinese translation for feature 'added option to highlight the upcoming calendar events'." into cm-10.1
c6fd474 Update German translation.
b483120 cLock: Bump version
2d1e454 Merge "LockClock : Switch to new yahoo api" into cm-10.1
0f8f6fb LockClock : Switch to new yahoo api
dd6e220 LockClock : reorganize and add french translation
a8918b7 Merge "Update cLock uk translation" into cm-10.1
335a6cc Update cLock uk translation
89d08ab Afrikaans translations: Added missing items
4b6f5c9 cLock: Bump version
be49a05 cLock: Fix FC when using monochrome icons with an unknown condition code
bc9f767 LockClock: Add Chinese translation for feature 'added option to highlight the upcoming calendar events'.
d98a338 Merge "Update Russian Translation-LockClock-CM10.1" into cm-10.1
fd73f0f Update Russian Translation-LockClock-CM10.1
eaf5a0c es_ES: Add spanish translations
d1253ee Merge "Change date display: In Afrikaans we put the number before the month." into cm-10.1
8035e39 Merge "Added hungarian translation for highlight settings" into cm-10.1
0526c23 Merge "cLock: Update italian translation" into cm-10.1
c399928 Merge "LockClock: Add Polish translation for highlight the upcoming events" into cm-10.1
d514052 Added hungarian translation for highlight settings
6e6fb12 LockClock: Add Polish translation for highlight the upcoming events
f073499 cLock: Update italian translation
8b1b94f cLock: Bump version
46e59c6 Merge "cLock: added option to highlight the upcoming calendar events" into cm-10.1
bcbf4d6 PT-BR: Update translations
84b35a3 Fix widget sometimes indefinitely showing 'Widget is loading...'
73560c0 cLock: added option to highlight the upcoming calendar events
5e69eec es_ES: Add spanish translations
7b9c0bd Merge "cLock: Hide the calendar panel if there are no events to show" into cm-10.1
5a0d392 cLock: Change Calendar default lookahead to two weeks
874fd29 Merge "LockClock: Updated Polish language for font colors" into cm-10.1
ae7129f cLock: Hide the calendar panel if there are no events to show
6c0320f LockClock: Updated Polish language for font colors
a2f54e6 cLock: minor code cleanups (remove unused imports/variables/dead code, explicit usage of default locale)
a8a1502 cLock: Make the list of calendar entries scrollable (max. 10 entries)
8c94e90 Merge "cLock: Bump version" into cm-10.1
1cb4219 Merge "LockClock : add french translation" into cm-10.1
1b6aef0 Merge "cLock: Simplifed Chinese Translations" into cm-10.1
2daf11d cLock: Fix error when the weather data from Yahoo is incomplete
ba48d35 Merge "German: Add translation for font colour selection" into cm-10.1
de015aa Merge "Japanese: update Japanese translation for "color icons"" into cm-10.1
7ae506f German: Add translation for font colour selection
659b50d LockClock : add french translation
83b742b cLock: Italian translations
19d5dc3 cLock: Simplifed Chinese Translations
7ade24a Merge "Added hungarian translation for color settings" into cm-10.1
eb3a0e9 Japanese: update Japanese translation for "color icons"
389820e Merge "LockClock: Update italian translation" into cm-10.1
a48cc60 cLock: Bump version
5d2f0a3 cLock: User proper method for enabling location settings
691ab4c Added hungarian translation for color settings
7f89aac LockClock: Update italian translation
ca41e60 Update Russian Translation-LockClock-CM10.1
8efd386 Update Russian Translation-LockClock-CM10.1
9d15fab Merge "PT-BR: Added missing translations" into cm-10.1
0c92628 cLock: Greek translations for font colors
1b4e016 Merge "cLock: Add ability to change font and monochrome icon colors" into cm-10.1
b39c9e0 Added translation for weather_show_when_minimized
c3ae01e cLock: Add ability to change font and monochrome icon colors
5f3c053 PT-BR: Added missing translations
4f2c321 Add LockClock uk translation
2b85795 Change date display: In Afrikaans we put the number before the month.
240aa3b cLock: Updates to how dates are displayed in calendar entries
d1bb453 Merge "Update Russian Translation-LockClock-CM10.1" into cm-10.1
8bec17e Update Russian Translation-LockClock-CM10.1
250f3c5 Merge "Add Afrikaans translation" into cm-10.1
f4c1c2b Merge "cLock: Add HDPI summary weather support for minimized widget" into cm-10.1
1c9540c cLock: Add HDPI summary weather support for minimized widget
709a462 Add Afrikaans translation
6e54f14 Merge "cLock: Simplified Chinese Translations" into cm-10.1
c8b264b Merge "cLock: Update Greek translations" into cm-10.1
423f361 Merge "LockClock: Update italian translation" into cm-10.1
49ec1d4 Merge "cLock: Danish translations" into cm-10.1
a9c7192 Merge "LockClock : add French translation" into cm-10.1
5e5205a Merge "cLock: Dutch translations" into cm-10.1
7211af3 Merge "German: Update translation" into cm-10.1
6e7854f Merge "es_ES: Update spanish translations" into cm-10.1
08a2523 German: Update translation
65f374b PT-BR: Update translation
5c2b17b LockClock: Update italian translation
496e338 LockClock : add French translation
b80e20a cLock: Danish translations
bacfb71 cLock: Dutch translations
acad6dc es_ES: Update spanish translations
2f2f7ad cLock: Update Greek translations
7171815 cLock: Make the Color icons default --!TRANSLATORS PLEASE NOTE!--
b96ec79 cLock: Remove redundant code and cleanup, bump version
69bb673 cLock: Make the showing of weather when minimized a user option
5845304 cLock: Simplified Chinese Translations
e8759b2 Merge "Update Russian Translation-LockClock-CM10.1" into cm-10.1
119ffc8 Added hungarian translation for 'Done' button
1406e5b Update Russian Translation-LockClock-CM10.1
b85f36d cLock: Add a 'Done' button to configurator
9d39be2 Merge "Added hungarian translation for lookahead_2-4wks" into cm-10.1
8c26a7a cLock: Add support for a small widget layout with weather
94f334d cLock: Launch configuration when adding the widget
07dd6dd cLock: Add mdpi support
0b9fa86 FIX: do not display event too far in the future
7a6bc17 Added hungarian translation for lookahead_2-4wks
bb84e15 Merge "PT-BR: Update translations" into cm-10.1
3e01f01 LockClock : add french translation
6fbe55c PT-BR: Update translations
0a5d3d6 Extend maximum look ahead range.
fe5d75a Fix typo.
edc63b6 PT-BR: Update translations
1091a5d Merge "cLock: added Polish translation" into cm-10.1
203d0d2 removed hardcoded reference to stock cm calendar app; ask for calendar app instead
fc96ae0 cLock: added Polish translation
4e9e737 cLock: Update Greek translations
d98c8f7 LockClock: Update italian translation
f83faeb Merge "Fix the alarm indicator's opacity" into cm-10.1
3a7ec3c Fix the alarm indicator's opacity
82005b3 Merge "cLock: Unicode formatting" into cm-10.1
f33f2ca cLock: Unicode formatting
628bf1a Fix display of all-day events if there's more than one all-day event.
770e025 Goodbye Chronus, it was nice knowing you (1 of 2)
869234e Fix NullPointerException.
7c1acca Merge "Update Russian Translation-LockClock-CM10.1" into cm-10.1
96fad48 LockClock: Update pt-PT translation.
cf80ab8 Update Russian Translation-LockClock-CM10.1
a1561ad PT-BR: Fix translation
61a260b LockClock: Update values
98c6289 Merge "Chronus: Optimize widget loading/display" into cm-10.1
5b99c13 Merge "LockClock : add new French translation" into cm-10.1
8fecd18 Merge "LockClock: Missing strings and a few changes" into cm-10.1
41755a9 LockClock: Added pt-PT language.
5080052 LockClock: Czech translation
1dc51e5 Chronus: Optimize widget loading/display
bbee8ca LockClock: Missing strings and a few changes
f9c9c28 LockClock: Added Danish translation
51287c4 LockClock : add new French translation
de59d3c chronus: added finnish translations
c9f89a2 es_ES: Added spanish translations
ab8518f Chronus: updated romanian translation
1f18e2c Merge "LockClock: Norwegian translations" into cm-10.1
ac8452b LockClock: Norwegian translations
5764a0c Merge "Added hungarian translation for Analog clock" into cm-10.1
433cf1e Update Russian Translation-LockClock-CM10.1
be51ccc Merge "German: Update translation" into cm-10.1
4c5f0b1 Chronus: Add Text shadow
b9516af German: Update translation
01d605f Merge "Chronus: Location provider fixes and cleanup" into cm-10.1
929e73d LockClock: Dutch translations
2948010 Chronus: Location provider fixes and cleanup
bfb24a9 Merge "Revert "LockClock: Dutch translations"" into cm-10.1
fcbf3b9 Revert "LockClock: Dutch translations"
67c38d9 Merge "LockClock: Dutch translations" into cm-10.1
1770339 Merge "Simplification, get rid of a member variable." into cm-10.1
38dfcee Simplification, get rid of a member variable.
81806aa Merge "Japanese: Initial Japanese translation for CM10.1" into cm-10.1
4cc2944 Japanese: Initial Japanese translation for CM10.1
9601d07 Merge "Update Russian Translation-LockClock-CM10.1" into cm-10.1
15d8d1d Added hungarian translation for Analog clock
cb81da8 Update Russian Translation-LockClock-CM10.1
adba724 PT-BR: Added missing translations
e2e4ed1 LockClock: Dutch translations
00209fe LockClock: Fixing build warning/error
eb6d930 Merge "Chronus: Add Analog clock" into cm-10.1
d98daeb Chronus: Add Analog clock
d9a5e82 PT-BR: Conform with Brazil standard
01ce489 Chronus/LockClock: Dutch translations
94f69b4 Add calendar item lines dynamically.
6053a15 Convert threads to AsyncTasks.
2a280cb Get rid of warnings and deprecation suppression.
4def967 Merge "LockClock/Chronus: Dutch translations" into cm-10.1
0f997c3 LockClock/Chronus: Dutch translations
83f1e37 Merge "es_ES: Added spanish translations" into cm-10.1
5b04797 Merge "LockClock: add Italian translation (1 of 2)" into cm-10.1
90efd0b Merge "Chronus: add date format in romanian translation" into cm-10.1
10e1675 LockClock: add Italian translation (1 of 2)
e8e2899 es_ES: Added spanish translations
0e81a93 LockClock: Simplified Chinese Translations
ec27eff Merge "Added hungarian translations" into cm-10.1
a4bf1fc Lock Clock : Add French translation
b90427d Added hungarian translations
c8e9c75 Update Russian Translation-LockClock-CM10.1
550f73b Merge "LockClock/Chronus: Dutch translations" into cm-10.1
19a0f6b LockClock/Chronus: Dutch translations
6a1fb1f Chronus: Standardize preference categories and layout
8abf649 Chronus: Add support for alternate (Color) weather icons
b1deb4d Chronus: Add ability to configure minutes and date/alarm fonts
cd06eab Chronus: Fix weather invert low / high temperatures
297bdc4 Chronus: add date format in romanian translation
88cd425 Chronus: updated romanian translation
b32956c Chronus: grammar fix for settings
6458989 Merge "PT-BR: Added missing translation" into cm-10.1
5781761 Chronus: Updated drawables
adde5f0 Chronus: Add ability to hide All day events in the calendar panel
f8a44eb Chronus: Optimizations
165bc93 Merge "Chronus: translated to romanian language" into cm-10.1
a95e37e Chronus: translated to romanian language
f6210b4 Merge "Update Russian Translation-LockClock-CM10.1" into cm-10.1
0737124 Merge "LockClock: Add Greek translation" into cm-10.1
09901a0 LockClock: Add Greek translation
09fd446 Update Russian Translation-LockClock-CM10.1
ae51087 LockClock (aka Chronus): Remove build warnings
e8847ac Merge "es_ES: Added spanish translations" into cm-10.1
fe33b4e es_ES: Added spanish translations
3678f27 Merge "LockClock: Simplified Chinese Translations" into cm-10.1
872cec5 Merge "Added Russian Translation-LockClock-CM10.1" into cm-10.1
e657d3e Merge "LockClock: Hungarian translations" into cm-10.1
e269707 Merge "LockClock : Initial French translation" into cm-10.1
18e3355 Merge "Fixed Force Close when enabling Network Location." into cm-10.1
2725a7c Merge "LockClock: Dutch translations" into cm-10.1
adb302d Merge "LockClock: Initial German translation" into cm-10.1
1739cb7 LockClock: Simplified Chinese Translations
e1b7d03 LockClock: Dutch translations
a25ff58 Fixed Force Close when enabling Network Location.
f92f456 LockClock: Hungarian translations
bb46a50 LockClock : Initial French translation
284a3cf LockClock: Initial German translation
9f3540e Added Russian Translation-LockClock-CM10.1
a162fa0 Introducing 'Chronus'
f98426b LockClock: Fix the calendar icon display if no events
9d12a7f LockClock: Register a click listener even if there is no weather data
4876c06 Stop service if no widgets present and preference updated
418f094 Update AndroidManifest.xml
198e8d9 PT-BR: Added missing translations + fixes
306efa7 No need for the summaries, remove
df35a2d Strings cleanup
7c3e7e8 Convert settings to Fragments
939ba42 Convert to preference fragments
41bd65a CyanogenMod-ify
d2a7163 Start of new fragments based preferences
e443c0f Code cleanup
bd63063 General layout related changes and fixes
c1ba918 PT-BR: Added missing translation
1efbb77 Add clock font scaling
618ad41 Add clock and calendar click actions
62f8711 Add the ability to force a weather refresh if needed
aac3c1f Let the calendar panel show user clicks
de69e89 General cleanup
6ec5a56 Make the weather panel check if it has enough space to display and hide if not
2effeb3 Cleanup
f98f1f1 Set weather preference defaults
63a7149 Widget calendar dynamic visibility
6c49aed Merge remote-tracking branch 'origin/master'
62ef419 Add widget size checking
448ff89 Metric preference fixes
1a99d5e Add ability to show up to a defined maximum (currently capped at 3) calendar events
7f8bdb3 MInor cleanup and proper settings defaults
ff961cc More cleanup
3556f73 Start of changing the preference storage handling
3242085 PT-BR: Initial Translation
1f0a65e Change clock font type
d99c8cc Cleanup and update on change
c2f0391 Update ap name string
d04e4ff Create README.md
683f336 Fix showing available calendars
d56c1a2 Cleanup
712e66f Add Calendar support and some general cleanup of copyrights
a7e30e4 Add Alarm display handling
e95c328 Add widget preferences
6584ae0 Change widget UI to update every 60 seconds
4ba678b Merge remote-tracking branch 'origin/master'
64090cd Initial commit
d02312b Initial commit
e8a79ed Initial commit

   * packages/apps/Mms
0808548 Mms: RU translation
2757db8 MediaModelFactory.findPart moved to SmilHelper for use in both places. findPart updated to include looking in ContentId even if the "src" does not have the cid: prefix. Noticed from a Stock GS4. SmilHelper now has a fixup(...) method which removes duplciate parts.
b9b8317 Merge "Fix IllegalStateException." into cm-10.1
52bbf13 Mms: use existing setting instead of using MmsConfig.
913462c Fix IllegalStateException.
919279c Merge "Don't recycle messages by default." into cm-10.1
0a7dc43 Mms: PT-BR translations
ccdd980 Mms: SK translation
62d2a73 Merge "MMS: Update Polish language" into cm-10.1
027d579 Fixed Latvian translation
599dded Templates: back button goes to preferences not conversation list
de5f56b MMS: Update Polish language
ea0ea1c Nuke the 'vibrate during call' option.
b324360 Don't recycle messages by default.
05fe8b2 Mms: zh-rTW translations
d5757a2 Merge "Mms: Add Missing Af Translations" into cm-10.1
70dd48d Mms: Add Missing Af Translations
2b46e3c Prevent FC in low memory conditions
2859127 Merge "Mms: Simplified Chinese Translations" into cm-10.1
09fb1d0 Merge "Mms: CS translation" into cm-10.1
6170902 Merge "Mms: EL translations" into cm-10.1
114e1c3 Merge "Mms: Update Polish translation" into cm-10.1
3aca6c3 Merge "Mms: Delay unicode stripping from a message" into cm-10.1
f756894 Mms: Delay unicode stripping from a message
b020a39 Some cleanup.
465b79e Fix 'vibrate on call' option.
1562a2f Mms: EL translations
8d74599 Mms: Update Polish translation
031ae49 Mms: CS translation
1f0133a Mms: Simplified Chinese Translations
1eac51f Mms - Fix type (FR)
a104c1f Fix SMS sending.
ed24673 Add support for sending out MMS via BT MAP.
8464336 Fix up receiver declaration.
2bb4e76 MMS: Fix lookup of vanity addresses
9fd04f4 Revert "MMS: Fix lookup of vanity addresses"
ee1ca02 MMS: Fix lookup of vanity addresses
bb0e314 Merge "Kill off use off FORCE_LED_WITH_SCREEN_OFF notification flag." into cm-10.1
46551aa Kill off use off FORCE_LED_WITH_SCREEN_OFF notification flag.
1b85e48 Mms: DA translation
2dfbab5 Merge "MMS: Update Polish translation" into cm-10.1
fc2eb8a MMS: Update Polish translation
6dfdaec Merge "Mms: Simplified Chinese Translations" into cm-10.1
59b1bc2 Mms: NB translation
5e14683 Merge "Update German translation" into cm-10.1
f953c4e Update German translation
6371450 Mms: Simplified Chinese Translations
eb143a6 Mms: AF translations
ae19c67 Mms: Add missing AF Translations
312c3a0 Mms : refactor translations
53a84b2 Check if mmp's encoded subject is null before used
93a5b48 Merge "MMS: Norwegian translation" into cm-10.1
451e642 Mms: Add null check for mmp
49729dc MMS: Norwegian translation
4a8f809 Mms: Fix aapt warnings
a76dccd Merge "Correct attachment type for Mms only has subject" into cm-10.1
e81428f Clear collection after we used
0a2a4e8 avoid IllegalStateException in MessagingNotification
92cef42 Correct attachment type for Mms only has subject
bfb6113 Merge "Mms: Update Polish translation" into cm-10.1
138f1b4 Mms: Refactor AF translations
29cb78e Mms: Update Polish translation
7230d92 Merge "Mms: NL translations" into cm-10.1
72608d6 Mms: CS translations
f6e0461 Merge "Mms: RU translation" into cm-10.1
af56e81 Merge "Mms: EL translations" into cm-10.1
68212fc Merge "Mms : Fr translation" into cm-10.1
213e8a1 Merge "Mms: HU update translation" into cm-10.1
9ef352b Mms : Fr translation
a3e06fa Mms: Revise default translations
21dda06 Mms: NL translations
0c511e5 Mms: HU update translation
f029979 Mms: EL translations
73b2f57 Mms: ES translations
0d9cffe Mms: RU translation
d838966 Merge "Mms: Update italian translation" into cm-10.1
d19946c Mms: Update italian translation
bc9c049 Mms: Fix aapt warnings
b7b0f4f Merge "Mms: EL translations" into cm-10.1
58d1000 Add quick emoji button next to text input
13a5602 Mms: PT-BR update translations
ad1ad27 Merge "Mms: Update Polish translation" into cm-10.1
d24e22a Merge "Mms: Simplified Chinese Translations" into cm-10.1
4a6053d Mms: Update Polish translation
c6c7ad6 Mms: EL translations
3fba63e Merge "Mms: ES translations" into cm-10.1
235e820 Merge "MMS: Softbank smiley + transition to new cm_ format" into cm-10.1
bd6e02b Merge "Mms: Reorganize Hungarian translations" into cm-10.1
abfbe38 Merge "Revert "Mms: Remove text/plain for ACTION_SEND"" into cm-10.1
e498323 Revert "Mms: Remove text/plain for ACTION_SEND"
f347698 Mms: Reorganize Hungarian translations
0f1c6b3 Mms: ES translations
4807355 MMS: Softbank smiley + transition to new cm_ format
9c8f2cb Mms: Simplified Chinese Translations
7797597 PT-BR: Update translation
0209afb Mms: Update template activity to Google UI guidelines
4c7dafb Mms: Refactor CM Additions resources
33665ad Mms: Remove text/plain for ACTION_SEND
bae9986 Merge "Mms: SoftBank emoji encoding option translations" into cm-10.1
997577a Merge "MMS: Latest Danish merges" into cm-10.1
866f0e3 Merge "Mms: fr translation (separation file custom/AOSP)" into cm-10.1
2c9ebb2 Merge "Mms: Reorganize Greek translations" into cm-10.1
6c77a36 Mms: SoftBank emoji encoding option translations
c1f6319 Mms: ES translations
929151d Merge "Mms: NL translations" into cm-10.1
7afe23f Mms: Updated 'Mark as read' notification action icon
a2ed43a Mms: Reorganize Greek translations
6c56a08 Mms: fr translation (separation file custom/AOSP)
92d9bec Merge "Mms : reorganize and add french translation" into cm-10.1
7346b49 Merge "PT-BR: Update translation" into cm-10.1
17a9a69 Merge "Update Russian translation: Mms" into cm-10.1
55616bd Merge "es_ES: Update spanish translations" into cm-10.1
eda6071 Merge "MMS: Update Polish language" into cm-10.1
923bfe1 Mms: Update italian translation
bc09f0b Mms : reorganize and add french translation
462a926 Mms: NL translations
1d7d1c2 Added hungarian translation
94666be Update Russian translation: Mms
f4fe3d2 MMS: Update Polish language
956d54c PT-BR: Update translation
ee1670d es_ES: Update spanish translations
7755143 Mms: Remove redundant NL translations
b609861 Mms: Enable SoftBank emoji encoding
9bcb998 MMS: Latest Danish merges
811bc23 Mms: Update German translation
76e904e Mms: Fix build warnings
71546cf Merge "Option to strip all unicode characters from SMS" into cm-10.1
b78f624 Merge "Afrikaans translations: Added missing items" into cm-10.1
2705a22 Option to strip all unicode characters from SMS
03d0f82 Mms: Enforce thumbnail rotation when needed (CYAN-503)
db4c8ee Update Russian translation: Mms
90bac4c Mms: values-pl: fix derp
2cce458 mms: values-pl: fix mismatched tag
b91dac8 Merge "Updated Polish language" into cm-10.1
b85b30a Updated Polish language
b3184c9 Merge "Mms: UK translations" into cm-10.1
a6c7102 Mms: UK translations
6bc01c7 es_ES: Fix spanish translations
7ba7de7 Afrikaans translations: Added missing items
20cbddd Mms: Update Greek translations
b2b2d68 Merge "Mms : reorganize and add French translation" into cm-10.1
7d09e22 Merge "Mms: Update Afrikaans translation" into cm-10.1
5261d59 Mms: Update Afrikaans translation
d0fe5ed MMS: Danish for Add contact info
f3f23ea Update Russian Translation-Mms (fix typo)-CM10.1
fa55c36 Merge "Update Russian Translation-Mms-CM10.1" into cm-10.1
95b7aa4 Merge "Fix compiler warnings" into cm-10.1
c83f8d2 Fix compiler warnings
b54020c Merge "PT-BR: Update translations" into cm-10.1
e207b49 Merge "Add Afrikaans translation" into cm-10.1
df863aa Merge "Added hungarian translation for Insert contact information" into cm-10.1
d78aa4c Merge "MMS: Change Android emoji back to original emoji set" into cm-10.1
5b0eec5 Update Russian Translation-Mms-CM10.1
512e20b Mms : reorganize and add French translation
9faa9b5 Added hungarian translation for Insert contact information
bc6d6cb Mms: Update italian translation
637c24b PT-BR: Update translations
343d609 Merge "Mms: Restore correct drawable for save button" into cm-10.1
2bc00fb MMS: Change Android emoji back to original emoji set
b5e20aa Mms: Add "Insert contact info" back
e86ee1f Mms: Restore correct drawable for save button
a6d8db2 Add Afrikaans translation
2bdb1c5 Merge "Clean up custom vibration format code." into cm-10.1
7fa4e79 Merge "Update German translation." into cm-10.1
8ad96f1 Clean up custom vibration format code.
0987574 Update German translation.
9967047 Mms: adds the option to hide sprints vm text messages, but still allows sprints vvm to receive messages.
718685e Fixed aapt warning
e1961ea Merge "Mms: Update Chinese Translations" into cm-10.1
a8d602c Mms: Remove redundant lines
3ce1525 Merge "Mms: Use a more familiar 'mark as read' icon" into cm-10.1
f69c6b9 Mms: Update Chinese Translations
7593e17 Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Mms into mr1.1-staging
4fe41c9 Merge commit 'android-4.2.2_r1' into mr1.1-staging
33defa7 Mms: Dutch translations
3632ccd Mms: Use a more familiar 'mark as read' icon
873d248 Merge "Mms: Update Greek translations" into cm-10.1
ce899b7 Merge "Mms: Hungarian translation cleanup" into cm-10.1
8beda69 Merge "es_ES: Added new spanish translations" into cm-10.1
7ca7edc Mms: Hungarian translation cleanup
5cadea9 Mms: Update italian translation
77d6627 Mms: Update Greek translations
c9940b2 es_ES: Added new spanish translations
434a1a4 Deleted unused summary string
ab76e38 Deleted extra translations
9379992 Merge "PT-BR: Update translations" into cm-10.1
4e90d46 PT-BR: Update translations
9967d1c Mms: Add missing split counter strings
7667c45 Merge "Mms: General translation cleanup" into cm-10.1
14e845b Merge "MMS: Danish strings for privacy setting" into cm-10.1
64ca281 Merge "Mms: French translations" into cm-10.1
75ae981 Mms: General translation cleanup
69b08c7 Update Russian Translation-Mms-CM10.1
f6a6c07 Mms: Fix Russian values
492b9c3 Mms: French translations
004285e MMS: Danish strings for privacy setting
db0f9c1 Added hungarian translation for privacy mode
a729a75 Mms : Default privacy mode to off
1747e8f Mms: Add privacy mode notifications
accd096 Merge "Mms: added missing Czech translation" into cm-10.1
a5e92b4 Update Russian Translation-Mms-CM10.1
da0a02a Fixing translation error
adf6c59 Mms: Avoid showing a window when marking as read
1bda9e3 Mms: Fixed a little typo in the German translation
0a4c8f6 Mms: added missing Czech translation
620db30 MMS - Update French translation
356c78e Merge "Mms: Update german translation" into cm-10.1
70504bc Mms auto-retrieval (3/3): mms app
de53f6e am cac30827: Import translations. DO NOT MERGE
15188b3 Import translations. DO NOT MERGE
cac3082 Import translations. DO NOT MERGE
8a50dbf Mms: Update german translation
63beabe Messaging: Hebrew translation
139fd16 MMS: New Danish strings
29c93ea Added hungarian translation
b7b3007 Merge "Mms: Update Greek translations" into cm-10.1
bdb2b15 Merge "Mms: Dutch translations" into cm-10.1
135ac0e German translation: SMS delivery notification
743a039 Mms: Update Greek translations
5e5e630 Mms: Dutch translations
6f69426 Mms: Take into account image rotation.
c27c844 mms: Use enter for new line if mInputType is TYPE_TEXT_VARIATION_LONG_MESSAGE
8a708f1 QuickMessage: Fix the dialog size for the N4
96997fe es_ES: Added CM translations
6d77ef6 Mms: update German translation
08318d3 PT-BR: Added missing translation
65414d0 Italian translation for Mms
3797ad3 Added and edited Danish strings in Mms
ca19bae Update Russian Translation-Mms-CM10.1
54d7ef6 Corrected SMS acronym to be capitalized
4f9b2db Import translations. DO NOT MERGE
cc9b85c Mms: Fix Custom Vibration Notifs in Simplified Chinese + Translations
8af6a0f Messaging: Fix the order of the Mark read action
4aa4141 Import translations. DO NOT MERGE
77b6ea1 QuickMessage:  Better 'Mark as read' handling
d610689 Messaging:  Only allow Mark as read when Quick reply is active
54462d0 Messaging: Add the ability to mark a message as read from the notification
49670b1 Import translations. DO NOT MERGE
d5a0984 Import translations. DO NOT MERGE
737384e Messaging: Prevent the light from being dismissed when a QM Popup wakes the device
bbfc087 Port "Fix cropping on MMS inline thumbnails"
f0dc5e4 Merge "Opening recent apps while on compose dismisses compose on re-rentering app" into jb-mr1.1-dev
0c1dc5c Merge "Change tri-state vibrate to single checkbox" into jb-mr1.1-dev
1b5e0f4 Opening recent apps while on compose dismisses compose on re-rentering app
b1a4862 Port "Allow full themeing of mms via theme chooser"
90e32e5 Change tri-state vibrate to single checkbox
9266001 Merge "SMS conversation list doesn't mantain scroll position" into jb-mr1.1-dev
cdce509 am 069464b4: Import translations. DO NOT MERGE
a814c52 Import translations. DO NOT MERGE
069464b Import translations. DO NOT MERGE
6019ec8 SMS conversation list doesn't mantain scroll position
24da6ee Area code is not displayed in To: field, while sending SMS from call log
e354675 Merge "Unable to create application com.android.mms.MmsApp" into jb-mr1.1-dev
63b5440 Unable to create application com.android.mms.MmsApp
866e53a am 29e8f29a: Import translations. DO NOT MERGE
1eb39e5 Import translations. DO NOT MERGE
29e8f29 Import translations. DO NOT MERGE
6a21425 Whitespace cleanup
5da07c3 Forward port core translations
6353699 Forward port QuickMessage and Reply
9e9ea06 Forward port miscellaneous features
6b3a42c Forward port Templates functionality
78d03e3 Forward port Split SMS functionality
c36b356 Forward port Emoji and Strip unicode support
4ced290 Merge "Bringing up the keyboard when a picture is the last item visible will always scroll the conversation to the bottom" into jb-mr1.1-dev
0ec5d8b am b9f83d58: Import translations. DO NOT MERGE
ff3560f Bringing up the keyboard when a picture is the last item visible will always scroll the conversation to the bottom
b9f83d5 Import translations. DO NOT MERGE
345e889 Reconcile with jb-mr1-release - do not merge
dd080d3 merge in jb-mr1-release history after reset to jb-mr1-dev
3e48f96 am de3b06d3: MMS doesn\'t scroll
de3b06d MMS doesn't scroll
453c66a Reconcile with jb-mr1-release - do not merge
f54c408 am ac5b2305: App doesn\'t know your pic on initial send
ac5b230 App doesn't know your pic on initial send
ede5f3c merge in jb-mr1-release history after reset to jb-mr1-dev
1664fb9 am c67a3c2d: Add message button is not titled in "Messaging widget" under lock screen
c67a3c2 Add message button is not titled in "Messaging widget" under lock screen
cd600c4 Reconcile with jb-mr1-release - do not merge
3e85942 merge in jb-mr1-release history after reset to jb-mr1-dev
b8b8cdd am 38bdb224: Merge "Flickering when MMS received" into jb-mr1-dev
89524a7 am a2b5b371: Merge "MMS doesn\'t scroll enough on tall list items" into jb-mr1-dev
38bdb22 Merge "Flickering when MMS received" into jb-mr1-dev
a2b5b37 Merge "MMS doesn't scroll enough on tall list items" into jb-mr1-dev
184934b MMS doesn't scroll enough on tall list items
1acc464 am 288707d1: Fix to hide keyboard jank-free when coming back to MMS with no draft.
0fd8d0e Flickering when MMS received
7ed0c67 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
288707d Fix to hide keyboard jank-free when coming back to MMS with no draft.
3dd601e am 6c164d36: am 0bd818f8: WRITE_SMS is possible through SMS_RECEIVED intent
6c164d3 am 0bd818f8: WRITE_SMS is possible through SMS_RECEIVED intent
37ca93d merge in jb-mr1-release history after reset to jb-mr1-dev
0bd818f WRITE_SMS is possible through SMS_RECEIVED intent
833e9b4 merge in jb-mr1-release history after reset to jb-mr1-dev
8351a9a Removing dead API
a501a6d am b7c4364c: WRITE_SMS is possible through SMS_RECEIVED intent
b7c4364 WRITE_SMS is possible through SMS_RECEIVED intent
56bc123 am d6566e19: Merge "Add more logging for video capture" into jb-mr1-dev
ec8efd0 merge in jb-mr1-release history after reset to jb-mr1-dev
d6566e1 Merge "Add more logging for video capture" into jb-mr1-dev
4b9514a merge in jb-mr1-release history after reset to jb-mr1-dev
14a5c29 Add more logging for video capture
8962ea3 am 874ef885: b/7378607: more tweaks to reduce jank interacting with the keyboard.
874ef88 b/7378607: more tweaks to reduce jank interacting with the keyboard.
65873d4 merge in jb-mr1-release history after reset to jb-mr1-dev
2936810 am 469db72f: Crash trying to save a draft with a picture from the gallery
469db72 Crash trying to save a draft with a picture from the gallery
350903f merge in jb-mr1-release history after reset to jb-mr1-dev
9d5a792 am 6e39c964: b/7390148, b/7392410: fix a couple of issues introduced by cl 558d4cc81f.
6e39c96 b/7390148, b/7392410: fix a couple of issues introduced by cl 558d4cc81f.
bd5baf6 am 9a75d01f: b/7386794: fix bad keyboard interaction in MMS.
9a75d01 b/7386794: fix bad keyboard interaction in MMS.
bead873 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2b7968c Import translations. DO NOT MERGE
f937b7d am 741128e7: Positioning of insertion point on sms draft re-launch
741128e Positioning of insertion point on sms draft re-launch
6060e90 merge in jb-mr1-release history after reset to jb-mr1-dev
4168442 am 8e44e61e: Merge "b/7363553: part 2 of fix keyboard and window layout interaction when re-entering ComposeMessageActivity." into jb-mr1-dev
8e44e61 Merge "b/7363553: part 2 of fix keyboard and window layout interaction when re-entering ComposeMessageActivity." into jb-mr1-dev
69c2368 merge in jb-mr1-release history after reset to jb-mr1-dev
85664cd am 9f12dda4: Merge "Size limit reaches for video recording even before time lapse from Messaging" into jb-mr1-dev
9f12dda Merge "Size limit reaches for video recording even before time lapse from Messaging" into jb-mr1-dev
558d4cc b/7363553: part 2 of fix keyboard and window layout interaction when re-entering ComposeMessageActivity.
35b4c5b b/7363553: fix a regression where keyboard isn't shown when composing a new message in SMS.
b1c64f5 am 868f2d2f: Merge "MMS creates a new thread when receiver is not in the Message thread" into jb-mr1-dev
868f2d2 Merge "MMS creates a new thread when receiver is not in the Message thread" into jb-mr1-dev
9949b1e am 14ec4de3: Merge "b/7363553: fix a regression where keyboard isn\'t shown when composing a new message in SMS." into jb-mr1-dev
14ec4de Merge "b/7363553: fix a regression where keyboard isn't shown when composing a new message in SMS." into jb-mr1-dev
9446c67 b/7363553: fix a regression where keyboard isn't shown when composing a new message in SMS.
97dc7b5 am 8cc338d3: Empty draft created on deleting a group MMS message
8cc338d Empty draft created on deleting a group MMS message
bd9d9bc Size limit reaches for video recording even before time lapse from Messaging
582bc61 b/7363553: fix keyboard interaction when re-entering Compose Message activity.
41ae031 MMS creates a new thread when receiver is not in the Message thread
80e0de9 am d2885b15: Merge "b/7363553: fix keyboard interaction when re-entering Compose Message activity." into jb-mr1-dev
d2885b1 Merge "b/7363553: fix keyboard interaction when re-entering Compose Message activity." into jb-mr1-dev
9f1a2c5 merge in jb-mr1-release history after reset to jb-mr1-dev
6a2f4fd am 28c4d674: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
28c4d67 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
eb82c11 Import translations. DO NOT MERGE
706aae1 b/7363553: fix keyboard interaction when re-entering Compose Message activity.
02fb7cb am 99f6f640: Max file size limit from the same phone could be different across different runs attaching a captured video
99f6f64 Max file size limit from the same phone could be different across different runs attaching a captured video
e19c8b0 am 80b12abf: (-s ours) Import translations. DO NOT MERGE
d4afef0 merge in jb-mr1-release history after reset to jb-mr1-dev
47198bf merge in jb-mr1-release history after reset to jb-mr1-dev
80b12ab Import translations. DO NOT MERGE
8f88770 IME dismissed when composing message
9deb8c6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ae0b5dc merge in jb-mr1-release history after reset to jb-mr1-dev
846dc29 IME dismissed when composing message
03c71b1 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
0405efd Merge ""No Subject" string is different for incoming and outgoing MMS" into jb-mr1-dev
9f3862b merge in jb-mr1-release history after reset to jb-mr1-dev
771fdd4 Import translations. DO NOT MERGE
4199f6b Let's enhance
ff3e600 "No Subject" string is different for incoming and outgoing MMS
1b98568 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
080317a merge in jb-mr1-release history after reset to jb-mr1-dev
bbdbb48 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
241944a Import translations. DO NOT MERGE
2527456 Conversation should scroll to the bottom when incoming received
606f7a0 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
f3f70a9 merge in jb-mr1-release history after reset to jb-mr1-dev
ab89b76 merge in jb-mr1-release history after reset to jb-mr1-dev
cc58492 merge in jb-mr1-release history after reset to jb-mr1-dev
9889006 Add setting to turn on/off group MMS
da90ea9 merge in jb-mr1-release history after reset to jb-mr1-dev
259b5ea Import translations. DO NOT MERGE
750c524 merge in jb-mr1-release history after reset to jb-mr1-dev
9c9df27 MMS not displaying image or text after sending
78d2244 merge in jb-mr1-release history after reset to jb-mr1-dev
d2f67cf STOPSHIP: Turn off MessagingNotifications DEBUG flag
85563eb merge in jb-mr1-release history after reset to jb-mr1-dev
3e48563 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
055a318 merge in jb-mr1-release history after reset to jb-mr1-dev
c957bdb Import translations. DO NOT MERGE
37f295b Merge "Fix notification icon flashing" into jb-mr1-dev
3cb3267 merge in jb-mr1-release history after reset to jb-mr1-dev
40aa858 Merge "Update references to migrated global settings." into jb-mr1-dev
61fe027 Import translations. DO NOT MERGE
8b4521b Update references to migrated global settings.
b98c3af Fix notification icon flashing
4d5b927 merge in jb-mr1-release history after reset to jb-mr1-dev
7272735 Merge "Notifications ring many times" into jb-mr1-dev
4d0536d Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d645c8b Notifications ring many times
ac03692 Import translations. DO NOT MERGE
c246f27 Fix emoticons in messaging app
c65988b merge in jb-mr1-release history after reset to jb-mr1-dev
4e4223a Import translations. DO NOT MERGE
12406fa Add content description for send mms button
4d41d93 merge in jb-mr1-release history after reset to jb-mr1-dev
2fef991 Import translations. DO NOT MERGE
9825d20 merge in jb-mr1-release history after reset to jb-mr1-dev
8124ea4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
74edcd1 Merge "SMS delete behavior odd" into jb-mr1-dev
917bea1 Import translations. DO NOT MERGE
fef5379 SMS delete behavior odd
c6be7e1 Notification beep sounds every time I open a previously viewed SMS
e088c60 Add logging for "SMS delete behavior odd"
99f719d Add logging for "SMS delete behavior odd"
bb04f3d Merge "Messaging notifications do not always come through" into jb-mr1-dev
2d65e7e Messaging notifications do not always come through
bc7f97a Notification goes to new message instead of existing thread
1077ff4 Import translations. DO NOT MERGE
8f5691e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3ebc0e7 Merge "Group MMS showing subject for every single message" into jb-mr1-dev
c31520c Merge "Enable SMS short code confirmation for built-in MMS app." into jb-mr1-dev
3c307ca Group MMS showing subject for every single message
99b4593 Enable messaging widget on lockscreen
3feb61c Enable SMS short code confirmation for built-in MMS app.
4a53968 Import translations. DO NOT MERGE
ea339a2 Unable to view all participants of Group MMS thread
8913ee1 Merge "Clicking on a persons avatar causes undesired behavior in Messaging" into jb-mr1-dev
6fa42d4 Clicking on a persons avatar causes undesired behavior in Messaging
262af08 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c6501ab Don't flash attachment box for text-only mms's
49c82e2 Draft mms can't be sent because the send button is disabled
dcfccc5 Import translations. DO NOT MERGE
3d2624f am 20da265f: am b2c79a9e: am fb15d874: Merge "Fix 2 bugs in Mms AppWidget"
00d7a79 am 99cd6ecc: am 39dede5b: am 3a48f611: Merge "Only delete the cache files if cache is null"
20da265 am b2c79a9e: am fb15d874: Merge "Fix 2 bugs in Mms AppWidget"
99cd6ec am 39dede5b: am 3a48f611: Merge "Only delete the cache files if cache is null"
b2c79a9 am fb15d874: Merge "Fix 2 bugs in Mms AppWidget"
39dede5 am 3a48f611: Merge "Only delete the cache files if cache is null"
fb15d87 Merge "Fix 2 bugs in Mms AppWidget"
3a48f61 Merge "Only delete the cache files if cache is null"
2414998 Fix a couple of bugs
9be7edc bug #7087793: remove "add to people" action menu item for group MMS.
95e0a15 bug #7128602: Messaging app crash on choosing to share all the picture attachment received on Gmail
67f9035 Merge "bug #5139811: Get rid of toast for converting message from MMS to SMS." into jb-mr1-dev
bf8489d bug #5139811: Get rid of toast for converting message from MMS to SMS.
ce2abbf Merge "java.lang.IllegalArgumentException: View not attached to window manager" into jb-mr1-dev
993503e java.lang.IllegalArgumentException: View not attached to window manager
6d2ba55 Messaging notifications do not always come through
0130374 Old thumbnail shown
cee6496 Fix 2 bugs in Mms AppWidget
ffe45d5 Only delete the cache files if cache is null
4847b98 Group MMS flickers between white square and received message when initially checking
56e8095 Auto-retrieve of MMS messages doesn't work if the option is turned on after a message is received
cb8815f Merge "On receiving a Group MMS the List view displays as two messages received" into jb-mr1-dev
6cb0e9b ANR in messaging after launch and clicking on an existing thread
d899dc4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ca239ab On receiving a Group MMS the List view displays as two messages received
553d4e8 am 81b69124: (-s ours) Reconcile with jb-release - do not merge
81b6912 Reconcile with jb-release - do not merge
f19ef48 am 56f72536: am 253230d4: Merge "Mms: Two popups are displayed when Press Enter key on message screen."
56f7253 am 253230d4: Merge "Mms: Two popups are displayed when Press Enter key on message screen."
253230d Merge "Mms: Two popups are displayed when Press Enter key on message screen."
c581e9a Import translations. DO NOT MERGE
eae91d7 am 62076938: am fe7e1e43: Merge "Mms: Fix the logging of the TransactionBundle"
a968384 am 3f6c1d2f: am 2dd0767f: Merge "Mms: JAVACRASH in com.android.mms at android.os.AsyncTask.done"
a0cbec1 am b22ea8fb: am 822ff2e4: Merge "We sometimes need a new thread id to update drafts"
6207693 am fe7e1e43: Merge "Mms: Fix the logging of the TransactionBundle"
3f6c1d2 am 2dd0767f: Merge "Mms: JAVACRASH in com.android.mms at android.os.AsyncTask.done"
b22ea8f am 822ff2e4: Merge "We sometimes need a new thread id to update drafts"
fe7e1e4 Merge "Mms: Fix the logging of the TransactionBundle"
2dd0767 Merge "Mms: JAVACRASH in com.android.mms at android.os.AsyncTask$3.done"
822ff2e Merge "We sometimes need a new thread id to update drafts"
4c6c7c6 SmsReceiverService NullPointerException in replaceFormFeeds
d6f77b1 Mms: Fix the logging of the TransactionBundle
c222f54 Mms: JAVACRASH in com.android.mms at android.os.AsyncTask$3.done
3ff7cd6 Mms: Two popups are displayed when Press Enter key on message screen.
20a7fbf Import translations. DO NOT MERGE
3619084 merge in jb-release history after reset to jb-dev
ffca002 merge in jb-release history after reset to jb-dev

   * packages/apps/Music
c37b200 Fix crash when reloading an invalid queue

   * packages/apps/MusicFX
bc778ed Support virtualizers without strength parameter
1c9259e Support virtualizers that aren't headphone-only.

   * packages/apps/Nfc
43c1153 fixed inconsistant defines that are supposed to match tagtechnology.java
90868bd Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Nfc into 1.1
f3b413c nfc: Add alternate firmware path
fb908e2 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp
be1939b Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8
525c260 Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01
6a645b3 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into HEAD
3d402b5 Nfc: Dutch translations
eba57c2 merge in jb-mr1-release history after reset to jb-mr1-dev
1a6bcf3 Serialize applying card emulation route.
4e4a642 merge in jb-mr1-release history after reset to jb-mr1-dev
5cd1d0c Hold a wakelock during initialisation.
978d7e0 merge in jb-mr1-release history after reset to jb-mr1-dev
5040f60 Delay sending EE-wipe APDUs.
fe5f3b9 merge in jb-mr1-release history after reset to jb-mr1-dev
b340c6c Fix wrong Beam image scaling on sw600 and larger devices.
ce3c183 Reset RF field status on SE activation.
a06fe0f merge in jb-mr1-release history after reset to jb-mr1-dev
dce0f82 Merge "Fix Beam animation for non-owner user." into jb-mr1-dev
47dbe9f am 547b58f4: Fix tag not deactivating to sleep during reconnect.
14a3534 am a15b24e9: Check for invalid handle before configuring secure element.
547b58f Fix tag not deactivating to sleep during reconnect.
a15b24e Check for invalid handle before configuring secure element.
b034c8b Fix Beam animation for non-owner user.
923a30f merge in jb-mr1-release history after reset to jb-mr1-dev
81aa989 Don't hold a timed wakelock.
595c62b merge in jb-mr1-release history after reset to jb-mr1-dev
59f43ae am a949c743: Fast-fail SE open if it\'s activated in listen mode.
1b40470 am ae1b16cf: (-s ours) Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)
a949c74 Fast-fail SE open if it's activated in listen mode.
ae1b16c Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)
f1c7e20 merge in jb-mr1-release history after reset to jb-mr1-dev
965cc60 merge in jb-mr1-release history after reset to jb-mr1-dev
2a34c5f merge in jb-mr1-release history after reset to jb-mr1-dev
ec490fa am accbb8c9: Don\'t return target lost in case of NACK for T2T.
accbb8c Don't return target lost in case of NACK for T2T.
323beb6 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp-merge
a9f1c76 Merge "NFC changes for multi-user support." into jb-mr1-dev
5eb0e4a Set EE wipe APDUs for NCI stack.
88913e6 NFC changes for multi-user support.
622209f merge in jb-mr1-release history after reset to jb-mr1-dev
b1ba0d2 am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc
f4c1767 am 10dd44d3: NFA_HciAddStaticPipe()\'s parameters changed
7bb9229 Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfc
344a165 merge in jb-mr1-release history after reset to jb-mr1-dev
07d1b6e Increase default transceive timeout to SE to 30s.
10dd44d NFA_HciAddStaticPipe()'s parameters changed
98f3f63 Use RF_ACTIVATE/DEACTIVATE to generate RF events.
4d1500f merge in jb-mr1-release history after reset to jb-mr1-dev
f08a77e on handsets where Gwallet is enabled, HCE turns off for good after Gwallet is fired up.  This patch fixes the scenario of Gwallet and HCE living happily together.  it is a fix, really, for the intended function of when an HCE application is in the forground, it has control, all other times Gwallet gets control of emulation from SE.
b2d09c0 Merge "NfcAdapterExtras: add driver name." into jb-mr1-dev
fc388de am c7d56f7e: Fix locking around power state.
55b2c91 NfcAdapterExtras: add driver name.
c7d56f7 Fix locking around power state.
9b1f485 merge in jb-mr1-release history after reset to jb-mr1-dev
ef953e2 am e897cc40: Substitute empty select for configurable AID.
e897cc4 Substitute empty select for configurable AID.
04a2046 merge in jb-mr1-release history after reset to jb-mr1-dev
a3bf4c3 am 7379fb73: Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc
7379fb7 Merge "Fix native crash during RF field notifications." into jb-broadcom-nfc
e8f4eba Fix native crash during RF field notifications.
28d98c6 merge in jb-mr1-release history after reset to jb-mr1-dev
717dc3e am 43727fbb: Power up the NFCC when DH wants to talk to the SE.
1d79d84 am a80bb9a5: Do not activate a tag during NFC disable.
43727fb Power up the NFCC when DH wants to talk to the SE.
a80bb9a Do not activate a tag during NFC disable.
46353a8 merge in jb-mr1-release history after reset to jb-mr1-dev
bdcdfc4 am 914d6caa: Disable all RF activity when DH connects to SE.
c420066 merge in jb-mr1-release history after reset to jb-mr1-dev
914d6ca Disable all RF activity when DH connects to SE.
70c3445 am 18ccd96a: Enable/disable RF discovery only when needed.
2e4fc72 am a112f9c0: Fix NFC->Bluetooth headset/a2dp connection.
18ccd96 Enable/disable RF discovery only when needed.
1f1f49e merge in jb-mr1-release history after reset to jb-mr1-dev
a112f9c Fix NFC->Bluetooth headset/a2dp connection.
d7b6ee3 am 2f9909a2: Tell secure element to warm-reset when closing pipe to DH.
a89de4f am dc8a29da: Fix NXP PN544 controller interop with Broadcom controller
c15561c am 5b26e322: Don\'t try to set low-power mode if NFA_enable fails.
2f9909a Tell secure element to warm-reset when closing pipe to DH.
dc8a29d Fix NXP PN544 controller interop with Broadcom controller
5b26e32 Don't try to set low-power mode if NFA_enable fails.
7d53d8d Don't hold the routing wakelock longer than a minute.
7314bbe Merge "Don't hold the routing wakelock longer than a minute." into jb-mr1-dev
04b8291 Don't hold the routing wakelock longer than a minute.
435d7aa merge in jb-mr1-release history after reset to jb-mr1-dev
5cb4232 am 46974c09: Don\'t print error for resetting SE route.
46974c0 Don't print error for resetting SE route.
2cd4a00 am 0873b051: Grant license
e32740a am b95ef0b6: copyright by The Android Open Source Project
0873b05 Grant license
b95ef0b copyright by The Android Open Source Project
5661fe3 merge in jb-mr1-release history after reset to jb-mr1-dev
eec15a2 Merge "Merge NFCEE wakelocks." into jb-mr1-dev
8676119 am 7be608bc: Fix locking in PeerToPeer.
b64ce36 Merge NFCEE wakelocks.
7be608b Fix locking in PeerToPeer.
f0d8db6 am c6cf8e45: Integrate NFC Hardware Abstraction Layer.
c6cf8e4 Integrate NFC Hardware Abstraction Layer.
deb2a2c merge in jb-mr1-release history after reset to jb-mr1-dev
eecb57f am bd233c44: Merge "User proper error code during tag reading" into jb-broadcom-nfc
c7711f3 am a960b02c: Merge "Use correct app name for NFA_HciDeregister()" into jb-broadcom-nfc
565d146 am cf72e2c3: Fix NFC low-power modes.
bd233c4 Merge "User proper error code during tag reading" into jb-broadcom-nfc
a960b02 Merge "Use correct app name for NFA_HciDeregister()" into jb-broadcom-nfc
643bf71 User proper error code during tag reading
0056bce Use correct app name for NFA_HciDeregister()
435616c merge in jb-mr1-release history after reset to jb-mr1-dev
9fecbe8 Add FLAG_ACTIVITY_NEW_TASK to viewIntent
cf72e2c Fix NFC low-power modes.
26749e2 am 2bc17929: Use NFA_DM_DISC_DURATION_POLL from config file.
2bc1792 Use NFA_DM_DISC_DURATION_POLL from config file.
dbc2f87 am cdf5b0e0: Remove old NPP->SNEP redirect code.
6ad6da1 Merge "Do not dispatch empty NDEF tags as NDEF_DISCOVERED." into jb-mr1-dev
cff4b0c am 3463d49a: Correct spelling.
15890a0 am 7e5bdc93: correctly handle P2P congestion event
343c344 am 08030f1c: handle NACK, ACK for Mifare Ultralight
e0e8b48 am cf83b532: Merge "Remove "brcm" in names" into jb-broadcom-nfc
f9f309b Do not dispatch empty NDEF tags as NDEF_DISCOVERED.
36693e5 merge in jb-mr1-release history after reset to jb-mr1-dev
cdf5b0e Remove old NPP->SNEP redirect code.
3463d49 Correct spelling.
7e5bdc9 correctly handle P2P congestion event
08030f1 handle NACK, ACK for Mifare Ultralight
cf83b53 Merge "Remove "brcm" in names" into jb-broadcom-nfc
01bd745 Remove "brcm" in names
a396754 am db216e63: Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.
48f3e2b merge in jb-mr1-release history after reset to jb-mr1-dev
db216e6 Add FLAG_ACTIVITY_NEW_TASK to Beam Handover intent.
9ad7210 am f340f1a0: Upgrade to stack NFA_MI_1.03.36
8efb854 Merge "card emulation patch port to JB" into jellybean
f340f1a Upgrade to stack NFA_MI_1.03.36
1f28717 merge in jb-mr1-release history after reset to jb-mr1-dev

   * packages/apps/PackageInstaller
a4b300d Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into 1.1
32f720a Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into HEAD
8c61b89 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3e76ae1 merge in jb-mr1-release history after reset to jb-mr1-dev
8124c24 Fix issue #7448596: Can't uninstall app that was installed by another user
bb0fa78 merge in jb-mr1-release history after reset to jb-mr1-dev
03347ba Fix issue #7323256: permission dialog has bad layout
d3c70e1 merge in jb-mr1-release history after reset to jb-mr1-dev
ba12a2c Import translations. DO NOT MERGE
72a9c25 merge in jb-mr1-release history after reset to jb-mr1-dev
4c8e26f Import translations. DO NOT MERGE
6f9be30 merge in jb-mr1-release history after reset to jb-mr1-dev
70021c3 Import translations. DO NOT MERGE
7073187 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
cbf686a merge in jb-mr1-release history after reset to jb-mr1-dev
578b9ba Import translations. DO NOT MERGE
8b16399 Merge "Determine the originating uid for an install" into jb-mr1-dev
39ce051 merge in jb-mr1-release history after reset to jb-mr1-dev
85a283f Import translations. DO NOT MERGE
d58f150 Determine the originating uid for an install
8609592 Fix issue #7240599 Permissions UI: left side padding on...
6213650 Import translations. DO NOT MERGE
349acf5 merge in jb-mr1-release history after reset to jb-mr1-dev
4dca31b Merge "Update references to migrated global settings." into jb-mr1-dev
9e8baaa Update references to migrated global settings.
d99b9d5 Import translations. DO NOT MERGE
4dcf2ae merge in jb-mr1-release history after reset to jb-mr1-dev
0973f64 Import translations. DO NOT MERGE
e07de69 merge in jb-mr1-release history after reset to jb-mr1-dev
f9e9a15 Import translations. DO NOT MERGE
655bd2e merge in jb-mr1-release history after reset to jb-mr1-dev
8e76615 Import translations. DO NOT MERGE
ec75fbc Merge "Allow side-loading of apps from other users." into jb-mr1-dev
aba0bed Allow side-loading of apps from other users.
b177595 Import translations. DO NOT MERGE
2879faa merge in jb-mr1-release history after reset to jb-mr1-dev
be38912 Import translations. DO NOT MERGE
dc73416 merge in jb-mr1-release history after reset to jb-mr1-dev
3e0c22f Implement new option for uninstalling over all users.
2bdb96c merge in jb-mr1-release history after reset to jb-mr1-dev
8ec226e Further adjustment of the new package installer UI.
5d69a62 merge in jb-mr1-release history after reset to jb-mr1-dev
37df032 New permissions UI.

   * packages/apps/Phone
a7f9d43 Phone: CS translation
27d169b Phone: EL translations
b7506b7 Merge "Phone: Simplified Chinese Translations" into cm-10.1
9c1d415 Merge "Phone: DA translation" into cm-10.1
fb421e6 Phone: Simplified Chinese Translations
32f217e Phone: DA translation
a58b10e Merge "Phone: RU translation" into cm-10.1
4fdf4b3 Phone: Update German translation
ac5cb26 Phone: RU translation
d0f21c0 Merge "Phone: IT translations" into cm-10.1
9d1d1e2 Phone: IT translations
3f504eb Merge "Phone : FR translation" into cm-10.1
ab314f1 Merge "Phone: HU translation" into cm-10.1
76be6e1 Merge "Phone: PT-BR translations" into cm-10.1
1224a11 Phone: NL translation
6a44466 Phone: HU translation
b1bb024 Phone: PT-BR translations
bdf2fee Phone: ES translations
bd7d8f7 Phone : FR translation
90f6990 phone: Add option for setting device phone number (squashed)
a974719 Phone: correct summary of national roaming [translation]
e0c9f44 Phone: Update Polish translation
5ccc897 Also show contact name in blacklist.
5bf60f5 Merge "Store phone blacklist in content provider (4/4)" into cm-10.1
cdc1b8c Merge "Make contacts app aware of blacklist setting (2/3)" into cm-10.1
58b3597 Merge "Add android.permission.INTERCEPT_SMS permission." into cm-10.1
3d5986f Add android.permission.INTERCEPT_SMS permission.
f8b8f26 Phone: PT-BR update translations
7d24a35 Store phone blacklist in content provider (4/4)
8ada1e8 Make contacts app aware of blacklist setting (2/3)
459351a Phone: Disable accelerometer sensor while in-call and screen UI is off
65c396d Fix typo
d475780 phone: Set default preference values for blacklist option
fcc2fed phone: Enable the blacklist by default
00ecaf6 Phone: Update Afrikaans translation
aa1b53a Hide additional blacklist separator
979e090 Merge "Phone: Update German translation" into cm-10.1
d05220a Phone: Update German translation
ad4185d Fix a Cursor leak
f1e04bf Fix a Cursor leak
fcc27d4 Merge "PhoneApp: Initialize ToneGenerator when needed" into cm-10.1
5c8b278 PhoneApp: Initialize ToneGenerator when needed
c3179fc Merge "Add missing back icon in action bar of Network Operator" into cm-10.1
34efced Merge "Phone: Ignore touch during network operators search" into cm-10.1
7887099 NetworkSettings: Cannot dismiss progress dialog sometimes.
978311a Phone: Ignore touch during network operators search
b0a550a Add missing back icon in action bar of Network Operator
088c16f Fix call target drawable misalignment for sw600-[m|h|xh]dpi.
b9d6ba5 Phone: Fix typo in activity
3762329 Merge "Kill off use off FORCE_LED_WITH_SCREEN_OFF notification flag." into cm-10.1
bf0d8b5 Kill off use off FORCE_LED_WITH_SCREEN_OFF notification flag.
b4ac352 Phone: DA translation
524aed3 Phone: Simplified Chinese Translations
db1fe46 Merge "Phone: Simplified Chinese Translations" into cm-10.1
4bcb029 Phone: EL translation
13b15f9 Phone: Simplified Chinese Translations
9e38370 Merge "Update German translation." into cm-10.1
b571610 Phone: Add Missing AF Translations
7e2f813 Merge "Phone: HU update translation" into cm-10.1
8ff1687 Merge "Phone: DA translation" into cm-10.1
cd92a36 Merge "Phone : FR Translation" into cm-10.1
ee8c700 Merge "Phone: CS translation" into cm-10.1
7eb15a9 Phone : FR Translation
6271be1 Phone: RU translation
313d634 Phone: correcting translations
ea7ed83 Phone: HU update translation
b1e1f3d Phone: CS translation
31f82da Phone: Update italian translation
ed62f00 Merge "Phone : refactor translations" into cm-10.1
618c929 Phone : refactor translations
aa3500a Phone: DA translation
704549a Merge "Phone: NL translation" into cm-10.1
e366039 Phone: NL translation
a83a24c Merge "Phone: PT-BR update translations" into cm-10.1
a3ed6ba Default back to LTE/WCDMA/GSM if supported
6375ed8 Merge "Phone: Update Polish translation" into cm-10.1
28f3240 Merge "Phone: HU translation update" into cm-10.1
68e8c6b Merge "Phone: ES translations" into cm-10.1
74ded82 Phone: Update Polish translation
611ed76 Phone: HU translation update
510c205 Do not attempt to do any matching against the '0000' number.
4793fd8 Phone: ES translations
fcb2ce1 Update German translation.
c6002c8 Phone: Add blacklist unknown numbers functionality
ab38edb Merge "Phone: Display toast message for blank USSD request" into cm-10.1
bcc86be Phone: PT-BR update translations
9e75dfe Merge "Phone: Update Polish translation" into cm-10.1
4ca61e8 Merge "Phone: Update italian translation" into cm-10.1
04e7c75 Phone: Update Polish translation
be09c92 Merge "Phone: NL translations" into cm-10.1
6ea2be5 Merge "Phone: RU translation" into cm-10.1
f5d6a96 Phone: Update italian translation
e5d8436 Phone: ES translations
559a31a Phone: Display toast message for blank USSD request
8e77da4 Phone: NL translations
258ebfe Phone: RU translation
1ca5d1e Allow notification expansion if multiple calls were missed or blacklisted.
0b3d745 Merge "Phone: Update italian translation" into cm-10.1
339aa0c Merge "Phone: RU translations" into cm-10.1
9fa990c Merge "Phone: Refactor AF translations" into cm-10.1
5f197ec Merge "Phone : Fr translation" into cm-10.1
6b2d6c2 Merge "Shorten string in german translation" into cm-10.1
2a6dab3 Phone: RU translations
7f2ae49 Phone : Fr translation
41eb9ca Phone: ES translations
ac7bf96 Phone: Update italian translation
ae97b82 Fix aapt warnings caused by stale strings in translations.
25c4787 Shorten string in german translation
fa82584 Merge "Added hungarian translation for block private numbers" into cm-10.1
06b967e Merge "Phone: EL translations" into cm-10.1
0dfc817 Merge "Phone: PT-BR update translations" into cm-10.1
0a7e642 Merge "Phone: Simplified Chinese Translations" into cm-10.1
1fc332c Phone: Simplified Chinese Translations
4a169b4 Phone: Reorganize German translation
4cca418 Phone: EL translations
b205916 Added hungarian translation for block private numbers
8993db8 Merge "Phone : fr translation" into cm-10.1
51ea3a0 Fix up 'add to blacklist' button behaviour
5ee6569 Merge "Phone: ES translations" into cm-10.1
164f64b Merge "Phone: Danish for blacklist + transition to new cm_ format" into cm-10.1
e65f5d2 Merge "Phone: Reorganize Hungarian translations" into cm-10.1
4d2b001 Merge "Phone: Update Polish translation" into cm-10.1
0c5963e Fix option description to match behaviour.
55c0d85 Phone: PT-BR update translations
07e74cc Phone : fr translation
6657b9a Phone: Update Polish translation
2007a5f Phone: Add summary to block private numbers functionality
8b395a3 Phone: Reorganize Hungarian translations
32315c9 Merge "PT-BR: Update translation" into cm-10.1
b513093 Phone: ES translations
aa8a5d5 PT-BR: Update translation
963ce87 Phone: Danish for blacklist + transition to new cm_ format
3295a2e Add support for proprietary libaudio voice quality filter
c5c2291 Fix rebase derp.
f3141ae Phone blacklist: block private numbers functionality
6b12eac Phone: Fix reorganization
e1d449f Phone: Refactor CM Additions resources
07bed0f Phone: Refactor AF translations
5bea409 Phone: Update italian translation
e3cebac Merge "Add option to mark user-rejected calls as missed" into cm-10.1
9125d08 Merge "Phone: Danish for latest merges" into cm-10.1
72e99a4 Merge "Phone: Update Polish translation" into cm-10.1
4c36828 Merge "Phone: Reorganize Greek translations" into cm-10.1
baede1a Phone: ES translations
1a7911d Add option to mark user-rejected calls as missed
feaf69e Phone: Update Polish translation
28980bb Merge "Phone: Allow voicemail notifications to be dismissed" into cm-10.1
cba0459 PT-BR: Update translation
f59760a Phone: Reorganize Greek translations
161973b Phone: Add Blacklist functionality
c939b30 Merge "Fix wrong Phone captions" into cm-10.1
8a77589 Merge "Phone : reorganize and add french translation" into cm-10.1
d66c8c2 Phone: Allow voicemail notifications to be dismissed
576d9e9 Phone : reorganize and add french translation
e1321c1 Fix wrong Phone captions
5522a41 Phone: Dutch translations
2bea6ff Afrikaans translations: Added missing items
79e7327 Phone: Danish for latest merges
d6dac99 Merge "Update Russian Translation-Phone-CM10.1" into cm-10.1
617e7aa Merge "PT-BR: Update translations" into cm-10.1
a46e9fe Merge "Phone: Update italian translation" into cm-10.1
d4511e4 Phone: Update Polish translation
c54883e Merge "Added hungarian translation" into cm-10.1
ce923ea es_ES: Add spanish translation
c389b30 Phone: Update italian translation
9253bfa Added hungarian translation
0f35375 Update Russian Translation-Phone-CM10.1
17bb2f2 PT-BR: Update translations
237661e Merge "Make going to call log after call optional." into cm-10.1
b5ada5d Merge "Phone: Fix LTEToggle for t0ltecdma" into cm-10.1
579d149 es_ES: Add spanish translation
4c431b6 Make going to call log after call optional.
22d8934 Slight Portuguese fix. Add LTE/WCDMA in preferred_network_mode_choices_lte_gsm to stop crash
a8ed625 Merge "Indicate call wait state in call title instead of only showing a toast." into cm-10.1
bf0cdc1 Phone: Minor Polish language update
dafa5c2 Indicate call wait state in call title instead of only showing a toast.
a653cd1 Merge "Updated Polish translation" into cm-10.1
4354b8b Updated Polish translation
2dd5375 Merge "Phone : add french translation" into cm-10.1
2aa5f49 Merge "Update Phone uk translation" into cm-10.1
cca9a66 Phone : add french translation
cdc4972 Merge "Phone: Settings: do not override network mode on read" into cm-10.1
a0e4c48 Merge "Phone: Update Greek translations" into cm-10.1
87ebdd7 Update Phone uk translation
05e556a Phone: Settings: do not override network mode on read
aa08f2d Merge "Phone: Simplified Chinese Translations" into cm-10.1
628f8d5 Phone: Update Greek translations
bf15aaf Update Russian Translation-Phone-CM10.1
e67639e Phone: Fix LTEToggle for t0ltecdma
c7970c8 Phone: Update italian translation
5213f7c Add Afrikaans translation
2996b79 Phone: Simplified Chinese Translations
54ff322 Phone: Update German translation
c4c09d4 Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Phone into mr1.1-staging
14ca75f Merge "Update Russian Translation-Phone-CM10.1" into cm-10.1
b0fec5d Merge "PT-BR: Update translations" into cm-10.1
2bc0805 Merge commit 'android-4.2.2_r1' into mr1.1-staging
e00a3b0 es_ES: Added spanish translations
4dde92e PT-BR: Update translations
ac10085 Update Russian Translation-Phone-CM10.1
c486253 Added hungarian translation for Flip to mute/dismiss call
436e19f Flip to mute/dismiss call
2135509 Phone: Updated italian translation
ea0b98e Added missing hungarian translation
09c1452 Phone: Hebrew translation
f4f1229 Don't update call card when new info is worse
a709bfb Phone: Update Swedish translations Signed-off-by: Jocke Gustin <jocke.gustin@gmail.com>
d010251 Phone: New Danish strings
d6b392a Phone: Simplified Chinese Translations
3dc289f Merge "Update Russian Translation-Phone-CM10.1" into cm-10.1
ed4dae5 Merge "Phone: Update Greek translations" into cm-10.1
da93710 Merge "PT-BR: Added missing translations" into cm-10.1
9a1b9d5 Merge "Phone: Danish missing strings" into cm-10.1
7b4d068 Update Russian Translation-Phone-CM10.1
fef25b1 Phone: Dutch translations
f55b973 Phone: Update Greek translations
7bf0d39 Fix occasional ring volume reset
4ca515c Merge "Phone: German translation forward port CM 10 ==> CM 10.1" into cm-10.1
6163548 Merge "Set ringtone mode even if ringer is silent." into cm-10.1
41c1421 Merge "PT-BR: Merge CM10 translations + missing translation" into cm-10.1
994f6b8 Merge "Added hungarian translations" into cm-10.1
174b3e5 Phone: German translation forward port CM 10 ==> CM 10.1
254ec6f Phone: Danish missing strings
78d5b03 Phone: updated romanian translation
bf99017 Added hungarian translations
ae601c6 Set ringtone mode even if ringer is silent.
579025b PT-BR: Added missing translations
c3d9960 Phone: Sprint MWI Quirk: Phantom message wait indicator workaround
3f16244 Merge "es_ES: Added CM translations" into cm-10.1
47b0423 es_ES: Added CM translations
4c09455 Update Russian Translation-Phone-CM10.1
0142b5f Use supplementary service notifications to display additional call info.
1ebbe17 Merge "Clean up in-call vibration implementation." into cm-10.1
52fc772 Phone: romanian translations ported from CM10
914e908 PT-BR: Merge CM10 translations + missing translation
e3d9710 Clean up in-call vibration implementation.
4129c02 Port network mode toggle from CM10
0d96e45 Phone: Danish translation
28f2204 Phone: Forward port Add national data roaming and make it optional (2/2)
707be17 Port Russian Translation from CM10 to CM10.1-Phone
e7c1bd6 Import translations. DO NOT MERGE
e7540db Merge "Forward porting CM10 Advanced Phone Settings" into mr1-staging
0cc39b4 Phone : Update reference to Apn Settings
bee94a5 Forward porting CM10 Advanced Phone Settings
2bf69b0 Import translations. DO NOT MERGE
2b9f0a8 Remove hard-coded CDMA roaming mode restrictions.
1539b9f Support additional LTE network modes
4a79269 Import translations. DO NOT MERGE
085d23d Import translations. DO NOT MERGE
4e8b647 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
48a648e Merge "Rename Ringtone category header in call settings" into jb-mr1.1-dev
00dd3e8 Import translations. DO NOT MERGE
90c957f Port "Phone: Add transparency to incall screen"
15d2f11 Phone: Forward port Add Missed call and Voicemail specific notification lights
8cc1fc8 Merge "Change accessibility code to a timed dmtf signal instead of shortDtmfTone." into jb-mr1.1-dev
2edd1b8 Merge "Change notification settings in Phone" into jb-mr1.1-dev
91280b5 Change notification settings in Phone
375df3c Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
524b481 Change accessibility code to a timed dmtf signal instead of shortDtmfTone.
f9abded Remove unused IExtendedNetworkService support
ddf9b34 Import translations. DO NOT MERGE
fbd1593 Rename Ringtone category header in call settings
f3dd703 Phone: implement noise suppression for phone calls (2/2)
48b937b Merge "Force emergency dialer to portrait mode" into jb-mr1.1-dev
2b25f33 Phone: Dialpad settings
af7864b Forward port Ascending ringtone
2db27c0 Import translations. DO NOT MERGE
a85eca2 Merge "When answering a call, stop ringing even if network takes too long to connect." into jb-mr1.1-dev
0629414 Merge "Adding "ABSENTNUMBER" to the list of known constants from network." into jb-mr1.1-dev
4fb656a When answering a call, stop ringing even if network takes too long to connect.
62d9539 Adding "ABSENTNUMBER" to the list of known constants from network.
55db52d Hit area for End Call changed from percent to deadzone.
e4bcb9d Force emergency dialer to portrait mode
779f058 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
5c24ba2 Make sure to move InCallScreen to back on disconnect
6b3d403 Make sure to move InCallScreen to back on disconnect
1462606 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
9295859 merge in jb-mr1-release history after reset to jb-mr1-dev
c5c0a14 Let's enhance
27208d5 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2b9fc03 merge in jb-mr1-release history after reset to jb-mr1-dev
a482025 merge in jb-mr1-release history after reset to jb-mr1-dev
579664e merge in jb-mr1-release history after reset to jb-mr1-dev
1da25c4 am 19087f9a: (-s ours) am fee5046c: Import translations. DO NOT MERGE
a808c2c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
19087f9 am fee5046c: Import translations. DO NOT MERGE
9a44cd6 Import translations. DO NOT MERGE
fee5046 Import translations. DO NOT MERGE
2be94ac Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
602a879 Import translations. DO NOT MERGE
b764c10 Fix accessibility feedback in emergency dialer.
d22f355 merge in jb-mr1-release history after reset to jb-mr1-dev
0e1e72e Handle exception if nobody handles ACTIVITATION
560b03d merge in jb-mr1-release history after reset to jb-mr1-dev
0988dac Add lift-to-type to emergency dialer.
092457c merge in jb-mr1-release history after reset to jb-mr1-dev
b72996c merge in jb-mr1-release history after reset to jb-mr1-dev
92c8c6d Implement lift-to-type for accessibility in DTMFTwelveKeyDialer.
e70a5e5 Merge "Migrate telephony settings to Global." into jb-mr1-dev
b7b2ff9 merge in jb-mr1-release history after reset to jb-mr1-dev
3979da5 Migrate telephony settings to Global.
4e7a758 Remove use of poke locks.
110d03c Remove clearUserActivityTimeout().
a1d5ec0 merge in jb-mr1-release history after reset to jb-mr1-dev
df3629a Merge "Get rid of preventScreenOn()." into jb-mr1-dev
34f76bf Get rid of preventScreenOn().
7204092 More issue #7226656 second user seeing primary user's apps
a538e34 merge in jb-mr1-release history after reset to jb-mr1-dev
9ce3ad1 merge in jb-mr1-release history after reset to jb-mr1-dev
8093f0b Enforce MODIFY_PHONE_STATE permission for phone state change and query
25add64 Update references to migrated global settings.
6bc5512 merge in jb-mr1-release history after reset to jb-mr1-dev
d6d7900 Merge "build break fix" into jb-mr1-dev
3861ae3 build break fix
2aa94df Airplane mode (and other) setting moved to global.
cf130db Merge "Airplane mode (and other) setting moved to global." into jb-mr1-dev
0591b6e Airplane mode (and other) setting moved to global.
cc01c5e Glowview showing above incall screen.
20c2cf9 merge in jb-mr1-release history after reset to jb-mr1-dev
ef918bb Suppress location information for non-active users.
a276b79 Merge "Correct classname for BroadcastReceiver in manifest" into jb-mr1-dev
5680507 Correct classname for BroadcastReceiver in manifest
924caef Fix phone-related notification actions.
d9d08eb Fix phone-related notification actions.
859760f Merge "Don't crash phone app when running as non-primary user." into jb-mr1-dev
7685f0d am 14ab81f2: (-s ours) Reconcile with jb-mr0-release - do not merge
14ab81f Reconcile with jb-mr0-release - do not merge
a1a9601 Don't crash phone app when running as non-primary user.
36255b7 Adding contextual "Voice Mail" text to in-call dialpad.
7fa5266 Explicitly specify current user everywhere home is started.
6046c0d Fix for screen staying on at quick response dialog
75a1e42 am 98e53a1f: resolved conflicts for merge of 08336552 to jb-dev-plus-aosp
98e53a1 resolved conflicts for merge of 08336552 to jb-dev-plus-aosp
0833655 Adding contextual "Voice Mail" text to in-call dialpad.
52fb569 am b473ded2: (-s ours) Reconcile with jb-release - do not merge
b473ded Reconcile with jb-release - do not merge
91177a7 Update to specify which user broadcasts should go to.
f343ff1 merge in jb-release history after reset to jb-dev
ac37249 merge in jb-release history after reset to jb-dev

   * packages/apps/Protips
44a9b23 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Protips into HEAD

   * packages/apps/Provision
9b478de Provision: Set Settings.Secure.USER_SETUP_COMPLETE bit
10c3003 Update references to migrated global settings.

   * packages/apps/QuickSearchBox
c52cdc1 Issue 6501: "Search" application stops when entering its settings
ed13dbf Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/QuickSearchBox into HEAD
1229922 QuickSearchBox: Fix NPE if Google Apps not installed

   * packages/apps/SamsungServiceMode
92afcdc SamsungServiceMode: Afrikaans translation
0f4144d Added PT-PT language support for Samsung Service Mode
b5ecf0c SamsungServiceMode: German translation
72e86ef SamsungServiceMode: DA translation
9ecce0a SamsungServiceMode: NL translations
ac11c3e SamsungServiceMode : add french translation
3282bc0 Merge "SamsungServiceMode: RU translation" into cm-10.1
54e8680 SamsungServiceMode: RU translation
7d0ef36 SamsungServiceMode: CS translation
58d8fe3 Merge "SamsungServiceMode: ES translations" into cm-10.1
e659944 SamsungServiceMode: ES translations
feb3e3d SamsungServiceMode: Update resources
b4b42f4 PT-BR: Update translation
bd99c46 SamsungServiceMode: dynamic line count
55e90eb SamsungServiceMode: higher number of lines to support jellybean radios
c876655 SamsungServiceMode: add required telephony-common library

   * packages/apps/Settings
2923439 Fix NL translation
f5ec4c1 Settings: Change NB translation for Launcher
bc51812 Settings: improve EL translations
4255ecd Settings: EL translations
23ebbde Merge "Settings: FR Translation" into cm-10.1
f97bcee Settings: Update German translaion
e16e472 Settings: FR Translation
9028b09 Merge "Settings: DA translation" into cm-10.1
937df1c Also remove preferences if app is installed, but disabled.
51328ad Settings: DA translation
4f5e12e Settings : Simplified Chinese translation
f149894 Merge "Settings: CS translation" into cm-10.1
48352d9 Merge "Settings: RU translation" into cm-10.1
4407082 Merge "Settings: IT translations" into cm-10.1
248a2f2 Hide the camera widget option if no camera on device
fd50f7a Settings: RU translation
fdc3004 Merge "Settings: HU translation" into cm-10.1
cc9525b Settings: ES translations
ea0ecfd Settings: IT translations
84ef117 Merge "Settings: NL translation" into cm-10.1
c321f04 Merge "Minor typo fix Wi-FI -> Wi-Fi" into cm-10.1
56fc440 Settings: PT-BR translations
a97896c Merge "Sort disabled apps to the end of the list in privacy guard manager." into cm-10.1
003a4a6 Merge "Fix app selection when adding apps to app groups." into cm-10.1
2959699 Settings: CS translation
aeb38b4 Settings: NL translation
3d40641 Sort disabled apps to the end of the list in privacy guard manager.
51b64b3 Fix derp.
6d18c09 Settings: HU translation
0e9d44b Fix app selection when adding apps to app groups.
bd78e70 Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1
103c61c Minor typo fix Wi-FI -> Wi-Fi
45f9174 Merge "Settings: CS translation" into cm-10.1
f8e7fde Merge "Settings: CS AOSP translation" into cm-10.1
28a91a1 Merge "Settings: update Japanese translation." into cm-10.1
8244fc0 Merge "Settings : FR translation" into cm-10.1
a8ed3ec Merge "Settings: EL translations" into cm-10.1
b55f7fa Make notification-shade-collapse-after-dismiss behaviour configurable.
b070699 CellBroadcast: Disable App links on wifi-only devices
5a29d43 Merge "Settings: ES translations" into cm-10.1
27a9c83 Settings: CS translation
68b5148 Settings: EL translations
bda0e89 Settings: ES translations
d1f1fb4 Hide the AM/PM preference completely if using a 24-hour clock
2413c24 Merge "Settings: NL translations" into cm-10.1
507fbd4 Settings: update Japanese translation.
0b4dc3c Settings: CS AOSP translation
41f3419 Merge "Settings: Update Polish translation" into cm-10.1
dd7ce06 Merge "Add a quick SELinux mode toggle" into cm-10.1
22bf8e8 Add a quick SELinux mode toggle
fcd38b6 Settings: NL translations
1d0cc23 Fix IllegalArgumentException in Privacy Guard Manager
300fa0b Merge "Settings: Update italian translation" into cm-10.1
9a85e09 Merge "Settings: CS translation" into cm-10.1
8f1a8f5 Settings: Update Polish translation
58ee194 Settings : FR translation
d6163ac Settings: Update italian translation
2f644d4 Merge "Settings: HU translation" into cm-10.1
49a1800 Settings: RU translation
2443b78 Settings: HU translation
c18d6b8 Settings: PT-BR translations
b6d2bc7 Add lockscreen rotation as an optional rotation setting (2/2)
8182bae Merge "Update German translation." into cm-10.1
5a62ab4 Merge "Let accessibility feature instructions scroll." into cm-10.1
4929e9e Let accessibility feature instructions scroll.
e6c3aea Settings: Improve QS tiles config code
25707cd Settings: CS translation
49d5078 Settings: ES translations
61d7e0a Merge "Settings: RU translation" into cm-10.1
83d6c34 Settings: SK translations
8447b22 Settings: RU translation
eb44604 Merge "Settings: HU translation" into cm-10.1
ff10851 Settings: HU translation
801bf71 Settings : FR translation
0200bff Settings: PT-BR update translations
5d2f24e Update German translation.
ef1d178 Storage Settings: Allow user to trigger a volume rescan
3f06cd5 Merge "Settings: HU translation" into cm-10.1
7d7a8e9 Settings: HU translation
dd2b5ab Merge "Settings: NL translation" into cm-10.1
9752106 Merge "Settings: RU translation" into cm-10.1
e4f71fb Settings: RU translation
eeb379d Settings: NL translation
3b6d117 Merge "Settings: PT-BR update translations" into cm-10.1
06a7104 Settings: PT-BR update translations
d45b3b4 Settings: Update AF translations
8749e41 Merge "Settings: privacy Guard enhance app logic" into cm-10.1
728b367 Settings: AF translations
943c268 Settings: privacy Guard enhance app logic
9d0065d Merge "Lockscreen Options : Disable keyguard camera only" into cm-10.1
1ff44cc Remove unused string.
6cf771e Lockscreen Options : Disable keyguard camera only
4df4c3e Show the "no action" summary for unitialized gesture values
46fd251 Lockscreen Options : Fix toggling of states
649eda0 Merge "Lockscreen options : Camera/widgets toggle" into cm-10.1
f6b1819 Lockscreen options : Camera/widgets toggle
deff1bd Settings: Introduce Privacy Guard Manager
5aacfcb Merge "Add option to hide music controls in lockscreen." into cm-10.1
7c2666a Merge "Add an option to allow a (subtle) notification vibration during calls." into cm-10.1
0f0aab9 Merge "Settings: NL translation" into cm-10.1
5d68d4b Add an option to allow a (subtle) notification vibration during calls.
260c191 Settings: Update German translations
34e5b76 Settings: NL translation
b59c355 Add option to hide music controls in lockscreen.
765742d Fix derp.
cf77877 Merge "Handle cancellation of the 'enabling PrivacyGuard' alert box." into cm-10.1
8c76663 Merge "Settings : FR translation" into cm-10.1
0337c0b Merge "Settings: ES translations" into cm-10.1
104d479 Settings: ES translations
aa3b2ff Settings : FR translation
0af86ec Settings: Update italian translation
c5f1210 Handle cancellation of the 'enabling PrivacyGuard' alert box.
5ff97ed Merge "Settings: HU translation" into cm-10.1
70a5447 Settings: HU translation
39c73a6 Merge "Settings: PT-BR update translations" into cm-10.1
611d26d Settings: RU translations
1db4c14 Settings: PT-BR update translations
e4aba47 Merge "Add 2G/3G option to profile connections (2/2)" into cm-10.1
c9ecb59 Merge "QuickSettings: Camera tile" into cm-10.1
1ea6dc4 privacy guard: Fix crash when uninstalling an app
57d7aa3 Add 2G/3G option to profile connections (2/2)
06e10cf QuickSettings: Camera tile
a6eafbb Merge "Settings: NL translation" into cm-10.1
321ca3c Settings: ES translations
af5adf1 Merge "Settings: PT-BR update translations" into cm-10.1
dabc269 Merge "Settings: RU translation" into cm-10.1
558be50 Settings: HU translation update
5916b53 Settings: RU translation
0094d94 Settings: PT-BR update translations
41ef818 Merge "Make system UI settings work for multi-user (2/2)" into cm-10.1
855a3fc settings: Privacy Guard support
4c564f5 Merge "Settings: ES translations" into cm-10.1
4dacc9c Settings: PT-BR update translations
70298fb Settings: ES translations
55de90c Settings: NL translation
3cc5905 Merge "[1/2] Add bluetooth triggers to profiles" into cm-10.1
0733be1 Settings: AF translation
0e94e4f Merge "Settings: Fix Slovak aapt warnings" into cm-10.1
3bac321 Settings: Fix Slovak aapt warnings
1b81756 [1/2] Add bluetooth triggers to profiles
39f48c0 Make system UI settings work for multi-user (2/2)
afb635c Settings: Rename 'Power sounds' to 'Charging sounds' and add summary
db66a29 Merge "Fix lock settings pattern crash on configuration change" into cm-10.1
ca07787 Shorten clumsy and repetitive gesture strings
6c2f3b7 Fix lock settings pattern crash on configuration change
69dc6c6 Merge "Settings: Add missing Af translations" into cm-10.1
9ad8fb5 Merge "Settings: IT translations" into cm-10.1
f84220c Settings: HU translation update
e1cd453 Merge "Show application's package name in the "App info" screen." into cm-10.1
c2ccdeb Merge "Settings: PT-BR update translations" into cm-10.1
99f104f Settings: IT translations
1834693 Settings: PT-BR update translations
370a34f Settings: RU translation
8ddd36f Settings: Add missing Af translations
f80eeea [2/2] Add triggers to change profile based on AP
278619d Merge "Settings: RU translation" into cm-10.1
568e7fc Merge "Settings: Simplified Chinese Translations" into cm-10.1
0921766 Merge "Settings: EL translations" into cm-10.1
0d93366 Merge "Settings: ES translations" into cm-10.1
014d77c Merge "Settings: PT-BR update translations" into cm-10.1
3dff140 Merge "Settings: FR translation" into cm-10.1
ee83bde Settings: ES translations
aaa5b12 Settings: CS translation
2c54e01 Fix up remove Wakeup preferences
e055a2e Settings: FR translation
4b57a42 Show application's package name in the "App info" screen.
ff3b460 Settings: PT-BR update translations
7dae958 [1/2] Permit home button wake to be configurable
f931c04 Settings - add an AlertDialog before to delete APN to avoid fails
6752d08 Settings: ES translations
614dd6b Settings: IT translations
cb53984 Utils : Fix tablet orientation logic
bf85ec9 Settings: Simplified Chinese Translations
7128fea Settings: RU translation
8e7fbae Settings: EL translations
0fd38fa Merge "Settings: Update translations" into cm-10.1
434d2c2 Settings: Update translations
a0f21df Merge "No back icon in action bar of APN Settings" into cm-10.1
46545ec Merge "Settings: Add support to enable/disable Electron Beam (2/2)" into cm-10.1
c1963d0 Settings: NL translation
70793ba Merge "Settings: Update italian translation" into cm-10.1
ed4bede Settings : FR translation
585f0f3 No back icon in action bar of APN Settings
0724c8c Settings: Add support to enable/disable Electron Beam (2/2)
694bb4d Settings: HU translation update
ff42ec7 Merge "Settings : FR translation" into cm-10.1
1106b22 Merge "Settings: NL translation" into cm-10.1
13b1843 Settings: Update italian translation
309fefd Settings: PT-BR Update Translations
85bca48 Merge "Bye, bye Talk. Welcome Hangouts (2/2)" into cm-10.1
a6f791a Settings: NL translation
6b8fd40 Settings: SK Translations [FIXED]
915d829 Bye, bye Talk. Welcome Hangouts (2/2)
2f55e03 Merge "Notification Light: Fix apps with same name not showing up" into cm-10.1
7b4a08a Merge "Settings: ES translations" into cm-10.1
5cb4deb Merge "ProfilesSettings : Allow nfc override (2/2)" into cm-10.1
add0142 Notification Light: Fix apps with same name not showing up
8c62366 Settings : FR translation
265cc8a Settings: ES translations
ccf6831 Merge "Pie controls: Tweaking UX for pie service (2/2)" into cm-10.1
7368651 Merge "Allow changing auto-brightness responsitivity." into cm-10.1
0385685 Merge "Clean up CMStats code." into cm-10.1
2cd49f0 Settings: PT-BR update translations
d9607fc Allow changing auto-brightness responsitivity.
75abf65 Pie controls: Tweaking UX for pie service (2/2)
0bec562 Settings: TR translations
636dce0 Clean up CMStats code.
47d039a Merge "Navbar : Lock current orientation in edit mode" into cm-10.1
0a55f3a ProfilesSettings : Allow nfc override (2/2)
bbbc8f7 Navbar : Lock current orientation in edit mode
b27c3ef Merge "Settings: ES translations" into cm-10.1
8ce22f5 Settings: ES translations
701558a Merge "Update German translation." into cm-10.1
f8b41f6 Merge "Fix entering navbar editor in expanded desktop mode." into cm-10.1
5c2e660 Update German translation.
5a94560 Fix entering navbar editor in expanded desktop mode.
152a38d Merge "Settings: DA translation" into cm-10.1
8cb6263 Settings: DA translation
ba7f45a Merge "Settings: NL translation" into cm-10.1
0087be9 Settings: NL translation
8671c99 Update stats URLs to use cyanogenmod.org
1e35c74 Merge "Settings: CS translation" into cm-10.1
7c34393 Merge "Settings: Update Polish translation" into cm-10.1
7f55e4f Settings: Update Polish translation
a0278c2 QuickSettings : Fix layout
1052712 Settings: CS translation
cc41032 Merge "Settings: ES translations" into cm-10.1
e10d3a2 Merge "Settings: Add translatables" into cm-10.1
90d70fa Merge "Settings : FR translation" into cm-10.1
a92dd89 Merge "Settings: Update Japanese translation." into cm-10.1
7b6da59 Merge "Settings: NB translation" into cm-10.1
d1ccf7e Merge "Settings: HU update translation" into cm-10.1
ab80737 Settings: HU update translation
21c7eb7 Settings: NB translation
e7d30fa Settings: Update Japanese translation.
889eb19 Settings : FR translation
df61034 Settings: Add translatables
6be8a26 Merge "Settings: RU translation" into cm-10.1
7451b80 Merge "Settings: Simplified Chinese Translations" into cm-10.1
3f81d2e Merge "Settings: NL translations" into cm-10.1
a17ed26 Settings: Simplified Chinese Translations
7c6c4fc Settings: RU translation
32a6435 Merge "Settings: Update italian translation" into cm-10.1
c80b79b Merge "Settings: PT-BR translations" into cm-10.1
d23b1e8 Settings: Update italian translation
b583293 Settings: NL translations
5e4d2b1 Settings: ES translations
1417786 Settings: added contact icon + label + German translation
f8990a2 Settings: Add missing AF translations
1e732ff Option to use volume keys to control media volume anytime (1/2)
257868c Merge "Settings : Refactor translations" into cm-10.1
7d3e45e Merge "Settings: RU translation" into cm-10.1
4b3e644 Settings : Refactor translations
c2d163a Colour picker text input field: wrong content due to alpha channel.
785d572 Development Settings: fix setting reset on disable
dba0392 Settings: PT-BR translations
c4a859d Settings: RU translation
9ff25ee Merge "Settings: EL translations" into cm-10.1
dbbfef6 Settings: EL translations
c25511b Settings: Update italian translation
134a5a6 Make menu item title and help text consistent.
2953422 Settings: PT-BR update translations
0d5ece9 Merge "Settings: Simplified Chinese Translations" into cm-10.1
e7d9b05 Update German translation.
5018e2a WLAN configuration (static address): reject IPv6 addresses.
2a97cbc Settings: Fix aapt warnings
160766f Settings: Norwegian translation
6e3326a Merge "Check if the Activity is finishing before showDialog()" into cm-10.1
ae2c45e Merge "Fix NullPointerException at RunningState" into cm-10.1
43974d4 Check if the Activity is finishing before showDialog()
cf2b8ea Fix NullPointerException at RunningState
3390972 Fix dialog not opening for app-specific notification light settings.
aa43b38 Merge "Settings: KO translations" into cm-10.1
3ee9e44 Merge "Settings: Refactor dimens" into cm-10.1
a6646b4 Settings: KO translations
f3127e6 Settings: Refactor AF translations
f028eae Fix light settings dialog being unusable in landscape.
05a6ae7 Fix dialog state handling.
e240e3a Settings: Update italian translation
a0b0186 Merge "Settings: RU translation" into cm-10.1
c9a98c6 Merge "Power sound notifications: fix ringtone picker title" into cm-10.1
8effd55 Settings : FR translation
502e5c4 Settings: Add translatable false tag
5012b5f Settings: Refactor dimens
3263e65 Settings: RU translation
1df00ef Fix NPE in Settings -> Language & input -> Default -> Setup input methods
7a79da6 Settings: Broadcast ACTION_DATE_CHANGED
5c00a21 Merge remote-tracking branch 'cmremote/cm-10.1' into cm-10.1
9ca063a CMStats: fix up the logic and potential sync failures
4758022 Merge "Settings: ES translations" into cm-10.1
584edec Merge "Led Settings : Hex input for colorpicker" into cm-10.1
e73c802 Merge "Correctly restore brightness customize dialog hierarchy." into cm-10.1
3e2a7b9 Merge "Improve brightness curve preview" into cm-10.1
129f47c Power sound notifications: fix ringtone picker title
fc2a103 Merge "Added hungarian translations" into cm-10.1
90864ab Led Settings : Hex input for colorpicker
db93089 Merge "Settings: Update Polish translation" into cm-10.1
423d90b Settings: ES translations
a0e6a7d Added hungarian translations
a74c69c Merge "Settings: Reorganize Greek translations" into cm-10.1
a93182a Merge "Settings: PT-BR update translations" into cm-10.1
7d4a4c7 Settings: Update Polish translation
2733c08 Settings: Update italian translation
d7fbe79 Settings: Simplified Chinese Translations
54ffa7a Correctly restore brightness customize dialog hierarchy.
9bb423d Settings: Reorganize Greek translations
b703712 Improve brightness curve preview
0d81e44 Overhaul auto-brightness level UI.
bdb1b7f Merge "Settings: Danish latest merges + transition to new cm_ file format" into cm-10.1
c3ce88f Merge "Settings : Fr translation" into cm-10.1
7fb7d29 Merge "Settings: Reorganize Hungarian translations" into cm-10.1
85ea511 Merge "Settings: Update Polish translation" into cm-10.1
acdf7df Settings: PT-BR update translations
2d59211 Settings: Update Polish translation
18c5395 Settings: Reorganize Hungarian translations
efcf8fd Merge "PT-BR: Update translation" into cm-10.1
c6c7f18 Settings : Fr translation
5aa5b35 Settings: Danish latest merges + transition to new cm_ file format
b7ba9af CMStats changes. Remove the notification on boot. Users are thinking they need to opt out to get rid of the notification. The setting to opt-out still exists in the Settings app. If the user does not opt out within 'tFrame' time (1 day), the checkin service will now run; prior to this, the checkin service would not run until the next reboot. That next reboot could occur within a few minutes (startup crash, which then automatically checks in before the user has a chance to opt out) or even the possibility of never. This is unpredictable and buggy. Change the checkin frequency from 7 days to 1 day.
d615624 PT-BR: Update translation
b608d71 [2/2] Power connect/disconnect notification support
67f5956 Merge "QS/PW: Check for mobile data instead of telephony permissions (2/2)" into cm-10.1
3ed641a QS/PW: Check for mobile data instead of telephony permissions (2/2)
ec8357a Merge "Fix: Don't display the lock clock preference if its not installed" into cm-10.1
b2c7813 Merge "DataUsageSummary: fix mobile data usage display for GSM devices with no number" into cm-10.1
90f2ec1 Fix: Don't display the lock clock preference if its not installed
af3f79a Settings: move CM additions out of AOSP files
10d7e94 DataUsageSummary: fix mobile data usage display for GSM devices with no number
98ba3ee PT-BR: Update translation
de0b076 inputmethod: Fixup remove stylus preference for non stylus devices
4c51b45 DataUsageSummary: fix mobile data usage display for sim-less devices
8182fd4 Wifi: Add frequency selection for new IBSS
2a20575 Settings: NL translations (enlisted)
283a1d3 Stylus gestures features (2/2)
8444795 PT-BR: Update translation
baca2f2 Merge "Settings: change Pie controls wording" into cm-10.1
16b63b9 Merge "Settings: rotation settings for devices with hardware rotation lock" into cm-10.1
3656ec5 Settings: change Pie controls wording
1140e44 Update Settings uk translation
241b17d Settings: rotation settings for devices with hardware rotation lock
1a3dae8 QuickSettings : Use stock layouts / fix userTile
e5b8622 Merge "es_ES: Update spanish translations" into cm-10.1
f188f6c Merge "Settings: Update French translation for QS Tiles selection" into cm-10.1
335060c Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
d52857d es_ES: Update spanish translations
dba4165 Merge "Settings: Update Polish translation" into cm-10.1
f1fe8a3 Merge "PT-BR: Update translation" into cm-10.1
dc67e1e Settings: Update italian translation
ec7dc79 Added hungarian translation
6a5c30a Settings: Update French translation for QS Tiles selection
7cd3607 Settings: Update Polish translation
7cad128 Update Russian Translation-Settings-CM10.1
ac475d8 PT-BR: Update translation
e6fbcf1 Settings: Add Expanded desktop tile in QuickSettings (1/2)
fb4f4e6 Merge "Correctly remember MAP access selection." into cm-10.1
d20261b Merge "Profile: respect DPM when overriding screen lock (2/2)" into cm-10.1
95be1ae Merge "Settings: Separate Expanded desktop from Power menu settings" into cm-10.1
155f592 Merge "Settings : Fix accessibility shortcut" into cm-10.1
2981c93 QS: Add dock battery tile (2/2)
48a296b Merge "Settings : Toggle expanded desktop for navbar" into cm-10.1
37efd15 Use a hashed ANDROID_ID instead of IMEI for stats collection.
dc8e1d2 Merge "Enable Ethernet tab in data usage" into cm-10.1
e25e5b9 Restore the opt-out for stats.
284bc9b Profile: respect DPM when overriding screen lock (2/2)
477eb47 Settings: Separate Expanded desktop from Power menu settings
1d73371 Settings: Update German translation
8a71631 Correctly remember MAP access selection.
d527c91 Settings : Toggle expanded desktop for navbar
a3ec516 Removing now unused translations of pie_control_search_title
52d954a Enable Ethernet tab in data usage
2433cb7 Merge Navigation Bar and Pie Controls button config (2/2)
84e35b6 FIx up analytics results by normalizing the version by stripping the device info, which is redundant.
d47add2 Update Russian Translation-Settings-CM10.1
0961638 Add Google Analytics support.
3c052c2 cmstats: Remove preferences and always enable stats
07a4d54 Settings : Fix accessibility shortcut
31a8a13 Merge "Settings: fix incorrect value in autobrightness adjustment" into cm-10.1
f2714e4 Settings: fix incorrect value in autobrightness adjustment
0deb010 SECURITY FIX: Fix package uids being reused between uninstall and reinstall of different packages. Policies for older packages were being granted to the newly installed package that got the recyled uid.
54a5d85 Afrikaans translations: Added missing items
e4989ea Merge "Fix exception on rotation." into cm-10.1
eed7908 Settings: Update Polish translation
219c174 Merge "Jpanaese : update translation" into cm-10.1
1a4e83d Merge "PT-BR: Update translations" into cm-10.1
2470c11 Merge "Settings: Latest Danish merges" into cm-10.1
19361fc Merge "Added hungarian translations" into cm-10.1
e8f1ebb Merge "es_ES: Add spanish translations" into cm-10.1
59569b6 Fix exception on rotation.
fbffefc Settings: use checkbox for expanded desktop setting for devices without navbar
f3b9f38 es_ES: Add spanish translations
a956151 Jpanaese : update translation
27692ae Merge "Settings: remove Pie control for devices without navbar" into cm-10.1
1a3de05 Settings: remove Pie control for devices without navbar
ec47c79 Settings: removed "Status bar visible" expanded desktop setting for devices without navbar
0063e15 Settings: disable expanded desktop on power menu disable
7bcc00b Settings: Latest Danish merges
a440c80 Added hungarian translations
5c31899 PT-BR: Update translations
e5bba18 Bringing basic Pie controls to CyanogenMod. (2/2)
5814f08 Wifi: Enable IBSS options only if IBSS is supported
0f8d436 Wifi: Allow configuration of Ad-Hoc (IBSS) networks
1805134 Adding configurability of frequency cap (min/max) files' path.
7d6cc8c Fix FC when trying to adjust radio band via *#*#4636#*#* dialer code.
381611b Swap volume buttons when the screen is rotated (2/2)
d63b6d4 Settings: Fix PL translations
fb3cc32 Merge "Settings: Update italian translation" into cm-10.1
b603899 Settings: Update italian translation
5f72d40 Merge "Settings: Simplified Chinese Translations" into cm-10.1
a2c82e0 Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
338b6f4 Merge "Settings: Minor Polish translation update" into cm-10.1
55b45aa Settings: Minor Polish translation update
932fd50 Merge "Settings: Danish latest merges" into cm-10.1
8037cca Settings: Update Korean translation
fb71c67 Settings: Add cLock config to the Lock screen settings screen
4283d34 Merge "Settings: Updated Polish translation" into cm-10.1
b203ec4 QuickTiles : Fix order in tile
308d54a Update Russian Translation-Settings-CM10.1
e0cc106 PT-BR: Update translations
f6dba0e Settings: Danish latest merges
80bca28 Settings: Updated Polish translation
f575212 Move Superuser header below Developer Options
274bc3f Settings: Simplified Chinese Translations
5f6acf6 QuickSettings: Fix load default tiles (CYAN-541)
c035140 Merge "Settings : add french translation" into cm-10.1
cd9c61e Allow to hide Vibrate on notification option if it's not supported
e156fd1 Settings : add french translation
b8a63a4 Merge "es_ES: Update spanish translations" into cm-10.1
0664db2 Merge "Added missing czech translation for CM10.1 from CM10" into cm-10.1
a332dff Merge "Japanese: Update Japanese translation." into cm-10.1
af1209c Merge "Fix scrollbars appearing out of place in Superuser." into cm-10.1
5c6c2cf Settings: Update italian translations
3eb1df0 es_ES: Update spanish translations
a88a969 Merge "PT-BR: Added missing translations" into cm-10.1
37f6a28 Added hungarian translation for Volume Tile
f3d1a75 Japanese: Update Japanese translation.
b268543 Merge "Added hungarian translation for Navigation ring" into cm-10.1
5d9c40d Merge "Setting: Update German translation" into cm-10.1
cac2864 Added hungarian translation for Navigation ring
f36bdf7 Merge "Added Volume Tile to Tile chooser in Settings" into cm-10.1
4b548d2 Setting: Update German translation
a25bc85 Fix scrollbars appearing out of place in Superuser.
cf11515 Settings: Update Greek translations
e6998a4 Added Volume Tile to Tile chooser in Settings
c7177f8 Settings: Navigation bar Quick launch shortcuts (1 of 2)
f1bbefd Merge "LockscreenPattern: Fix toggle dots/error pattern visibility" into cm-10.1
a828579 Merge "Hide Volume adjustment sound if it's not supported" into cm-10.1
f586ff3 LockscreenPattern: Fix toggle dots/error pattern visibility
be793f7 PT-BR: Added missing translations
5ff3542 hide torch tile on devices that don't have led flash
d854f8f Fix the message when Bluetooth is turning off while on the tethering menu.
294aded Hide Volume adjustment sound if it's not supported
0048ad0 Fix some mistypes in Settings app Uk translation
3f81dc3 PT-BR: Update translations
249b39a Updated Ukrainian translation
b4f4782 fix hiding volume key wakeup option
f7244e0 Merge "Added hungarian translation for lockpattern_settings" into cm-10.1
5c4e01a Hide Superuser entry if root access for apps is disabled.
9b5748e Added hungarian translation for lockpattern_settings
8f4ccf5 Switch to new Superuser
4d899a6 Merge "LockscreenPattern : Toggle dots/error pattern visibility (2/2)" into cm-10.1
bc1eadf QuickSettings: Honors config_show_cmIMESwitcher setting (2/2)
b83899e Add Afrikaans translation
cd1aa6c Merge "Danish: New strings from latest merges" into cm-10.1
c98a180 LockscreenPattern : Toggle dots/error pattern visibility (2/2)
2afb91b Merge "Settings: Add LTE Quick Settings Tile (2 of 2)" into cm-10.1
6d067ae PT-BR: Update translations
5aaa620 Settings: Add LTE Quick Settings Tile (2 of 2)
d62c506 Settings : QuickSettings Cleanup
d2015f7 Danish: New strings from latest merges
050bdcd Merge "Settings: Update italian translation" into cm-10.1
63ee7ec Prevent cursor from causing global reference leaks.
87e5771 Settings: Update italian translation
746c8ab Added missing czech translation for CM10.1 from CM10
50c5cb4 Merge "Settings: fix profiles TabManager" into cm-10.1
774ee81 es_ES: Updated spanish translations
89ae9e3 Settings: fix profiles TabManager
cd9cdb2 Merge "Settings: fix dinamic tiles NPE" into cm-10.1
e9ead23 Settings: fix dinamic tiles NPE
633dca1 Merge "Settings: Dutch translations" into cm-10.1
c7aa3f3 Merge "Settings: Update German translation" into cm-10.1
039d2b8 Merge "Packages/Settings: Fixed PT-BR translations" into cm-10.1
d12596d Merge "Settings: Update Korean translation" into cm-10.1
87fdd45 Packages/Settings: Fixed PT-BR translations
1865020 Settings: Update German translation
6910321 Merge "Settings: Update italian translation" into cm-10.1
9ba6207 Settings: Update Korean translation
4897595 Merge "PT-BR: Update translations" into cm-10.1
977f540 PT-BR: Update translations
cb33904 Settings: Move 'Advanced reboot' to other position
bdbaec1 Settings: Dutch translations
25f2c02 Settings: Update italian translation
756df57 Merge "Fix misleading translation." into cm-10.1
721f1bb Merge "Settings: Dutch translations" into cm-10.1
dd0747d Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
ece6be8 Added hungarian translations
64c377f Fix misleading translation.
4c1802a Update Russian Translation-Settings-CM10.1
09e0e73 Fix up hide Volume key cursor control
d880511 Settings: Dutch translations
50c1329 Merge "Settings: Dutch translations" into cm-10.1
ab9ecc3 Add ability to hide volume rocker preferences
93bb7d1 Feature : Volume adjust sound preference 2/2
99ea39b Settings: Add Advanced reboot (1 of 2)
626a7db Settings: Dutch translations
baaf440 Merge "Settings: Update German translation" into cm-10.1
f68c784 Settings: Czech translation 1/2
5ad15c2 Merge "Addded hungarian translation for backlight curve adjustment" into cm-10.1
553f0de Merge "Chinese: Update translations" into cm-10.1
c9f0322 Merge "Settings: Missing Danish strings" into cm-10.1
9b698a3 Addded hungarian translation for backlight curve adjustment
579d54e Settings: Missing Danish strings
16c8ab6 es_ES: Updated spanish translations
fc0f5ea Merge "Settings: Lockscreen Targets Icon Revamp" into cm-10.1
b8c746b Merge "Settings: PT-BR translations" into cm-10.1
ff820bf Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
b3d3bcb Settings: Lockscreen Targets Icon Revamp
965bcf3 Intent now pointed correctly to ChooseLockPattern
d1bd699 Settings: PT-BR translations
6d3efb1 Update Russian Translation-Settings-CM10.1
7898153 Settings: Remove redundant lines
384ad70 Chinese: Update translations
de94ee5 Some post-merge cleanup for automatic brightness adjustment
20eaebd Settings: Update German translation
eb7a665 Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_packages_apps_Settings into mr1.1-staging
20a2aaa Merge commit 'android-4.2.2_r1' into mr1.1-staging
8129ea2 Settings: Fix build warnings
8702263 Settings: Simplyfiy expanded desktop summary
7992482 Settings: Add summary for launch music app when headset is connected
37d0ca2 Settings: PT-BR translations
112b03e Add back backlight curve adjustment.
f699b2e Merge "es_ES: Updated spanish translations" into cm-10.1
f0ad93f Settings: Fix ambiguous expanded desktop options
3e08e86 es_ES: Updated spanish translations
1b68d29 Settings: Fix build
86c7547 Merge "Settings: Update Greek translations" into cm-10.1
2d9057a Added hungarian translation for expanded desktop settings
8c41f42 Option to show status bar in expanded desktop mode (1/2)
e9486fe Merge "Added hungarian translations" into cm-10.1
9a18072 Merge "es_ES: Updated spanish translations" into cm-10.1
946e741 Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
dbbf7af es_ES: Updated spanish translations
b056bd8 Added hungarian translations
a118137 Update Russian Translation-Settings-CM10.1
16c87ca Settings: Update Greek translations
a171b67 Merge "Settings: Update italian translation" into cm-10.1
f8ed609 PT-BR: Update translations
fe76bc6 Merge "Added hungarian translation for Safe headset volume" into cm-10.1
6de6833 Merge "PT-BR: Update translations" into cm-10.1
caff796 Update the SMS sending limit instantly (2/2)
cb74059 PT-BR: Update translations
1de31ed QuietHours Tile (2/2)
b71bff0 Settings: Safe headset volume override legal waiver
9e58054 Added hungarian translation for Safe headset volume
938d1cb Merge "Settings: Make Safe headset volume handling user configurable (2 of 2)" into cm-10.1
3e42b8a Settings: Make Safe headset volume handling user configurable (2 of 2)
5dfca02 Settings: Allow non-primary user to access selected CM Settings
b5dfbec Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
8e5ce78 German: update translation
0f75ca6 Settings: Fix build warnings
e2dda30 Added hungarian translation
e561dd4 Update Russian Translation-Settings-CM10.1
de7ed7a Settings: Update italian translation
ea7a334 Settings: New Danish strings and arrays
d3b3f7a Japanese: update Japanese translation.
a9171b5 Merge "Settings: Simplified Chinese Translations" into cm-10.1
530ae08 Settings: Make it clearer how SMS Limiting works and add 500 messages option
b87e20c Update Russian Translation-Settings-CM10.1
36ac1fb PT-BR: Update translations
4d79446 Merge "Setting : add french missing  translation" into cm-10.1
82dc3a0 Merge "Settings: Hebrew translation updates" into cm-10.1
2be71be Merge "Settings: Hungarian translations for Custom lock screen background" into cm-10.1
5e7b1ab Merge "TouchInterceptor: Fixed image cache problems Fixes the problem shown in this video: http://youtu.be/piqHych4nJY" into cm-10.1
796ed8b Settings: Simplified Chinese Translations
c037ec2 Setting : add french missing  translation
d476ab5 es_ES: Updated spanish translations
a00cd8d Settings: Hungarian translations for Custom lock screen background
6b1dbff Settings: Hide Development settings when it is turned off
0e72d0e Goodbye Chronus, it was nice knowing you (2 of 2)
c02fc9e Notification sound-to-vibration conversion toggle
7c9652a TouchInterceptor: Fixed image cache problems Fixes the problem shown in this video: http://youtu.be/piqHych4nJY
1f1d510 Settings: Fix build warning
46cfe43 Settings: Hebrew translation updates
e905d70 Settings: Update  German translations
148eb22 Merge "Settings: Update time zones" into cm-10.1
56f3c5f Setting: Remove unneeded strings
916778d Merge "Disable Automatic brightness checkbox if automatic brightness is not available" into cm-10.1
19a9cae Fix the spacing between displayed rotation angles
53f1c35 Settings: Custom lock screen background [2/2]
9255129 Disable Automatic brightness checkbox if automatic brightness is not available
83f4075 Settings: Update time zones
f079705 Merge "PT-BR: Update translations" into cm-10.1
f3f6571 Merge "Lithuanian: translations for settings" into cm-10.1
7d894f8 Lithuanian: translations for settings
a02ffdc Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
a538420 Merge "Added hungarian translations" into cm-10.1
49c17f7 Update Russian Translation-Settings-CM10.1
cba4c32 Add option for switching between UMS and MTP/PTP mode. (2/2)
7d1af4c Wi-Fi: Manage Wi-Fi AP priorities
8529013 PT-BR: Update translations
b1d2a4b es_ES: Added spanish translations
459d326 Added hungarian translations
5b21b81 Added hungarian translation for USB Tether
1dd1b6b Merge "Performance: BootReceiver: set CPU min/max freqs before CPU governor" into cm-10.1
3defc9c Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
71aca0c Merge "PT-BR: Update translation" into cm-10.1
0caeff1 Performance: BootReceiver: set CPU min/max freqs before CPU governor
ac3ab18 Settings: Update German translation
13c8dc5 Update Russian Translation-Settings-CM10.1
ead520d Merge "Update the ic_grabber drawable with a holo version" into cm-10.1
3031048 Merge "Settings: Fix TouchInterceptor widget on tablets" into cm-10.1
408854a Bluetooth MAP (Message Access Profile) Upstream Changes (2/3)
d53b17b Settings: Improve configuration options displaying
df6dc68 Update the ic_grabber drawable with a holo version
f9f634e Merge "Settings: RTL layout fixes" into cm-10.1
55248c0 Settings: RTL layout fixes
853aa0d PT-BR: Update translation
c6f2514 Settings: Fix TouchInterceptor widget on tablets
8ec1252 Merge "Settings: Hebrew translation updates" into cm-10.1
5099b2d Settings: Fix build warnings
212198b Merge "Remove app security settings from lockscreen settings." into cm-10.1
2e4c2c2 Settings: Hebrew translation updates
874e2fa Merge "PT-BR: Add missing translations" into cm-10.1
5c341da Settings: Dutch translations (7) [cm-10.1]
b9b1650 Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
ecdda20 Remove app security settings from lockscreen settings.
ab8e670 es_ES: Spanish traslations
54c35ae Revert "Patch Set 2/2: Add an "Automatically Connect" option for WiFi networks"
226d589 QuickSettings: wifi display optimization
a1d0c37 Merge "Quick Settings - adjust dynamic tile display" into cm-10.1
c8e1c53 Update Russian Translation-Settings-CM10.1
0df215b Merge "Fix erroneous values for animation speed translation (Portuguese) Was 5x when should have been 0,5x In addition, 1.5 x was changed to 1,5x as virgula/commas are used. Spacing in other arrays changed to match other translation sets" into cm-10.1
e52c0c1 Fix erroneous values for animation speed translation (Portuguese) Was 5x when should have been 0,5x In addition, 1.5 x was changed to 1,5x as virgula/commas are used. Spacing in other arrays changed to match other translation sets
7cecd17 Quick Settings - adjust dynamic tile display
52d369e es_ES: Added spanish translations
c6e8f4b Merge "Add Quick Settings USB Tether tile (1 of 2)" into cm-10.1
851bcc0 Merge "Settings: update Italian translation" into cm-10.1
3ee9cdc Merge "Japanese: update Japanese translation." into cm-10.1
e799101 Merge "Settings: updated romanian translation for latest added features" into cm-10.1
d5d7202 Merge "settings: updated finnish translations" into cm-10.1
1deada8 Add Quick Settings USB Tether tile (1 of 2)
74da120 settings: updated finnish translations
dea3a1f Merge "Settings: New Danish strings" into cm-10.1
f9783fe Merge "Added hungarian translations for Settings" into cm-10.1
18e0900 Merge "Added fastsroll to the manage application screen so you don't need to scroll so much if you have alot of apps and want to go to the bottom of the list." into cm-10.1
02106de Merge "Settings: Dutch translations" into cm-10.1
536bce0 Added hungarian translations for Settings
8aa188f Added fastsroll to the manage application screen so you don't need to scroll so much if you have alot of apps and want to go to the bottom of the list.
08bd070 Settings: Dutch translations
f1281a5 Settings: updated romanian translation for latest added features
c151248 Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
b87bbb9 PT-BR: Add missing translations
0e49eed PT-BR: Added missing translations
3d3d0a3 Patch Set 2/2: Add an "Automatically Connect" option for WiFi networks
93171f4 Japanese: update Japanese translation.
f155d29 Merge "QuickSettings : Filter tiles from default" into cm-10.1
9dabc59 Launch music player on headset connect
afbd026 Display lock screen widget maximize for phone only
d1f40b2 Merge "Settings: Update german translation [WIP]" into cm-10.1
67f53ac Update Russian Translation-Settings-CM10.1
5b7583a QuickSettings : Filter tiles from default
863362e Settings: Update german translation [WIP]
e9d8d3b Settings: update Italian translation
45a76db Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
fb7ad09 Merge "Fix NPE exceptions in the Quick Settings menu" into cm-10.1
0ed0f22 Fix NPE exceptions in the Quick Settings menu
9eed0a8 Settings: Use proper 64x64 XHDPI icon for Security Settings
ffe9c3f Update Russian Translation-Settings-CM10.1
4c6cea1 Settings: Fix stupid spelling mistake
d8d5f92 Merge "Settings: Option to start lock screen widgets maximized" into cm-10.1
2955261 Settings: Option to start lock screen widgets maximized
fddf941 Merge "Japanese: initial japanese translation port from CM10" into cm-10.1
934c87a Japanese: initial japanese translation port from CM10
004dca2 Merge "Update Russian Translation-NavBar Customization-Settings [1/2]--CM10.1" into cm-10.1
b4881df PT-BR: Added missing translations
769928b Settings: New Danish strings
c5f6af5 es_ES: Added spanish translations
779fffe Settings: Dutch translations
a4e582d Update Russian Translation-NavBar Customization-Settings [1/2]--CM10.1
803e89a Settings: Dutch translations
356ed10 Settings : NavigationBar Customization
ea00d0b Merge "Added hungarian translation for Stylus Icon settings" into cm-10.1
c753d5a Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
add4230 Merge "es_ES: Added spanish translations" into cm-10.1
58f37f8 Merge "PT-BR: Added missing translation" into cm-10.1
527f17f Settings: Fix color picker ComposeShader view
1c74dd2 Added hungarian translation for Stylus Icon settings
71c59d9 es_ES: Added spanish translations
1000753 Update Russian Translation-Settings-CM10.1
f8c9fbc Adds ability to answer call with hardware HOME button (preparation to winter time)
45c9a99 Merge "Added hungarian translation for Chronus" into cm-10.1
bedbac1 Settings: Dutch translations
d8e95ae Added hungarian translation for Chronus
697a838 PT-BR: Added missing translation
81b5ba3 PT-BR: Added missing translations + fixes
a070bf0 Update Russian Translation-Settings-CM10.1
5da7c43 Merge "Settings: Some fixes and updates to romanian translation" into cm-10.1
720111a Settings: Dutch translations
fce9620 Settings: Some fixes and updates to romanian translation
af2094a Merge "PT-BR: Added missing translations" into cm-10.1
e668e5e settings: Add option to toggle the pointer icon when using stylus
81833c2 Merge "Settings: Hebrew translation" into cm-10.1
41491fb Merge "Settings: More Danish translations" into cm-10.1
d23bb80 Merge "Settings: Simplified Chinese Translations" into cm-10.1
022832a Settings: Simplified Chinese Translations
5c17c56 Settings: More Danish translations
ec04085 Merge "Settings: Updated romanian translation" into cm-10.1
956b0ee Merge "Settings: Update Greek translations" into cm-10.1
6a80d5f Merge "Setting : Add french translation" into cm-10.1
27e658e Setting : Add french translation
6a1d840 Settings: Fix the SMS Limit setting location
8a65c10 Settings: Hebrew translation
b071e81 Settings: Update Greek translations
48c44dd Settings: Updated romanian translation
c7ac866 Remove or rename duplicate strings
b26022e Settings: Introducing 'Chronus'
3c52c31 Settings: Make it clear that the Lock clock is also a Home widget
129e096 Settings: Add support for Lock clock (part 1 of 3)
913fdaa Settings: Add support for variable size pattern lockscreen (Part 2/2)
d2ea9ad Settings: show interface header for restricted users
9cea835 Settings: Add launcher settings to shared
507c05f PT-BR: Added missing translations
62507e3 Merge "Settings: Update German translation" into cm-10.1
1500ee7 Reintroduce tablet-specific message for values-hu
96e600f Fix build error
77b4225 Merge "Added/fixed hungarian translations" into cm-10.1
11b4b58 Added/fixed hungarian translations
d1eaf1f Merge "es_ES: Added and modified some translations" into cm-10.1
ec8bbf1 One does not simply become a Developer
6115f43 es_ES: Added and modified some translations
de5d535 Settings: Update German translation
cc1851e QuickSettings : Fix tile removal
3b8fc1f Simplify quick pulldown summary logic and improve 'translatability'.
0d5eef6 Merge "Settings: Simplified Chinese Translations" into cm-10.1
296571f Settings: Simplified Chinese Translations
244c20c es_ES: Added missing translations
270ffe0 Profile: fix airplane mode
f03967e Use API Level 16 method for creating a MIME NDEF record
29c34b5 SoundSettings: Show DSPManager
197508f Settings: Remove Changelog Summary
98a699a Settings: Add Screen timeout Quick Settings Tile (1 of 2)
3557bf4 Update Russian Translation-Settings-CM10.1
2de7cdc Settings: fix da and pt translations
1a904df Merge "PT-BR: Added missing translations + fixes" into cm-10.1
35212ff PT-BR: Added missing translations + fixes
5576905 Merge "Settings: Danish Translation" into cm-10.1
67a4793 Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
3083912 Settings: Add setting in security for sms message rate alerts from CM10
da3fe48 Update Russian Translation-Settings-CM10.1
b56c1e0 Merge "Update translatables" into cm-10.1
26a7dbc Settings: Use new Lock screen drawable
6598f44 Settings: Add NFC Tile to Quick Settings (1 of 2)
432bf6f Merge "Display : Enable rotation on large screens" into cm-10.1
34f255c Display : Enable rotation on large screens
3cc41a4 Update translatables
72c414a Merge "Settings: Cleanup translated strings - TRANSLATORS NOTE -" into cm-10.1
44c1f83 Settings: Cleanup translated strings - TRANSLATORS NOTE -
cf2d201 Quick Settings: Clean up Torch tile (1 of 2)
feee8f9 Settings: Danish Translation
4446842 Settings: Add Quick Settings Sync tile (1 of 2)
d049922 Apn Settings : Fix panel title
34776ff WifiDisplay: Add an HDCP toggle
5442611 Modify Changelog to fragment
1c7ea6e Quick Settings: Add Network mode tile (part 2 of 2)
8453209 Quick Settings Pulldown: Left or Right side option (2/2)
795acaa wifi: Allow configuration of country code for wifi
63608e3 Merge "German: Update translation" into cm-10.1
e9eba35 Merge "Added hungarian translations (Done)" into cm-10.1
a080c34 Merge "es_ES: Added CM translations" into cm-10.1
bb215b8 Added hungarian translations (Done)
125fe2b es_ES: Added CM translations
3565b5b Fix the build.
e1fc7bd Merge "Italian translation for Settings (Update)" into cm-10.1
6c8c901 Merge "settings: updated finnish translations" into cm-10.1
93e23e7 settings: updated finnish translations
b39df58 Italian translation for Settings (Update)
785c289 German: Update translation
ece187b Merge "Settings: ported CM10 romanian translations and translated Quick Settings" into cm-10.1
ae91b13 Merge "FindBugs: Call to equals() comparing different types" into cm-10.1
95f1762 FindBugs: Call to equals() comparing different types
e27e161 Settings: ported CM10 romanian translations and translated Quick Settings
435261c Merge "Update Russian Translation-Settings-CM10.1" into cm-10.1
1e479f8 Update Russian Translation-Settings-CM10.1
9aabd47 PT-BR: Merged CM 10 translations + added new ones
75e5df7 Merge "QuickSettings: Added ProfileTile (1/2)" into cm-10.1
d531e6a Merge "Italian translation for Settings (Update)" into cm-10.1
29a4eb7 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
f779d23 QuickSettings: Added ProfileTile (1/2)
ad4d1ed Italian translation for Settings (Update)
4147590 Settings: Fix Lock screen Battery status summary display
db461a3 Update Russian Translation-Settings-CM10.1
e92ca6f Settings: Call Ring mode what Google calls it, not Silent mode (1 of 2)
8695902 Update Russian Translation-Settings-CM10.1
a374d81 Distinguish adding an already present word / cancelling
8cb7405 QuickSettings : Option to dismiss on toggle
28d7594 Status bar brightness control from CM10 (2/2)
4a302be Merge "Port Russian Translation from CM10 to CM10.1-Settings [WIP]" into cm-10.1
579ebc0 Fix switching running/cached apps with memory bar
df3c22a Settings: Do not show the Quick pulldown option on Tablets
20babce Merge "Italian translation for Settings" into cm-10.1
982e02b Port Russian Translation from CM10 to CM10.1-Settings [WIP]
53b9051 Merge "Settings: use DefaultContainerService for all file operations" into cm-10.1
3ef8559 Italian translation for Settings
249f487 Settings: German translation forward port CM 10 ==> CM 10.1
c058578 Merge "Settings: Add option to always show battery status on lockscreen (2/2)" into cm-10.1
0611cbe Settings: Add option to always show battery status on lockscreen (2/2)
0744a09 DraggableGridView : Various fixes
56b46c0 Merge "Port "Power widget: Hide Wi-Fi AP option if it's not supported"" into cm-10.1
4ca3a38 QuickSettings : Add Wifi-AP Tile
32b40fb Port "Power widget: Hide Wi-Fi AP option if it's not supported"
437b439 Port "Option to control cursor in text fields using volume keys (2/2)"
ad67308 QuickSettings: Use the new QS drawables for the settings too.
df87f2d QuickSettings : Add torch tile
6db1e24 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
1f597c8 Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
f9795a1 Fix possible NPE
ccb7ab0 Settings: Add ability to reset Quick Settings panel to default
33bfadb Settings: Fix Quick Settings panel settings FC when rotating device
fc10ca4 Settings: Move Profiles system overrides above appgroups
57a8fb5 Settings: Add Quick pulldown support for Quick Settings panel config
e3f1171 Call back to whom requested to add a word to the user dict
eccdbc2 Settings: Quick Settings customization (Part 1 of 2) WIP!
76a1152 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
d42cde5 Settings: Fix duplicate 'Enable ADB' setting in dev settings
2a9cbb6 am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
f197105 Merge "Fix wifi compareTo" into jb-mr1-dev
ebc57e3 Fix wifi compareTo
808d914 Settings : Switch state fix
5378a8d Settings: use DefaultContainerService for all file operations
5cf1fcb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
5b4509b Import translations. DO NOT MERGE
6f87f0f Profiles: Airplanmode Settings with Checkbox (2/2)
d165cde Remove duplicate line enabling Mod Version twice
250fbba Merge "LockScreen: allow long-press actions from hardware keys (2/2)" into mr1-staging
7e32dd7 Settings: Forward port Change behavior when back pressed in PerformanceSettings
4d2a01d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
b8f026b LockScreen: allow long-press actions from hardware keys (2/2)
607bdae Settings: Forward port Hardware key custom rebinding (2/2)
67e9e59 Import translations. DO NOT MERGE
f4c9621 Merge "Cid Head : Cyanogenmod version preference" into mr1-staging
db198a6 Merge "Lockscreen Shortcut : Delete entry if reset" into mr1-staging
e5b051f Lockscreen Shortcut : Delete entry if reset
1c5a589 Cid Head : Cyanogenmod version preference
fe25950 Settings: Forward port CM Screen Security settings (Part 1 of 2)
46eda4b Settings: Forward port Slider shortcuts
4a2138b Merge "migrate vibrator to silent mode settings (2/2)" into mr1-staging
b4ec414 Makes the add button for new APNs appear in the action bar.
4bb7bc1 migrate vibrator to silent mode settings (2/2)
10f51b9 Settings: Forward port ADB over network (Part 1 of 2)
bed20b1 Merge "Apn settings fixes / code maintainence" into mr1-staging
65da947 Merge "PowerWidgetUtil: Re-enable LTE button." into mr1-staging
2f6d605 Apn settings fixes / code maintainence
5fb0607 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3674d86 Import translations. DO NOT MERGE
aeb57ed Pass the locale code in the help url for help pages.
f8c8ad2 PowerWidgetUtil: Re-enable LTE button.
1e139f4 Developer Options: launch the Development app
5ca8e96 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
11efd54 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
bc5d927 Add latest area info broadcast to Settings status screen.
d2bd59f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
cdc73b5 Import translations. DO NOT MERGE
300f829 Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
d2380b8 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
7bed18e Revised language for notification ringtone picker.
b37447a Import translations. DO NOT MERGE
7c980ad merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
c742ecd Settings: Forward port missing Profiles related changes
747975b Power menu: allow enabling user switcher
aeb199a Better layouts for security screen setups as part of b/7459863
4956268 Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev
5e337ed Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
c3f76cf Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev
b0f3f8d Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
1cadd48 Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
97d07fa Push scrollbars to screen edges.
6f8cd76 Fix text alignment and simplify layouts.
48d000e Disable USB debugging checkbox and backup password for secondary users
8f28cd5 Fix incorrectly inverted text color.
77ec6de Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
6c26998 Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
4363508 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
39b7bd8 Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
5d37686 Merge "Avoid split action bar when it only has one item.  DO NOT MERGE." into jb-mr1.1-dev
6e8644b Add string resource removed by previous commit.
16ba225 Merge "Settings: Fix Swedish translations" into mr1-staging
4166ec3 Use uniform font size for APNs and timezones. DO NOT MERGE.
c2b43db Avoid split action bar when it only has one item.  DO NOT MERGE.
0206284 Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
4c1f622 Use holo alert drawable
a91b2b1 Settings: Fix Swedish translations
8092adf Import translations. DO NOT MERGE
f7f6e2c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
aaefadf Settings: Default the old CM Power widget to OFF
af60480 Merge "Be quiet!" into jb-mr1.1-dev
79d42bb Be quiet!
9067d57 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev
c06e11e Settings: Make Perf settings act just like dev setting - start hidden
082d592 Settings: Move Notification and Battery light settings to System settings
7904ef4 Settings: Move font size back to AOSP location + System settings cleanup
441588d Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
fc4be38 Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
0bc27b8 Settings: Fix NPE when CM IME switcher is disabled
c5bfd98 Merge "Settings: fix storage measurement for device without emulated sdcard" into mr1-staging
7dee75c Add android.settings.DREAM_SETTINGS for Daydream settings.
1abbe83 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
32f017c Settings: Forward port Kill app back long press
3236571 am 42db418f: Import translations. DO NOT MERGE
1e9f8d6 Import translations. DO NOT MERGE
42db418 Import translations. DO NOT MERGE
952bdbd Settings: Make CM developer options additions respect the on/off toggle This commit fixes the problem where, when dev options are turned off, our CM customizations don't turn off with the rest of the options and the dangerous option (root access) does not reset to a safe setting.
ce33fea Port "Option to hide Adb notification icon (1/2)"
3455ed9 Settings: port vol rocker wake
8a9edfb Update a few dream setting strings to ease translation.
c097389 Forward port Status Bar settings
4ed6d46 Settings: Forward port Volume button music controls
8b2940c Settings: fix storage measurement for device without emulated sdcard
569441f Merge "settings: port ime selector notification toggle" into mr1-staging
f85d885 Settings: Fix possible NPE in Display settings
2f9011a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4fb0c13 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
75e09c3 am 40129973: (-s ours) Import translations. DO NOT MERGE
1b95166 settings: port ime selector notification toggle
085edd4 Setings: Forward port Display Rotation settings
2f0ded7 Settings: Forward port Performance settings
31d93bf Settings: Add Updater and Changelog
b77783f Settings: add Advanced menu for device-specific settings app
3b18eb7 Settings: Add Utility function
f2c359c Settings: Forward port Expanded desktop capability
da35262 Settings: Forward port Power menu options
16a4c2b Import translations. DO NOT MERGE
4012997 Import translations. DO NOT MERGE
f06dc93 Settings : Insert missing help urls
8619672 DreamSettings : Insert help url
9fcffa2 Forward port miscelaneous audio features
61b6c47 am e71a8772: Import translations. DO NOT MERGE
1d7a6df Forward port Quiet Hours settings
12c1451 Removing tutorial for choosing a pattern as part of b/7459863
a3c0932 Move font size preference to CM System menu
6ef90d3 Add System menu and PowerWidget configuration support from mr0/10.0
28413bb Add LED configuration support from mr0/10.0
9f3e97c Bring in Profiles support from mr0
e71a877 Import translations. DO NOT MERGE
95c1003 Fix Bluetooth enable dialog to match Android style guide.
48e0d45 Add the themes configuration entry point
597b4d2 Add launcher configuration item
9c19f8b Settings: Anonymous Statistics (CMStats)
ada4b1b Settings: Added cpu info and memory info to About Phone Settings
0b78aaf Added build date (ro.build.date from build.prop) to device info.
a4be23a Add Modver to Settings.
ed104a3 Add an option to change the device hostname (2/2).
4e5f8ce Add preference for enabling root access (3/3)
6c1d5b1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
e9f89cf am 7ed1879f: Import translations. DO NOT MERGE
7ed1879 Import translations. DO NOT MERGE
15c27bb Merge "fix dock audio enable dialog" into jb-mr1.1-dev
eb63a1f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
6097726 Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
5f05010 Use AlarmManager calls to set date/time, instead of SystemClock.setTime
f15f9d6 Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
940f6f0 Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
733bd43 Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
6992d40 Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
3058022 am add9d21f: Import translations. DO NOT MERGE
8ef71db Align "Make passwords visible" setting.
f707491 Internationalize bytes and percentages.
5cdc937 Fix a race condition when switching between settings panels
ec5c2a4 Import translations. DO NOT MERGE
add9d21 Import translations. DO NOT MERGE
644a30e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9f4afb0 fix dock audio enable dialog
42d9768 am a0fbc220: Import translations. DO NOT MERGE
bf459da Remove back button entirely when disabled
a0fbc22 Import translations. DO NOT MERGE
15d91c6 Reconcile with jb-mr1-release - do not merge
79bf08d merge in jb-mr1-release history after reset to jb-mr1-dev
ffffbf4 am d9609fc0: Fix jank after adding a widget for lock screen
caf13b2 am a108d9fc: Final tweaks to visuals of widget picker
0925698 am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d9609fc Fix jank after adding a widget for lock screen
673130b Use plurals for the developer steps countdown
a108d9f Final tweaks to visuals of widget picker
c74ef2f am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
4f1a093 am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
7d6a0f9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1a37da3 Reconcile with jb-mr1-release - do not merge
01785cf merge in jb-mr1-release history after reset to jb-mr1-dev
f654e3b am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
4e77361 am f5336fd1: Allowing rotation while adding lockscreen widgets
ef2b86b am a487bca4: Updated layouts for keyguard widget picker
02dd6c4 am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
ddf272d am 5c5eff45: Pass argument to lock screen to show widget after adding it
2419d2e am 4119788b: Add widget previews to the key guard widget picker
9d41995 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
f5336fd Allowing rotation while adding lockscreen widgets
a487bca Updated layouts for keyguard widget picker
c0fb8a3 Merge "Updated assets." into jb-mr1-lockscreen-dev
06405ce Updated assets.
5c5eff4 Pass argument to lock screen to show widget after adding it
213cc46 Import translations. DO NOT MERGE
fb4a71b Import translations. DO NOT MERGE
4119788 Add widget previews to the key guard widget picker
5a051a7 Reconcile with jb-mr1-release - do not merge
ce561a8 merge in jb-mr1-release history after reset to jb-mr1-dev
701d8a0 am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
f9bac00 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
1d0f1b6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
ab3472f Supporting EXTRA_APPWIDGET_OPTIONS correctly
bf3c225 merge in jb-mr1-release history after reset to jb-mr1-dev
fd34f98 Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev
18facce am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ecfe5f0 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
e3a4a5f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2df1470 merge in jb-mr1-release history after reset to jb-mr1-dev
783ea85 Disable the "none" security selection in settings when there's only 1 user
e586027 Import translations. DO NOT MERGE
8b24ac0 Import translations. DO NOT MERGE
eed7a47 merge in jb-mr1-release history after reset to jb-mr1-dev
4de4061 Fix issue #7448596: Can't uninstall app that was installed by another user
0b2bd8d New widget picker for keyguard widgets
859ce03 merge in jb-mr1-release history after reset to jb-mr1-dev
523d9dc am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
f79daa9 Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
5da02a4 am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
29c4c88 Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev
f892bc8 display audio dialog when connecting low end dock
82c45c7 merge in jb-mr1-release history after reset to jb-mr1-dev
bcebe48 Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
58e97bf am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
c2c9d5b Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
d1d9e35 am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
eb70ca2 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2e0679e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
ee28402 am 8d028a87: Allow wireless charging during encrypt
2817c46 Selectively enable bugreport in power menu.
33ed3e0 Import translations. DO NOT MERGE
fc66cb8 Import translations. DO NOT MERGE
8d028a8 Allow wireless charging during encrypt
ab7392b merge in jb-mr1-release history after reset to jb-mr1-dev
910fe04 am e42e7b85: (-s ours) Import translations. DO NOT MERGE
9ad78e8 Import translations. DO NOT MERGE
e42e7b8 Import translations. DO NOT MERGE
79b7fdd Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
e00cd9f added dock audio settings for non bluetooth docks
30d4f7d merge in jb-mr1-release history after reset to jb-mr1-dev
381df27 am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
4cf289a Merge "Wording change for Daydream setting" into jb-mr1-dev
8a4024e Add ability to add clock widget to keyguard
1e02061 merge in jb-mr1-release history after reset to jb-mr1-dev
67920f0 am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
b02771e Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
4125fbd Wording change for Daydream setting
d4362b7 Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
89a30ff Adding ability to add multiple keyguard widgets
ed49b6f am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e00f034 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
b8a9782 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
58ed28e merge in jb-mr1-release history after reset to jb-mr1-dev
a8f59cc Import translations. DO NOT MERGE
2b27447 Import translations. DO NOT MERGE
c666c65 Reduce jank in security lock selection by finishing on return
c250ae9 am 5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
5749ce0 Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
8d40fac Use given name instead of full name for the initial population of User name.
27dccee merge in jb-mr1-release history after reset to jb-mr1-dev
62abdda Remove blank translation string from en-GB, so it can show English.
828f523 Manually enter translations for msgid: 9014073093293520112
adc728f Fix layout with no access points
06545e8 am e508a26e: Remove blank translation string from en-GB, so it can show English.
36bdd2f merge in jb-mr1-release history after reset to jb-mr1-dev
e508a26 Remove blank translation string from en-GB, so it can show English.
a748995 am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
50ab4b4 Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev
98f884b am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
2baed32 Manually enter translations for msgid: 9014073093293520112
26bb239 Merge "Fix layout with no access points" into jb-mr1-dev
e2acfde Fix layout with no access points
25608dd am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
769b471 Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
a8327e3 merge in jb-mr1-release history after reset to jb-mr1-dev
3bdbf45 Dreams/Sleep Mode is now Daydreams.
7ff9d5e am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
b80b8bb Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
9cf3881 merge in jb-mr1-release history after reset to jb-mr1-dev
64516a1 Fixes an AIOOBE when device admin enforces a small timeout for screen lock
5fb549b am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
350ea07 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
a7acb16 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
697ca01 Import translations. DO NOT MERGE
3a7fd50 Import translations. DO NOT MERGE
09a728a am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
a023f4f Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
167ba2a Prevent sync state changes when user is a monkey
8e9678e merge in jb-mr1-release history after reset to jb-mr1-dev
f012a9d Added info about why Wi-Fi is required
3fd05c8 am 56a166e9: Added info about why Wi-Fi is required
56a166e Added info about why Wi-Fi is required
e2d92fe merge in jb-mr1-release history after reset to jb-mr1-dev
5586afe am d983e1d1: Settings: Use new shared dream setting defaults.
d983e1d Settings: Use new shared dream setting defaults.
66646dc merge in jb-mr1-release history after reset to jb-mr1-dev
9d0fbd7 am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
5a740ab Merge "More migration to Global settings." into jb-mr1-dev
7caa751 am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
8b98246 Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
025cafc Control OpenGL traces from Developer Options in Settings
860eceb More migration to Global settings.
ac8cfd0 am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
8346107 Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
ec16c0a bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
8b6036c am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
deb5a84 Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
17edbf3 am c14d1134: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
c14d113 Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
c825bc8 More descriptive summary for "Sleep Mode" pref.
4fed5a3 merge in jb-mr1-release history after reset to jb-mr1-dev
67a54ea am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f6d4b29 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0761408 Import translations. DO NOT MERGE
0bfd02b am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
c30a671 Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
ff11f09 am 50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
5002303 Merge "Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
7367bb2 am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208
4aaebfe Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
62ebbbc Show regulatory info within a ScrollView
9051e3c Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
91ecf27 Correcting content description in Wifi network selection activity. Bug: 7362208
57569b4 am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
6ec44ff Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
93f6219 merge in jb-mr1-release history after reset to jb-mr1-dev
89e93c9 am 7a1c4cdf: Fix check for multiple users
0b21b3d bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
7a1c4cd Fix check for multiple users
eabe82d am 7d078f94: Fix crash when viewing installed app details page
7d078f9 Fix crash when viewing installed app details page
3441d4a am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
3fb1f94 merge in jb-mr1-release history after reset to jb-mr1-dev
8e3f8d3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
676f445 merge in jb-mr1-release history after reset to jb-mr1-dev
808b74f Import translations. DO NOT MERGE
f487e2a Remove clock
891185a Merge "New developer setting: force 4x MSAA" into jb-mr1-dev
a9fada4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
87a620a merge in jb-mr1-release history after reset to jb-mr1-dev
6a9a3e7 New developer setting: force 4x MSAA
c20e5e3 Align text in Language & input screen
daabb12 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ddddcdd merge in jb-mr1-release history after reset to jb-mr1-dev
2b62fcb Merge "Let's enhance" into jb-mr1-dev
bc3cab9 Merge "Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates" into jb-mr1-dev
d1d0862 merge in jb-mr1-release history after reset to jb-mr1-dev
a5f6762 Show the overflow in the right place for keyguard settings
9072d9e Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
aa0e45c merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1c0ee7e merge in jb-mr1-release history after reset to jb-mr1-dev
6e0e3e5 Let's enhance
ec9bcad Import translations. DO NOT MERGE
afc0036 Merge "Disable security widgets for now" into jb-mr1-dev
016d448 merge in jb-mr1-release history after reset to jb-mr1-dev
e636a95 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
acc0e56 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0ac0287 merge in jb-mr1-release history after reset to jb-mr1-dev
b07c809 Import translations. DO NOT MERGE
9b8055b Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev
e437c66 merge in jb-mr1-release history after reset to jb-mr1-dev
35bbbc6 Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev
85badb0 Merge "Fix issue #7328934: change threshold of developer options countdown toast" into jb-mr1-dev
d6a24d5 Fix issue #7328934: change threshold of developer options countdown toast
ac15b48 Merge "Fix accessibility gesture summary text." into jb-mr1-dev
1b333af merge in jb-mr1-factory-release history after reset to jb-mr1-dev
02e209a merge in jb-mr1-release history after reset to jb-mr1-dev
4465bbb Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
73d49b3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b99f864 Fix crash in Settings for secondary users
53b14f5 Fix a regression in exiting the activity on picking a locale
84b90d5 Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev
cbabf19 Launch account addition activity from Settings instead of from AccountManager
2264a64 Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
0e092f4 Switch to IPackageManager.getServiceInfo().
af0cea0 Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev
e656031 Move lockscreen to using haptic feedback setting.
2625b9c Import translations. DO NOT MERGE
1a6e3e1 Disable security widgets for now
caefa9b Fix issue #7318666: hide developer options from user build
33080be Merge "Use user-specific PackageManager." into jb-mr1-dev
289a339 Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
e55eb81 merge in jb-mr1-release history after reset to jb-mr1-dev
849d64b Accessibility enabled by gesture not reflected in settings screen.
68dac84 Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
7cb4780 Use user-specific PackageManager.
c5e436c Fix padding for PagerTabStrip on large screen devices
553074f Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
7f2824b Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
40aa4b6 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1fde705 merge in jb-mr1-release history after reset to jb-mr1-dev
ef61723 Go back to top of list when Settings is relaunched
a92f380 Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
ba50175 Have poor network avoidance turned off by default
3067fbc Return RESULT_OK when wifi connection established
f4f1b80 Fix accessibility gesture summary text.
28eee7e merge in jb-mr1-release history after reset to jb-mr1-dev
2fc9403 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b7fcea5 Import translations. DO NOT MERGE
a1e406b Merge "Accessibility settings should update after gesture to enable accessibility." into jb-mr1-dev
1f81c05 Accessibility settings should update after gesture to enable accessibility.
8650808 Remove further logging
283dce2 Merge "Allow disconnected BT profiles to be unchecked in Settings." into jb-mr1-dev
c3ebad2 Remove verbose logging
df54b39 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
15bebe0 merge in jb-mr1-release history after reset to jb-mr1-dev
29707a5 Merge "Fix layout for decryption password entry." into jb-mr1-dev
7e54c54 Clean up 'accessibility shortcut' screen.
65eedd1 merge in jb-mr1-release history after reset to jb-mr1-dev
d2e414c Fix layout for decryption password entry.
0b146b2 Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
21c2904 Revert "Show warning dialog in a multiuser system when adding a new account."
b1597fc Import translations. DO NOT MERGE
1f9a07b Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev
7899599 Updating the screen magnification strings.
4a58b10 Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
a1c314a Fixing filter for status widget (issue 7295596)
54b3f50 Avoid NPE when missing PackageInfo.
69621ec Locale selection settings do not hide warning dialog.
6a2bf2a merge in jb-mr1-release history after reset to jb-mr1-dev
9d90489 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6fd359d Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
992e0b8 Merge "Announce dynamic content changes in lock confirmation settings." into jb-mr1-dev
904d372 Allow disconnected BT profiles to be unchecked in Settings.
2c41f7b Merge "Fix issue #7226978: Still in app detail screen after uninstall" into jb-mr1-dev
113e4b6 Merge "Refresh authenticator info when accounts change." into jb-mr1-dev
8f6060f Move the position of widget choosers to below lockscreen settings in Security
ab616d4 Fix issue #7226978: Still in app detail screen after uninstall
eabf976 Import translations. DO NOT MERGE
2763644 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
9958d35 merge in jb-mr1-release history after reset to jb-mr1-dev
8948fa5 Import translations. DO NOT MERGE
875fa8a Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev
eef72c3 Announce dynamic content changes in lock confirmation settings.
c8e609c Merge "Navigation fixes for Settings" into jb-mr1-dev
9ff79c1 Refresh authenticator info when accounts change.
4684ae8 Navigation fixes for Settings
ded980a No decoration for WifiSetup activity used by SetupWizard
ffec6ea Merge "Avoid NPE when installing app update." into jb-mr1-dev
3471886 Avoid NPE when installing app update.
6964300 Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev
60c848e merge in jb-mr1-release history after reset to jb-mr1-dev
2fa8cf7 Merge "Use new color avatar assets" into jb-mr1-dev
95dc473 Use new color avatar assets
b0e25f7 Merge "Follow API changes in framework." into jb-mr1-dev
be32d4b Follow API changes in framework.
a8f3a20 Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
d13e339 Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev
364082e Add a11y content descriptions and label mapping to Dreams.
c861cf8 Improved dialog management in Settings>Users
6258a0e Merge "Migrate telephony settings to Global." into jb-mr1-dev
84d04c2 Pass flag to indicate multiple users on device
42312b4 Merge "Support new ACTION_QUICK_CLOCK." into jb-mr1-dev
23a5fbb renaming Sleep Mode feature.
b1e4cd3 merge in jb-mr1-release history after reset to jb-mr1-dev
1e230b4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f26263f Merge "Upading the strings for accessibility multi-user." into jb-mr1-dev
26a6df0 Upading the strings for accessibility multi-user.
dd52473 Import translations. DO NOT MERGE
7474bc3 Move the installed app details overflow button to the top.
a2c12a6 Migrate telephony settings to Global.
f4d1c3e Support new ACTION_QUICK_CLOCK.
fd94d51 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
0205b4c merge in jb-mr1-release history after reset to jb-mr1-dev
82988b4 Merge "Add Help lin to Settings > Security" into jb-mr1-dev
93c0ee5 Add Help lin to Settings > Security
2485d9f Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev
a9c55d8 Make Settings shortcuts launch into the correct activity/fragment.
392122e merge in jb-mr1-release history after reset to jb-mr1-dev
1a47ecd Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
e60b705 Fix issue #7255954: API Review: rename Dream to DreamService
a59cc27 Merge "Colorize premium sms ui." into jb-mr1-dev
a59f1aa Setting to enable the global gesture for turning on accessibility.
2a840ae Show warnings when skipping Wi-Fi connection
b3696f8 Import translations. DO NOT MERGE
88c9f28 Show warnings when skipping Wi-Fi connection
a70c5e1 merge in jb-mr1-release history after reset to jb-mr1-dev
990c5f2 Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
ec4a152 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
284dce7 Import translations. DO NOT MERGE
4f64951 Merge "Developer setting to skip Package Verification" into jb-mr1-dev
1a634d3 Bring up new user setup dialog when tapping on new user
cc24aa2 Merge "Follow more Secure settings to Global." into jb-mr1-dev
b087390 Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
f042114 Developer setting to skip Package Verification
5246e7f Follow more Secure settings to Global.
001e14a Fix an NPE in WifiSettings.
48af3cd Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
2c84b9f Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
8666b9e Rename "Owner info" to "User info" for secondary users
f4b6a68 Merge "Addressing issue 7243210, can't set status widget properly" into jb-mr1-dev
fffc9be Merge "Precreate a data structure so it's never null." into jb-mr1-dev
eeb464a Addressing issue 7243210, can't set status widget properly
88b0140 Precreate a data structure so it's never null.
bfb5fa9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a6ab0bd merge in jb-mr1-release history after reset to jb-mr1-dev
04c4ec6 Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
3db1413 Merge "Clean up Global settings stragglers." into jb-mr1-dev
a9731af Import translations. DO NOT MERGE
eb71f26 Show warning dialog in a multiuser system when adding a new account.
08aafd4 Clean up Global settings stragglers.
74c1d32 Avoid using hardcoded strings.
99f98bb Merge "show the dream enable switch in all conditions." into jb-mr1-dev
63707af show the dream enable switch in all conditions.
6f2ca5b Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
d33caa4 Dream settings now looks for the settings activity in xml.
49dc982 Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
07d58df merge in jb-mr1-release history after reset to jb-mr1-dev
7fb4f85 Show more security settings, and fix missing summary in widget selection.
bf7fe20 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
12fda43 Merge "Show long message for a new user only once." into jb-mr1-dev
c41d69f Fix regression in Bluetooth settings.
0d9179c Merge "You section title for current user details" into jb-mr1-dev
209898d Merge "Update references to migrated global settings." into jb-mr1-dev
6a5e32a Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
cd207ad Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
263f744 Show long message for a new user only once.
fe8e076 Import translations. DO NOT MERGE
3104b04 You section title for current user details
a2806b6 Update references to migrated global settings.
075cb30 Move OVERLAY_DISPLAY_DEVICES to Global.
00798e6 Colorize premium sms ui.
16398c9 UI refinements to security screen widgets interface
a27ec92 merge in jb-mr1-release history after reset to jb-mr1-dev
a17a5b8 Fix regression in Bluetooth settings.
085d9b0 Addressing issue where power control widget disappears issue 7205586
8bea3c3 Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
85d4b5f Ensuring that keyguard widgets are bound with correct options
ff571fe Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
2bc32ae move remaining dock settings into sound settings fragment.
07d465d Hide lockdown VPN when IMS auth is required.
c939735 Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
ca88cda merge in jb-mr1-release history after reset to jb-mr1-dev
b44bdb2 merge in jb-mr1-release history after reset to jb-mr1-dev
7fb9185 Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
9627a8e Show more settings and add restrictions/dialogs for secondary users
0e9cf8a Storage item to represent cached data.
b105531 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
17b7a8c Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
9307c8e Import translations. DO NOT MERGE
8deb86f merge in jb-mr1-release history after reset to jb-mr1-dev
1ce9306 Remove no longer used dream_settings.xml.
70edd39 Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
098f493 Add new developer setting to visualize overdraw
2078b69 Addressing issue where power control widget disappears issue 7205586
f85e7e1 Merge "Accessibility multi-user support." into jb-mr1-dev
46045d8 Accessibility multi-user support.
0a48c16 Merge "Remove accessibility category from developer options." into jb-mr1-dev
f4bd1a7 Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
c715fb1 Fix issue 7198767, 7198366, 7189824.
936186c Revert "Import translations. DO NOT MERGE"
8172ea4 Import translations. DO NOT MERGE
7653179 merge in jb-mr1-release history after reset to jb-mr1-dev
406b01f Merge "Add support for changing status widget on security screen" into jb-mr1-dev
091477b Add support for changing status widget on security screen
e4f249b Merge "Exclude dying users when querying the list" into jb-mr1-dev
e278eda Exclude dying users when querying the list
43af40b Remove accessibility category from developer options.
377ab9c Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev
ecadb07 Fix bug #7198585 Settings > Display > Dream completely broken in RTL
852cfa9 Move super call to top of onActivityCreated
28cbc33 merge in jb-mr1-release history after reset to jb-mr1-dev
9e143f5 First draft of wifi display settings UI.
99340f3 Merge "Update string to reflect removed users." into jb-mr1-dev
801a158 Merge "Fix regulatory information dialog appearance" into jb-mr1-dev
6bf7211 Update string to reflect removed users.
ee9ecf0 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
cb0a6cc Fix NPE in DeviceInfoSettings
45410f3 Fix a crash in InstalledAppDetails
4420246 Migrate UI to supportsMultipleUsers().
185ba40 Fix NPE in DeviceInfoSettings
8882ccd Load user photos through system_server.
f5de1db Omit PPTP VPNs from lockdown list.
b92e9af Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev
b1bf9cf Fix a crash in InstalledAppDetails
9b2997b merge in jb-mr1-release history after reset to jb-mr1-dev
9fc59c9 Merge "Fix strings" into jb-mr1-dev
b585c62 Fix regulatory information dialog appearance
fb6faab Fix strings
352c901 Tweaking mechanism for adding keyguard widgets
27f155a Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev
dddef15 Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev
74dffa1 Fix bug: allow users to select "none" for lockscreen widget
220b06b Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev
fda48e3 Always show auto-sync; user-specific storage.
a6c1b34 Merge "Add optional regulatory info page" into jb-mr1-dev
7956e72 Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev
1490075 Rename file to satisfy strict Java requirement
1dd0024 Tweaking mechanism for adding keyguard widgets
682298b Fix issue #7178865: Selecting an app from Settings > Apps>...
9ba3d22 Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
9fae74f Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails...
221e435 Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev
ba088af Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev
0fca429 Fix issue #7178865: Selecting an app from Settings > Apps>...
a6dbaea Add optional regulatory info page
3e3b75f Merge "Add help menu for Users and Location access" into jb-mr1-dev
38223dc Add help menu for Users and Location access
05bf34c Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
23bc9fa Revert "Import translations. DO NOT MERGE"
fa69d3e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
76ab476 merge in jb-mr1-release history after reset to jb-mr1-dev
766a068 Merge "Use Bitmap instead of ParcelFileDescriptor to get the user's icon." into jb-mr1-dev
f34a85d Use Bitmap instead of ParcelFileDescriptor to get the user's icon.
b9e1ff1 Merge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev
f8f6217 Add flag to allow testing launcher widgets in keyguard.
64c6ee2 Merge "Use UserManager.getUserIcon() to get the user's avatar." into jb-mr1-dev
3028051 Fix cases where app widget ids were not being cleaned up
b4b2857 Import translations. DO NOT MERGE
5a72c67 Must initialize the new atomic..
e940dac Use UserManager.getUserIcon() to get the user's avatar.
d0d925d Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
ab644d6 Revert "Import translations. DO NOT MERGE"
0cbc30f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
bdb9fc8 Merge "Must initialize the new atomic.." into jb-mr1-dev
e8bffd1 merge in jb-mr1-release history after reset to jb-mr1-dev
582ab16 Merge "More user management ui work" into jb-mr1-dev
ae47ef4 More user management ui work
3db54cb Add app details menu item to uninstall an app for all users.
354eac7 merge in jb-mr1-release history after reset to jb-mr1-dev
4f1970f Must initialize the new atomic..
d41fd60 Merge "Ability to hide verification settings" into jb-mr1-dev
70c6e0f Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
260d930 Merge "Updating the screen magnification description." into jb-mr1-dev
cf008c2 Do not allow non-primary user to install certs
bbc3045 Ability to hide verification settings
928b7ce merge in jb-mr1-release history after reset to jb-mr1-dev
38305fb Data usage multi-user support.
5081855 Updating the screen magnification description.
a053ae2 Fix crash in Settings > Security
3465b67 Add support for per-package policy for sending premium SMS.
b2f4efb Correct strings for Plaform Anti-malware
bc7f678 Merge "Fix crash in Settings > Security" into jb-mr1-dev
19487f3 merge in jb-mr1-release history after reset to jb-mr1-dev
ce72ec7 Fix crash in Settings > Security
4a44ed7 Import translations. DO NOT MERGE
767597b Merge "Watch for profile changes and push to user manager" into jb-mr1-dev
3a932f3 Merge "Treat cache storage usage as available space." into jb-mr1-dev
ec6e662 Treat cache storage usage as available space.
8227e30 Add support for setting lock widgets
a928614 Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev
9310f85 Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev
f60b92b Protect self from async change of BluetoothPan
390b873 merge in jb-mr1-release history after reset to jb-mr1-dev
32dccbc Watch for profile changes and push to user manager
b6d7c9c Merge "Multi-user battery settings." into jb-mr1-dev
f642a6a merge in jb-mr1-release history after reset to jb-mr1-dev
4a09538 Merge "Iteration on multi-user Storage UI." into jb-mr1-dev
da13ec0 Iteration on multi-user Storage UI.
52e56a2 Multi-user battery settings.
2001a17 Merge "Don't crash during setup of secondary users" into jb-mr1-dev
43db526 Tell contacts to return back to Settings when done editing the profile info
4a596b1 Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev
df5a62e Don't crash during setup of secondary users
f1c0858 Correct settings namespace for auto time/tz
01bd0f0 Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
70d85c4 merge in jb-mr1-release history after reset to jb-mr1-dev
fc76a78 Include user identifier in external storage paths.
8291c08 Adding ability to filter for certain types of widgets in picker activity
b806013 Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
cfc1bec Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
eab9150 Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
7bbfc86 Wifi settings are in a different namespace now
cb122bd Merge "Wifi settings are in a different namespace now" into jb-mr1-dev
acee16f Wifi settings are in a different namespace now
44a3cb5 Merge "Fix on/off switch for Android Beam." into jb-mr1-dev
e8c73b1 Fix on/off switch for Android Beam.
6be075d Check the user limit before showing an ADD menu item
d7c704d merge in jb-mr1-release history after reset to jb-mr1-dev
30b6d23 am ebca7f3e: am 6aeed784: am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."
ebca7f3 am 6aeed784: am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."
6aeed78 am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."
f587f5a am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."
78f5c4d am 76ddf411: Merge "Fix /proc/version parsing in Settings."
152fc0e am 43a5c62c: am a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
43a5c62 am a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev
10b9602 am 4e201cc6: am f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
a47a3c8 Merge "Fix color of text in widget picker" into jb-mr1-dev
4e201cc am f7d76210: Merge "User management UI: take 2" into jb-mr1-dev
f7d7621 Merge "User management UI: take 2" into jb-mr1-dev
dc6bfa6 User management UI: take 2
284dc0f Fix color of text in widget picker
76ddf41 Merge "Fix /proc/version parsing in Settings."
d267d37 Fix /proc/version parsing in Settings.
dbe6f58 Update Settings app to use new namespace for airplane-mode settings
26fb99d am 3c76c467: am 6a5929b0: Update Settings app to use new namespace for airplane-mode settings
3c76c46 am 6a5929b0: Update Settings app to use new namespace for airplane-mode settings
ea7a7d4 am 8f113624: (-s ours) am 955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
ddb4389 am dd3f01af: (-s ours) am 6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
140c82a am e42e895d: am f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
be82dab am 206f87c5: am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
d1481db am 5b0e875d: am de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
d35bec0 am 32cf21c9: am bfbdceff: Grey out App Check setting when no verifiers exist
88da72e am e6195a12: am 1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
ec2f4f5 am b35bdfe9: am eda43176: Enable auto-brightness adjustment feature with system prop.
c123730 am 54ae7e51: am d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
4dbaa21 am 7b251126: am 6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
43c5cee am 20ec00d3: am 04df8b77: Iteration on multi-user storage UI.
6a5929b Update Settings app to use new namespace for airplane-mode settings
ec30983 Revert "Import translations. DO NOT MERGE"
8f11362 am 955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
955f347 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
301c218 Revert "Import translations. DO NOT MERGE"
dd3f01a am 6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6ac5ace Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
e42e895 am f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
f217f18 Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev
206f87c am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
cce52bd Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev
40b77fe Fix NPE in bluetooth Permission Activity
e88b7fa Import translations. DO NOT MERGE
0abbc1e Dream Settings: Disable settings icon if not selected.
d5babab Import translations. DO NOT MERGE
5b0e875 am de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev
de10103 Merge "Fixed the display count of connected panu device." into jb-mr1-dev
6665ee3 Fixed the display count of connected panu device.
0191cc3 merge in jb-mr1-release history after reset to jb-mr1-dev
32cf21c am bfbdceff: Grey out App Check setting when no verifiers exist
bfbdcef Grey out App Check setting when no verifiers exist
ed52efb merge in jb-mr1-release history after reset to jb-mr1-dev
e6195a1 am 1352c142: Merge "Add package verification to settings app" into jb-mr1-dev
1352c14 Merge "Add package verification to settings app" into jb-mr1-dev
b35bdfe am eda43176: Enable auto-brightness adjustment feature with system prop.
eda4317 Enable auto-brightness adjustment feature with system prop.
d5d6065 Add package verification to settings app
54ae7e5 am d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev
d4b711e Merge "Settings for the screen magnification feature." into jb-mr1-dev
decf36e Settings for the screen magnification feature.
7b25112 am 6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
6c08414 Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev
5a64c73 Update Settings app to manipulate now-global settings properly
20ec00d am 04df8b77: Iteration on multi-user storage UI.
04df8b7 Iteration on multi-user storage UI.
7121c19 am e8d2ae5f: am 96c2f8c5: Progress towards split storage categories.
e8d2ae5 am 96c2f8c5: Progress towards split storage categories.
96c2f8c Progress towards split storage categories.
a149c08 am 07e5c690: am 88220b72: am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
001d145 am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
07e5c69 am 88220b72: am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
0c0d605 am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
88220b7 am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
4ad02d0 am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."
105d879 am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
a76ba7b am cfbc61de: Merge "Stop using getDSTSavings."
98d9380 am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master
680c8c8 resolved conflicts for merge of 33f86196 to stage-aosp-master
cfbc61d Merge "Stop using getDSTSavings."
6c7f55e Stop using getDSTSavings.
33f8619 Merge "Stop hard-coding sample 12- and 24-hour times."
82723df Stop hard-coding sample 12- and 24-hour times.
2ec3622 am 2c705626: (-s ours) am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
2c70562 am d4e216bc: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
c4e8757 Merge "Revert "Import translations. DO NOT MERGE""
d4e216b Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
13cfa44 Revert "Import translations. DO NOT MERGE"
cbc213e Revert "Import translations. DO NOT MERGE"
436c542 am 237882f1: (-s ours) am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
237882f am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
d2dec8c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c3967b9 Merge "Import translations. DO NOT MERGE"
f0f79b5 am daed50bd: (-s ours) am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not merge
daed50b am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not merge
710aeba am c53ce268: (-s ours) Reconcile with jb-release - do not merge
fdca9c3 am f3541a5f: (-s ours) Reconcile with jb-mr1-release - do not merge
c53ce26 Reconcile with jb-release - do not merge
f3541a5 Reconcile with jb-mr1-release - do not merge
0d2e4cf merge in jb-mr1-release history after reset to jb-mr1-dev
23750fc am 5998c8ae: am ee04e472: Merge "Add content descriptions to power control widget." into jb-mr1-dev
5998c8a am ee04e472: Merge "Add content descriptions to power control widget." into jb-mr1-dev
ee04e47 Merge "Add content descriptions to power control widget." into jb-mr1-dev
d08dce4 Import translations. DO NOT MERGE
9dcb072 Import translations. DO NOT MERGE
84b87d0 am fb2a89c6: am 1537e8b3: Dream settings: list items back to constant height
fb2a89c am 1537e8b3: Dream settings: list items back to constant height
1537e8b Dream settings: list items back to constant height
64858b8 merge in jb-mr1-release history after reset to jb-mr1-dev
1e1e15b am 0aeb8f2e: am 952146ee: Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
0aeb8f2 am 952146ee: Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
952146e Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev
7951b43 Clear profile connnection status of bonded devices when BT is turned off
89fe8cb merge in jb-mr1-release history after reset to jb-mr1-dev
e1d076a am 6b329db9: am 22dc1fe2: Make TTS languages list sorted.
6b329db am 22dc1fe2: Make TTS languages list sorted.
22dc1fe Make TTS languages list sorted.
53afda3 merge in jb-mr1-release history after reset to jb-mr1-dev
50b05ad Merge "Import translations. DO NOT MERGE"
0e62d10 Import translations. DO NOT MERGE
bb7b462 Revert "Import translations. DO NOT MERGE"
49ca847 am 66514b78: (-s ours) am c888555f: FIX BUILD (DO NOT MERGE)
66514b7 am c888555f: FIX BUILD (DO NOT MERGE)
c888555 FIX BUILD (DO NOT MERGE)
896f3cf am 968a7be2: (-s ours) am f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
968a7be am f9e25e83: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
f9e25e8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6b70d5e Merge "Import translations. DO NOT MERGE"
9959460 am 1a3b2c00: am 788cde4c: Rename settings title for user management screen
1a3b2c0 am 788cde4c: Rename settings title for user management screen
788cde4 Rename settings title for user management screen
b9062f2 Add content descriptions to power control widget.
2fe7079 am 821ee347: am 037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
821ee34 am 037df2cb: Merge "Surface storage usage of other users." into jb-mr1-dev
037df2c Merge "Surface storage usage of other users." into jb-mr1-dev
90c8b20 Surface storage usage of other users.
1da741e am 40db7c50: am 7af2aa52: More traditional list item style for dreams settings.
40db7c5 am 7af2aa52: More traditional list item style for dreams settings.
7af2aa5 More traditional list item style for dreams settings.
25d1a7d merge in jb-mr1-release history after reset to jb-mr1-dev
38136be Import translations. DO NOT MERGE
b3e78cc Import translations. DO NOT MERGE
76d858c am 79bd0a75: am 2dff5b10: Merge "New dream settings - first cut" into jb-mr1-dev
79bd0a7 am 2dff5b10: Merge "New dream settings - first cut" into jb-mr1-dev
2dff5b1 Merge "New dream settings - first cut" into jb-mr1-dev
ee37876 am b519a126: am b2b54eec: Add new setting to control overlay displays.
b519a12 am b2b54eec: Add new setting to control overlay displays.
9f1ebc2 merge in jb-release history after reset to jb-dev
6df18e2 New dream settings - first cut
49c743c merge in jb-release history after reset to jb-dev
ad987fe merge in jb-mr1-release history after reset to jb-mr1-dev
b2b54ee Add new setting to control overlay displays.

   * packages/apps/SoundRecorder
e5bd852 SoundRecorder: Update Greek translation
e741004 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/SoundRecorder into HEAD
5ff0509 restore soundrecorder interface

   * packages/apps/SpareParts
05eab08 SpareParts : add french translation
23c67a0 SpareParts: Correcting misspelled errors
ebe55a6 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/SpareParts into HEAD
91333e3 SpareParts: Added czech translation
4db9978 Migrate more System and Secure settings to Global.

   * packages/apps/SpeechRecorder
fe0e0f5 SpeechRecorder: HU translation
87914b8 SpeechRecorder : reorganize translation and Copyright correction
9bb0a2a PT-BR: Initial translation

   * packages/apps/Stk
fac65f5 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Stk into HEAD
ac72bff More issue #7226656 second user seeing primary user's apps
a8e4f50 Fix mVibrator initialization.
598b3dd am 8e36a0a6: am 3420f3cc: Merge "No response sent when backlight is OFF"
8e36a0a am 3420f3cc: Merge "No response sent when backlight is OFF"
3420f3c Merge "No response sent when backlight is OFF"
99fccc1 No response sent when backlight is OFF

   * packages/apps/Tag
b968cba es_ES: Fix spanish translation
8df9772 Correcting typos
5f90b8a Fix Tags app NPE.

   * packages/apps/Torch
d558d45 Torch: FI translations
8db5d86 Torch: DA translation
62eaa12 Torch: EL translations
635758d Merge "Torch: NB translation" into cm-10.1
2f9d28b Torch: NB translation
df7010c Torch: SK translation
597cae6 Torch: Update Polish language
7aeb49c Fix aapt warning.
9fdf522 Torch: ET translations
c491765 Merge "Torch: NL translation" into cm-10.1
66d66c6 Merge "Torch: zh-rTW translations" into cm-10.1
c48bdc1 Torch: zh-rTW translations
6e5a474 Use sticky broadcast to convey torch state (2/2).
3e15ff8 Torch: NL translation
d91f217 Merge "Torch: Add missing Af Translations" into cm-10.1
7109bd1 Merge "Torch: Simplified Chinese Translation" into cm-10.1
ac96340 Merge "Torch : FR translation" into cm-10.1
15be9c0 Torch: IT translations
a255105 Torch: Add missing Af Translations
6b21655 Merge "Torch: RU translation" into cm-10.1
47dd5b5 Merge "Torch: PT-BR update translations" into cm-10.1
da3bd64 Merge "Torch: CS translation" into cm-10.1
7ac4cb3 Merge "Torch: ES translations" into cm-10.1
4de793e Merge "Update German translation." into cm-10.1
e9b654f Torch: HU translation update
3608d46 Torch: ES translations
1b622b6 Torch: PT-BR update translations
86c97fb Update German translation.
023a455 Improve layout of brightness warning dialog.
1403974 Torch: CS translation
89239f5 Torch: RU translation
e0076fc Torch : FR translation
1bb45ed Torch: Simplified Chinese Translation
ce44db5 remove reduntant summary in notification
ea37177 Torch : Turn off action via notification
5628d44 Torch: SK Translations
5638e76 Torch: Fix NPE
2077ef1 Torch: EL translations
3701ea9 Torch: Rearrange Greek translations
bbaf27f Add Afrikaans translation
8ed1b95 Merge "Torch: fix mdpi layout issues" into cm-10.1
39c73dd Merge "Update Russian Translation-Torch-CM10.1" into cm-10.1
80feb46 Update Russian Translation-Torch-CM10.1
2127a0c PT-BR: Update translations
dc331ab es_ES: Fix spanish translations
6ebe01d Added Serbian translation
3810018 Torch: Hebrew translation
1eb95b7 Torch: fix mdpi layout issues
7d532ed Merge "Torch: Add Greek translation" into cm-10.1
8c7b3b9 Torch: Dutch translations
54adae3 Torch: Add Greek translation
f160052 Allow using the torch widget as keyguard widget.
807c99f Merge "Torch: Fix deprecation" into jellybean
ec3a48d Torch: Fix deprecation
3176c74 Torch: add support for devices with a separate sysfs entry for luminosity
5a98e7b Modify widget to utilize AOSP power widget UI
46c5edc Implement the ability for Torch to use the camera interface to light the camera LED.

   * packages/apps/Trebuchet
2e2451f Trebuchet: CA translations
e9aa9f0 Trebuchet: FI translations
061f496 Trebuchet : Simplified Chinese translation
1aee8ff Merge "Trebuchet: EL translations" into cm-10.1
06a8d76 Merge "Trebuchet: Fix MDPI layout" into cm-10.1
bfb4ca4 Trebuchet: EL translations
247aa3f Trebuchet: HU translation
15472de Merge "Hotseat: Disable hitsPreviousPage if hotseat is vertical" into cm-10.1
1a6379d Hotseat: Disable hitsPreviousPage if hotseat is vertical
12d0e15 Trebuchet: Update Polish translation
5eebbc0 Trebuchet: PT-BR update translations
6d401a6 Merge "Trebuchet: CS translation" into cm-10.1
c526871 Trebuchet: AF Translations
b9c6f81 Merge "Trebuchet: NL translation" into cm-10.1
f999e04 Merge "Trebuchet : FR translation" into cm-10.1
66a3364 Trebuchet : FR translation
c6761ac Trebuchet: Update italian translation
d81a8e2 Trebuchet: NL translation
e46e7e1 Merge "Update German translation." into cm-10.1
e26970e Trebuchet: ES translations
9cf8abd Trebuchet: CS translation
2458ef8 Merge "Trebuchet: RU translation" into cm-10.1
c0cfb60 Merge "Trebuchet: PT-BR update translations" into cm-10.1
95d8101 Trebuchet: HU translation
d23184a Trebuchet: RU translation
24f231d Update German translation.
175e9fe Trebuchet: PT-BR update translations
6df8606 Trebuchet: Fix NPE
21d44da Trebuchet: Make remove workspace items of hidden apps optional
7fd44ab Merge "Trebuchet: Remove workspace items of hidden apps" into cm-10.1
7607c34 Merge "Trebuchet: Fix stack effect" into cm-10.1
f420638 Trebuchet: Fix stack effect
1221b2f Trebuchet: Remove workspace items of hidden apps
3906074 Trebuchet: Fix Landscape/TransposeLayoutWithOrientation move to default page
73c303e Trebuchet: Sync "maxExternal" preferences and its defaults values
0827ce7 Trebuchet: Revert animation end
2c5395b Merge "Trebuchet: Add missing Afrikaans translations" into cm-10.1
678214f Merge "Trebuchet: PT-PT translations minor changes/aditions. " into cm-10.1
13eda2a Trebuchet: Fix fadein adjacent screens for stack transition
08d1579 Trebuchet: Add missing Afrikaans translations
dbdd23b Workspace: Change state animation cleanup
fa9e38b LauncherViewPropertyAnimator: Implement end()
028bb8e Workspace: Small cleanup
a24c820 EcoGallery: Small cleanup
7b71954 Revert "Trebuchet: Fix double tab on home button"
a853074 Trebuchet: PT-PT translations minor changes/aditions.
02faeef Trebuchet: Update German translation
6831a8b Trebuchet: Fix MDPI layout
03ee662 Trebuchet: Simplified Chinese Translations
4650788 Workspace: Landscape paged view indicators
d52a2fe Fix for low aspect ratio (4x3) tablets.
8752c0f Trebuchet: EL translations
2ebbe4d Trebuchet: Update italian translation
27dd874 Trebuchet: fix broken compilation due to commit 42994
0ea76d0 Trebuchet: Better layout for isScreenLarge devices
08888e9 Merge "Trebuchet: Fix double tab on home button" into cm-10.1
a73e69c Trebuchet: TR translations
2db83bb Trebuchet: SK translations
6a198e0 Trebuchet: Fix double tab on home button
7054b57 German: Refine translation
e0b248c Update German translation.
55d664a Merge "Trebuchet: DA translation" into cm-10.1
4e4ad2d Trebuchet: Update Polish translation
3c992ee Trebuchet: DA translation
0ef9499 Merge "Revert "Reload launcher on expanded desktop"" into cm-10.1
fc66ff6 Merge "Trebuchet: NB translation" into cm-10.1
91ca83d Trebuchet: Fix workspaceTabletGrid check
2b43981 Trebuchet: HU update translation
0794b99 Update German translation
0509b19 Trebuchet: NB translation
69259d1 Merge "Trebuchet: Centers horizontally the drawer on vertical orientation" into cm-10.1
3c129af Trebuchet: Properly remove grid preference on isLargeScreen devices
b9322f7 Trebuchet: Centers horizontally the drawer on vertical orientation
0f3f010 Revert "Reload launcher on expanded desktop"
4c46512 Update German translation.
e29b28f Merge "Trebuchet: Simplified Chinese Translations" into cm-10.1
c149223 Merge "Trebuchet : FR translation" into cm-10.1
4d75a82 Merge "Trebuchet: NL translation" into cm-10.1
36bf4e7 Trebuchet : FR translation
61ada99 Trebuchet: Simplified Chinese Translations
624a1fa Trebuchet: Update italian translation
cd8a1f7 Trebuchet: NL translation
ccb0063 Merge "Trebuchet: CS translation" into cm-10.1
db0e25b Merge "Trebuchet: PT-BR translations" into cm-10.1
8779717 Merge "Trebuchet: ES translations" into cm-10.1
352cbba Trebuchet: ES translations
7fedf2a Trebuchet: RU translation
1f5cc0d Trebuchet: Fix drawer vertical orientation bugs
1d1a4ca Trebuchet: CS translation
decbaf6 Trebuchet: Labels on dock items
59b16ee Merge "Trebuchet: CS translation" into cm-10.1
ef41541 Trebuchet: Refactor RU translation
05f8e95 Trebuchet: PT-BR translations
7914531 Merge "Trebuchet: NB translation" into cm-10.1
ba87508 Trebuchet: EL translation
20afed8 Trebuchet: NB translation
c2cb788 Trebuchet: CS translation
b6eac96 Merge "Trebuchet: Update italian translation" into cm-10.1
df53fae Merge "Trebuchet: NL translations" into cm-10.1
2d284c3 Trebuchet: NL translations
23d6d89 Trebuchet: Update italian translation
340673f Trebuchet : refactor cm_*.xml
1b594e9 Merge "Trebuchet: Use preference provider to lock/unlock homescreen" into cm-10.1
47303b2 Trebuchet: Use preference provider to lock/unlock homescreen
27e7ba4 Merge "Trebuchet: DA translation" into cm-10.1
06b25e5 Merge "Trebuchet: PT-BR update translations" into cm-10.1
3e1968b Trebuchet: HU translation refactoring
8663738 Trebuchet: Force reload wallpaper dimension on screen size change
bb5e803 Merge "Trebuchet: ES translations" into cm-10.1
e5f6a35 Merge "Trebuchet: Updated Norwegian translation" into cm-10.1
4d961cb Trebuchet: ES translations
8940e59 Trebuchet: DA translation
bd9793a Trebuchet: Lock homescreen
b76a4e1 Trebuchet:	Update italian translation
8d8b14c Trebuchet: Updated Norwegian translation
362f92d Trebuchet: PT-BR update translations
f802dc1 Trebuchet : FR translation
a2ac880 Trebuchet: Refactor AF translations
7bafeab Enable screen stretch by default
1ea6e47 Merge "Trebuchet: EL translations" into cm-10.1
4a91126 Merge "Trebuchet : FR translation" into cm-10.1
f6dd149 Merge "Trebuchet: HU update translation" into cm-10.1
5b9609e Trebuchet: Refactor default translations
678b072 Trebuchet : FR translation
25a2638 Trebuchet: HU update translation
cf9bb88 Trebuchet: EL translations
222c3db Trebuchet: Extract effects arrays to strings
36519e6 Merge "Trebuchet: ES translations" into cm-10.1
212aa71 Merge "Trebuchet : Fr translation" into cm-10.1
b707f52 Merge "Trebuchet: RU translations" into cm-10.1
2954148 Trebuchet: ES translations
c788c40 Hotseat: Go to default page on home button
8b99331 Trebuchet : Fr translation
16689a8 Merge "Trebuchet: Hotseat fixes" into cm-10.1
84df960 Merge "Trebuchet: Update italian translation" into cm-10.1
2535050 Trebuchet: Hotseat fixes
da04260 Merge "Trebuchet Settings: add setDisplayHomeAsUpEnabled" into cm-10.1
e32cb9d Merge "Trebuchet: Fix vertical position of wallpaper when mWallpaperHack is activated" into cm-10.1
32e86c3 Merge "updated German translation" into cm-10.1
83e840d Trebuchet: Fix vertical position of wallpaper when mWallpaperHack is activated
11d81dc Trebuchet: Fix Camera favorite
8fd6c3e Trebuchet: updated "carousel" transition effect
a5fb44a Trebuchet: RU translations
d395d64 Merge "PT-BR: Update translation" into cm-10.1
fd49157 Merge "Trebuchet: Reorganize Greek translations" into cm-10.1
244fb37 Trebuchet: Update italian translation
69b593d updated German translation
f7dbcbe Merge "added "carousel" transition effect" into cm-10.1
c33f0d6 PT-BR: Update translation
a7510e5 Trebuchet: Fix default cLock widget size on home screen
77c5122 Trebuchet: Reorganize Greek translations
c7ef75b added "carousel" transition effect
d8e1aa7 Trebuchet: force close in dock (Trebuchet) with raised default page count
42b656d Merge "Trebuchet: Default workspace fixes" into cm-10.1
eed8a5d Trebuchet: Default workspace fixes
48541f8 Merge "Trebuchet: Centers vertically the wallpaper" into cm-10.1
f9da888 Trebuchet: Fix NPE
6d85b17 Trebuchet: Centers vertically the wallpaper
6d0f701 Update German translation.
27ff8f6 Merge "Trebuchet: Added arrays.xml for Polish language" into cm-10.1
deaf1bf Trebuchet: Added arrays.xml for Polish language
b50f25a Trebuchet Settings: add setDisplayHomeAsUpEnabled
a9125c9 Trebuchet: Add overlayable config for tablet workspace grid size
576c216 Fix market & overflow button paddings
7ce94bf Merge "Trebuchet: fix coherence in French translation" into cm-10.1
a78a0ff Trebuchet: fix coherence in French translation
95ca3e9 Trebuchet: Updated Polish translation
b740f65 Merge "Trebuchet: UK translations" into cm-10.1
c197fa6 Trebuchet: UK translations
0016b2d Merge "es_ES: Restore AOSP header" into cm-10.1
b14bf99 Corrected misspelling of Accordion
8ded2a0 es_ES: Restore AOSP header
599792d Trebuchet: fix Dutch translation
67e2e6b Merge "Revert "Improve scroll responsiveness."" into cm-10.1
e401cb1 Revert "Improve scroll responsiveness."
01a434b Revert "Fix overflow visibility logic"
9192968 Fix overflow visibility logic
4b8d06f Trebuchet: fix uninstall app from shortcut
251be3a Launcher: Fixes to overflow menu button
ce6b251 Improve scroll responsiveness.
1e39be6 Launcher: Fix overflow menu button
1e20d97 Merge "Add Afrikaans translation" into cm-10.1
ce6e4f8 Add Afrikaans translation
7f9e7ad Merge "Trebuchet: Update italian translation" into cm-10.1
a9261f2 Trebuchet: Update italian translation
5362337 es_ES: Updated spanish translations
9b03281 trebuchet: Avoid NPE on startup
ed1816e Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Launcher2 into treb
c43d6ee Merge "Trebuchet: Updated italian translation" into cm-10.1
7eb8551 Japanese : update Japanese translation.
7f66c84 Trebuchet: Updated italian translation
19975f4 PagedView: Prevent NPE
125ab5a Reload launcher on expanded desktop
9889f44 Merge "ShortcutInfo: Don't assume all stringified items have a title" into cm-10.1
eece34e ShortcutInfo: Don't assume all stringified items have a title
40851fa Merge "Lithuanian: translations for trebuchet" into cm-10.1
20a2e4f Lithuanian: translations for trebuchet
8c2d3ee DeleteDropTarget: Fix ghost allapps button
6d78f49 CleanSpec: Trebuchet
bae2fee Merge "Trebuchet: Dutch translations (2) [cm-10.1]" into cm-10.1
4b18edb Trebuchet: Dutch translations (2) [cm-10.1]
4a7f443 Trebuchet: New Danish strings
47a936b Remove obsolete translations
0b664a5 Revert "Preferences: Koush steals yachts"
7b743da Revert "Preferences: Remove useless log"
a0e17fc Trebuchet : fix french translation
96fee2c Merge "trebuchet: updated finnish translations" into cm-10.1
b65efc8 Set default workspace transition to ZoomIn
1e35b2a trebuchet: updated finnish translations
3589fca Workspace: Fix wallpaper offset landscape
30e8caa Hotseat: Remove extra padding
5cee316 Merge "Trebuchet: remove resize any widget from translations" into cm-10.1
825bcf2 Trebuchet : Add french missing translation
0b1a8be Trebuchet: remove resize any widget from translations
35d2f65 Workspace: Default wallpaper hack
7add60c Workspace: Remove resize any widget preference
3642fc0 Merge "Workspace: Only show hotseat outlines if hovering over" into cm-10.1
fa0abb7 Workspace: Only show hotseat outlines if hovering over
57fc0ef Merge "CellLayout: Use default and target cell counts" into cm-10.1
c1e82f6 CellLayout: Use default and target cell counts
a55da35 Merge "Trebuchet: Update Greek translations" into cm-10.1
08e8cfc Merge "Added missing hungarian translations" into cm-10.1
6847fa4 Merge "PT-BR: Added missing translations" into cm-10.1
b304f88 Update Russian Translation-Trebuchet-CM10.1
74907f6 Merge "es_ES: Added icon scale translations" into cm-10.1
912cc4a Merge "Trebuchet: Simplified Chinese Translations" into cm-10.1
e0a7d56 Merge "Trebuchet: Missing russian strings" into cm-10.1
ea70b09 Remove drop target text in landscape
95f418c Fix vertical transition effects
b152e80 Added missing hungarian translations
17c3cf4 Resubmitted change Idf6b8399 due to a failed merge
d3105ce Trebuchet: Update Greek translations
c8a095f ShortcutInfo: Save title if itemType shortcut
f86587d Cleanup
a0711ef Trebuchet: Simplified Chinese Translations
245a6ef LauncherProvider: Revert changes to check whether app is installed before adding favorite
55241e5 Workspace: Fixes
ee652ca DeleteDropTarget: Don't accept allapps button
535ae33 Workspace: Fix hotseat dropping
8ef4dd9 LauncherModel: Fixes
8dd822a ShortcutInfo: Save title if custom
d94ab9e Hotseat: Use single layout
bccc420 Hotseat: Fix sw720dp default cell count
84cb281 Fix sw600dp icon offsets
c0c2017 es_ES: Added icon scale translations
eed3d7e PT-BR: Added missing translations
577c01a Fix sw720dp icon offsets
6effc17 LauncherProvider: Revert some changes
5c44f95 Trebuchet: Missing russian strings
bed0cb3 Preferences: Remove useless log
3786ed8 Launcher: Remove long-press menu
ce7dcdd Merge "PreloadReceiver: Use com.cyanogenmod.trebuchet resources" into cm-10.1
2c82ff5 Merge "LauncherProvider: Cleanup" into cm-10.1
1671eea Preferences: Koush steals yachts
5fb6aa8 PreloadReceiver: Use com.cyanogenmod.trebuchet resources
64c3706 LauncherProvider: Cleanup
b3f3d69 Merge "German: Update translation" into cm-10.1
8cb21c9 Merge "Trebuchet: Dutch translations" into cm-10.1
6507147 Merge "Trebuchet: updated romanian translation" into cm-10.1
a19124c Merge "PT-BR: Added missing translations + fixes" into cm-10.1
50cd60d Merge "Japanese: update translation for CM10.1" into cm-10.1
bac5aed Merge "Launcher: Hide wallpaper when transitioning if rendering manually" into cm-10.1
2b36de7 Launcher: Hide wallpaper when transitioning if rendering manually
15e8754 German: Update translation
96aad08 Merge "Added missing hungarian translations" into cm-10.1
0125dc4 Launcher: Don't remove pending add info with shortcut pick
e74af3d Trebuchet: Dutch translations
733e99a Added missing hungarian translations
a9cb02c Trebuchet: updated romanian translation
5ffcd2b Hotseat: Icon scale
16e2756 Workspace: Fix folder creation
c1b948f Workspace: Fix sw720dp scrolling indicator
477017c Revert "Revert "Launcher: Trebuchet settings visibility""
5f6c9fb EcoGallery: Don't use reflection
6fa3dd5 Launcher: Software Menu Button
32fdce8 Workspace: Hotseat fixes
f7bc626 Japanese: update translation for CM10.1
8901992 Fixes
fc8ea2d Merge "Added hungarian translation" into cm-10.1
2a5339f Merge "Update Russian Translation-Trebuchet-CM10.1" into cm-10.1
873b20c Merge "es_ES: More missing translations" into cm-10.1
a3809b8 German: Update translation
2183bcc Merge "LauncherActions: Don't use magic intents" into cm-10.1
e0bb5fb Merge "AppsCustomizePagedView: Fixes" into cm-10.1
bdf7f38 Merge "Workspace: Hotseat fixes" into cm-10.1
f3b94b9 Merge "Cleanup" into cm-10.1
8fb7b9e LauncherActions: Don't use magic intents
8fb6e3e AppsCustomizePagedView: Fixes
2fc141a Workspace: Hotseat fixes
10a5745 Cleanup
2bcc3fa Added hungarian translation
bb796d0 Trebuchet: Simplified Chinese Translations
e3c936a PT-BR: Added missing translations + fixes
78d5448 Update Russian Translation-Trebuchet-CM10.1
e1ce1b4 es_ES: More missing translations
b79406c Merge "Hotseat: Lanscape layout fixes" into cm-10.1
3f4a94b Merge "Revert "Launcher: Trebuchet settings visibility"" into cm-10.1
3872581 Revert "Launcher: Trebuchet settings visibility"
53b9dc7 Hotseat: Lanscape layout fixes
7854438 Merge "LauncherProvider: Clear dock before DB v13" into cm-10.1
99497d6 Merge "Launcher: Trebuchet settings visibility" into cm-10.1
25450fe Merge "Hotseat: Landscape layout fixes" into cm-10.1
120df53 Merge "HiddenAppsActivity: Set PREFERENCES_CHANGED" into cm-10.1
c64be6f Merge "Hotseat: Cleanup" into cm-10.1
f66e0ee Merge "Hotseat: Fix landscape grid" into cm-10.1
8e9cbad Merge "Hotseat: Number Icons" into cm-10.1
b8720ba Merge "Hotseat: Default Page" into cm-10.1
dcc1ded Merge "Hotseat: Multiple Pages" into cm-10.1
7032cc3 Merge "Launcher: Long-press Menu" into cm-10.1
e172c91 Merge "Launcher actions" into cm-10.1
fb97fd6 LauncherProvider: Clear dock before DB v13
72e1c32 Launcher: Trebuchet settings visibility
73753d9 Hotseat: Landscape layout fixes
9655928 HiddenAppsActivity: Set PREFERENCES_CHANGED
31ea633 Hotseat: Cleanup
d9cb08d Hotseat: Fix landscape grid
3c51286 Hotseat: Number Icons
1650f04 Hotseat: Default Page
c6f8c8c Hotseat: Multiple Pages
8ef4f37 Launcher: Long-press Menu
fff81ca Launcher actions
411a34a Fixed compiler warnings
05ee72b es_ES: Added CM translations
f056ef0 Trebuchet: Updated romanian translation
10a908a Workspace: Shortcut renaming
a8d6d21 Workspace: State transitions fixes
1a9d397 AppsCustomizePagedView: Filtering
229ac20 AppsCustomizeTabHost: Fix apps sorting
cb97779 AppsCustomizePagedView: Indicator Position
615eee5 Preferences: Hide grid on large
aa2460b Merge "Preferences: Fix XML whitespace" into cm-10.1
bc1b40f Preferences: Fix XML whitespace
06cdefa Merge "Workspace: Run checkWallpaper on UI thread" into cm-10.1
42ce925 Workspace: Run checkWallpaper on UI thread
c8628f1 Fix string/array values
ff5702b Fix drawer transitions
62d0f2d Workspace: Wallpaper Size
c6383d8 Merge "Transition Effects: Don't force fade on cube" into cm-10.1
41ea339 Transition Effects: Don't force fade on cube
688654e Merge "Launcher: Fullscreen Mode" into cm-10.1
e5723ba Merge "Preferences: Cleanup" into cm-10.1
54c4082 Launcher: Fullscreen Mode
24c4172 Preferences: Cleanup
bd90f63 Merge "German: Update translation" into cm-10.1
a8012a5 Workspace: Indicator Position
ee6c7eb Italian translation for Trebuchet (Update)
e1ba702 German: Update translation
1151b2f Update log tags
a257f0d Cylinder Transition Effect
7ec1ecc Merge "PreferencesProvider: Prevent FC when invalid transition effects given" into cm-10.1
56c3262 PreferencesProvider: Prevent FC when invalid transition effects given
d1ccd51 Merge "Transition Effects Fixes" into cm-10.1
85f99bb Merge "Trebuchet: updated romanian translation" into cm-10.1
abb448d Transition Effects Fixes
d55fae2 Trebuchet: updated romanian translation
e2958e7 PT-BR: Added missing translations
396b090 Merge "Italian translation for Trebuchet" into cm-10.1
53dd312 Merge "German: Update translation" into cm-10.1
9a8c90e Italian translation for Trebuchet
ee1d489 Update Russian Translation-Trebuchet-CM10.1
2c86220 PagedView: Vertical scroll indicator
461439a German: Update translation
2014701 AppsCustomizePagedView: Flip transition effect camera distance
d1d8496 PagedView: Don't force draw children without checking whether they should be drawn
e1c1c98 German: Update translation
ec8dcc1 Update Russian Translation-Trebuchet-CM10.1
177b57c Workspace: Stretch screens
9c4a288 Preferences: Use correct default padding values
15d15cc Workspace: Fix wallpaper offset on recents list
5194c1d AppsCustomizePagedView: Orientation
ced2e4f PagedView: Vertical
4f021e9 Revert "Workspace: Don't set wallpaper visibility with hack"
11b11c5 Transition Effects
bbf4dd7 Workspace: Fix missing show outlines
3ad0983 Preferences: Use default grid size params
eff1f62 Workspace: Fade in adjacent screens
109a53d Workspace: Show outlines
2ac7105 Workspace: Remove wallpaper shadow background
a61c75c Workspace: Don't set wallpaper visibility with hack
4e4494a Fix workspace padding preference
04f9c23 Workspace: Quad interpolator
0806c35 Workspace: Make sure wallpaper gets redrawn to avoid ghost wallpapers
50ace94 Fix various cell size/placement failures
d2f8f8f This is causing a lot of weirdness on tablets' hotseats, + mild weirdness (such as roaming AllApps icon) on phones
8fe64dd Workspace: Don't refresh wallpaper visibility on live wallpapers
83c451b Workspace: Update wallpaper offsets to match hack for recent apps window
002c25e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
084e36a oops
c631474 LauncherModel: Fix possible NPE
2dfb053 Wallpaper Hack: Default to false
9180c15 Wallpaper Hack
e74a543 Trebuchet : Add a pref to set hotseat icon's number
7819abd Fixing issue where the cling is offset. (Bug 7633074)
2f22e71 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3969253 Merge "Fix desktop alignment when Search Bar is hidden" into mr1-staging
359dc42 Fix desktop alignment when Search Bar is hidden
a764f3a Fix package mismatch
1ef2123 Fixing NPE in updateCurrentPageScroll (Bug 7465970)
75e3003 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
ce552e9 Merge "Fix janky transition on All Apps tab switch" into jb-mr1.1-dev
7f9ddd8 Fix janky transition on All Apps tab switch
24a1c4e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2ee5fe7 Merge "Refactoring push reordering (issue 7139335)" into jb-mr1.1-dev
f3900c2 Refactoring push reordering (issue 7139335)
0a457bf Fix StrictMode violation
e70dd1b Underp folder scaling
ec05469 Ensuring that restoreInstanceState is being called promptly for synchronously bound page
be62d49 Merge commit 'mr1-rebase' into mr1-staging
50d4e62 Fix post-merge breakage from the new 4.2 stuff
cdb1e61 Fix for install shortcut intent
138211b Trebucher : Added missing French Translation
4ae4544 Trebucher : Added missing French Translation
73034d0 Update Russian Translation-Trebuchet-CM10 (typo)
32e13a8 Fix for NPE in showAllAppsCling
165e8b4 Trebuchet: updated romanian translation
d7b099b Fix page_hover_left_holo.9.png on all dpi
3f731c3 Trebuchet: Added czech translations
31caf7e Trebuchet: Fix preference casing
c9cc0ee Trebuchet: Only mark preferences changed when they actually are
b7bea4f Launcher: increasing the lower bound and upperbound of loaded pages to avoid stutter in applist scroll
10c87c3 Fix shortcut intent when all homescreens are full
f58804b Remove wallpaper offset
4a06d4f Fix shortcut intent when using less than 3 homescreens
25ee0f5 Trebuchet/TR: Initial commit for Turkish
938701c Trebuchet: update romanian translation
f039c8b Trebuchet: Simplified Chinese Translations
96bd5e4 Trebuchet: Updated italian translation
b56dcea Trebuchet: Dutch translations
5e72892 Trebuchet: Suggested minor improvements to Danish translation
db8b313 es_ES: Added missing translations
df37960 New App Icon featuring Cid
892dcf5 Trebuchet: Added missing danish translations
35a9ab8 Trebuchet: Update Japanese translation.
6a183f2 Update French translation-Trebuchet-CM10
f605939 Trebuchet: German translation
3a60acc Update Russian Translation-Trebuchet-CM10
8e62f37 PT-BR: Merge more from CM9 translations
7e4096b PT-BR: Merge From CM9 Translations
e9daa0d Trebuchet : Hide voiceSearch icon
37d87ee Use correct search and voice search icons in the search bar
6484304 trebuchet: updated finnish translations
3a57c06 Trebuchet - Updated Italian translation
9e230de Trebuchet: Uighur - Remove obsolete translation entries
3c0666c Preferences: Hide dock/icon categories
cb17bc8 Launcher: Use correct toolbar icon metadata name
82468e9 Update Russian Translation-Trebuchet-CM10
a12d15b Added hungarian translation for Trebuchet
09bd1a6 Hotseat: Default Cell Counts
7695adf Trebuchet: Simplified Chinese Translations
18da44c Workspace: Custom Vertical/Horizontal Padding
a0ba131 NumberPickerPreference: Cleanup external min/max code
e4fdb6d Workspace: Cleanup hide icon labels
8973498 DropTarget: Manage landscape strings programmatically
76674d9 DeleteDropTarget: Haptic Feedback on Long-Press
6075c92 DeleteDropTarget: "Cancel" when dragging from AllApps
2bbba47 CellLayout: Better Scaling
47d32ee Preferences: Show/hide homescreen icon labels
968ead5 DeleteDropTarget: Long-Hold To Uninstall
3f82fde AppsCustomize: Apps Sort Mode Cling
e78f8ad AppsCustomize: Apps Sorting Mode
5abfd39 Folders: Merge Folders
ce6a82b Preferences: Show Dock Divider
becaacb Preferences: Cleanup
12cef58 Preferences: Fade Page Indicator (Workspace)
6e49209 Preferences Show/Fade Page Indicator (AllApps)
00991d0 Preferences: Separate Apps and Widgets
f6ed954 Preferences: Scroll Wallpaper
d8b9a4b Preferences: Show Page Indicator (Workspace)
7c37547 Preferences: Version preference information style
bd9ec6a Preferences: Number of Homescreens + Default Screen
189ed18 values-sw: application_name is not translatable
eb33292 Fix Issue 5810: Trebuchet: Uighur language
d4f2bc7 Preferences: Grid Size
7e9e415 DoubleNumberPickerPreference
ff27b28 CM Preferences Category
e47c558 Preferences: Auto-rotate screen
82abbd1 AppWidgetResizeFrame: Allow resizing to any size
6cbb4cd Update Copyright
8c2fd4e Preferences: NumberPickerPreference
2a9fb62 Tweak Menu
0564149 Preferences: Resize any widget
26d4b32 Preferences: Hide search bar preference + others
27e6c89 Preferences: initial Preferences Activity, Provider and XML
7dcb25f Rename Launcher to Trebuchet Launcher2 is now Trebuchet application_name removed from localized strings and made un-translatable com.android.launcher is now com.cyanogenmod.trebuchet
ffc2682 Fix NPE
360310b Extend background to full screen.
3c42e11 Merge "Cleaning up unused code" into jb-mr1.1-dev
3c1681d Cleaning up unused code
8784bf6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9df38df Updating wallpaper picker icon to higher res
f8fbfd9 Reconcile with jb-mr1-release - do not merge
348075f merge in jb-mr1-release history after reset to jb-mr1-dev
8ef7f71 am 7774041f: Import translations. DO NOT MERGE
f9b5a4d Trebucher : Added missing French Translation
7774041 Import translations. DO NOT MERGE
209cdc3 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
2a1f2ba merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
9f14503 Trebucher : Added missing French Translation
2fa6994 Update Russian Translation-Trebuchet-CM10 (typo)
3a28950 merge in jb-mr1-release history after reset to jb-mr1-dev
f5baac8 Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Launcher2 into aosp
5bf25ae Merge "Trebuchet: updated romanian translation" into jellybean
c36184a Import translations. DO NOT MERGE
0231227 merge in jb-mr1-release history after reset to jb-mr1-dev
e8f4050 Import translations. DO NOT MERGE
62a27b6 merge in jb-mr1-release history after reset to jb-mr1-dev
36095e8 Merge "Stop animating All Apps during transition to Home" into jb-mr1-dev
bc2f082 Stop animating All Apps during transition to Home
dfbe72b Fix for NPE in showAllAppsCling
7ff8515 Cap launcher swipe animations to max duration
e57e793 Merge "Cap launcher swipe animations to max duration" into jb-mr1-dev
97687ef Cap launcher swipe animations to max duration
9774171 merge in jb-mr1-release history after reset to jb-mr1-dev
8634f84 Merge "Delay ACTION_MAIN processing when not focused." into jb-mr1-dev
853e2a7 Merge "Resize wallpaper assets to avoid runtime resizing" into jb-mr1-dev
8d7d39d Resize wallpaper assets to avoid runtime resizing
83cc923 Trebuchet: updated romanian translation
cb222e8 Delay ACTION_MAIN processing when not focused.
a7835cd merge in jb-mr1-release history after reset to jb-mr1-dev
9dc882b Merge "Get rid of explicit GC requests" into jb-mr1-dev
848a2ba merge in jb-mr1-release history after reset to jb-mr1-dev
ee45139 Import translations. DO NOT MERGE
bf387dc Fix page_hover_left_holo.9.png on all dpi
965c56a merge in jb-mr1-release history after reset to jb-mr1-dev
303f621 Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
381fe4c Adding width / height to cling text style
5b449dc Merge "Bring dummy cling strings back as 'strings'" into jb-mr1-dev
964e2a6 Merge "Fix NPE" into jb-mr1-dev
023c71e Fix NPE
7eed604 Get rid of explicit GC requests
d6dd7c8 Fix NPE
22057fe merge in jb-mr1-release history after reset to jb-mr1-dev
4cd7f28 remove old fashioned dream, no longer supported
41aeb57 Bring dummy cling strings back as 'strings'
eb43960 merge in jb-mr1-release history after reset to jb-mr1-dev
1d4fde6 Send correctly populated Accessibility event on Launcher state change.
e34a213 Add missing layout attributes Bug #7334849
08c0e3c merge in jb-mr1-factory-release history after reset to jb-mr1-dev
0c762a9 merge in jb-mr1-release history after reset to jb-mr1-dev
0c2388a Let's enhance
eabb31b merge in jb-mr1-factory-release history after reset to jb-mr1-dev
5f2aa98 merge in jb-mr1-release history after reset to jb-mr1-dev
0d06152 Merge "Remove unnecessary allocations during draw Bug #7327799" into jb-mr1-dev
dfe0c29 Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
3e40565 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
efd3b17 merge in jb-mr1-release history after reset to jb-mr1-dev
22beb90 Add entries for string resources that appear in clings
260eb9c Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
f371a36 Revert "Import translations. DO NOT MERGE"
f8a49f8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
eeacd56 Remove unnecessary allocations during draw Bug #7327799
a433be7 Merge "Update custom cling params" into jb-mr1-dev
b86d516 Update custom cling params
f72d698 merge in jb-mr1-release history after reset to jb-mr1-dev
5b589a0 Merge "Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)" into jb-mr1-dev
2826bc4 Import translations. DO NOT MERGE
560e161 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
c242ae4 merge in jb-mr1-release history after reset to jb-mr1-dev
2db90f3 Tweaking workspace overscroll effect to prevent clipping icons. (Bug 7267045)
37f9329 merge in jb-mr1-release history after reset to jb-mr1-dev
a113121 Stop using mcc for custom workspace cling on sw600dp devices
98d7bd7 Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev
6c5679e Merge "Fix bug 6886990: cling accessibility" into jb-mr1-dev
ec437d0 Merge "Fix bug 7288630: Folder icons clipped on manta" into jb-mr1-dev
dad6ca7 Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev
e330432 Import translations. DO NOT MERGE
244ebcd Bug 7301303: more rows in all apps for sw720dp-port
dd3a2bd Fix bug 7288630: Folder icons clipped on manta
45355c4 Re-merge "Add support for custom manta cling"
2214313 Fix bug 6886990: cling accessibility
76b33bf merge in jb-mr1-release history after reset to jb-mr1-dev
914d555 Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev
2ebcf50 Revert "Add support for custom manta cling"
b387579 merge in jb-mr1-release history after reset to jb-mr1-dev
b7fbb82 Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev
8d0cd4a Genericize naming of sw720dp wallpapers
8b4d914 Merge "Fix to ensure default widgets get size callbacks (issue 7287744)" into jb-mr1-dev
6e09943 Trebuchet: Added czech translations
aaa5c21 Fix to ensure default widgets get size callbacks (issue 7287744)
cfb57b8 merge in jb-mr1-release history after reset to jb-mr1-dev
68255cb Add support for custom manta cling
28b3e10 Removing db corruption exceptions, logging instead (issue 7112132)
dd70d66 Fix for widgets with config not getting size info (issue 7266053)
fcb4538 merge in jb-mr1-release history after reset to jb-mr1-dev
9586053 Trebuchet: Fix preference casing
a2042d0 Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev
9f4766c merge in jb-mr1-release history after reset to jb-mr1-dev
30e64f5 Fix size of QSB icons in landscape on sw600dp devices
5524b49 Specify workspace resource in preload broadcast
daec1e8 Fix issue where clicking home button caused search icon blip
d98aaae merge in jb-mr1-release history after reset to jb-mr1-dev
db5dd02 Fix issue #7255954: API Review: rename Dream to DreamService
2a8826d merge in jb-mr1-release history after reset to jb-mr1-dev
8401ba2 Trebuchet: Only mark preferences changed when they actually are
b2f0bd4 Fixing typo in Mako resource bucket (Bug 6955380)
41ccfff Merge "Updating launcher layouts (Bug 6955380)" into jb-mr1-dev
411a300 Updating launcher layouts (Bug 6955380)
93333d9 merge in jb-mr1-release history after reset to jb-mr1-dev
b1dfe25 Fix 7223056: Enable scroll indicator on tablets
b0db60d merge in jb-mr1-release history after reset to jb-mr1-dev
37990b4 Fix # 6925851: Workspace page spacing gets messed up
e19bbca Merge "7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest" into jb-mr1-dev
369dd0c 7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest
9d86b97 Launcher: increasing the lower bound and upperbound of loaded pages to avoid stutter in applist scroll
aee3a0e Remove action bar from wallpaper picker
a874dfa Fix shortcut intent when all homescreens are full
dadfb1f Merge "Remove wallpaper offset" into jellybean
b981b44 Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/apps/Launcher2 into aosp
23a4653 merge in jb-mr1-release history after reset to jb-mr1-dev
fa7969f Fix NPE
e5574e0 Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev
b2ae8ac Try to fix RTE when updating shortcuts
c4a9233 Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev
95a556a Remove "fade in" animation for search + voice search.
bdb1030 Removing functionality to click under AllApps to return to the workspace. (Bug 7012020)
be3c59b merge in jb-mr1-release history after reset to jb-mr1-dev
9e05a5e Making launcher use new widget binding APIs
802f16a merge in jb-mr1-release history after reset to jb-mr1-dev
0afbd79 Remove wallpaper offset
671a3a2 Merge "Fixing some warnings" into jb-mr1-dev
da1eae4 merge in jb-mr1-release history after reset to jb-mr1-dev
b43aba1 Merge "New App Icon featuring Cid" into jellybean
8242250 Fixing some warnings
1190487 Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
c08ca67 merge in jb-mr1-release history after reset to jb-mr1-dev
804503c Add user initialing receiver to select a unique wallpaper.
b651ffd Merge "Trebuchet/TR: Initial commit for Turkish" into jellybean
73dfcb1 Fix shortcut intent when using less than 3 homescreens
e798dac Merge "trebuchet: updated finnish translations" into jellybean
e4d056a Trebuchet/TR: Initial commit for Turkish
de00c04 Trebuchet: update romanian translation
6cdc034 Merge "Trebuchet: Simplified Chinese Translations" into jellybean
9459ef7 Merge "Fix for install shortcut intent" into jellybean
c6710ce Merge "Trebuchet: Dutch translations" into jellybean
9cf962b Workaround for generating QSB icon press states. (Bug 7132477)
4cc332a Workaround for generating QSB icon press states. (Bug 7132477)
9a20135 Trebuchet: Simplified Chinese Translations
7fe33a3 Adding more debug code for dup. ItemInfo bug
1daca6e Trebuchet: Updated italian translation
2916af6 Trebuchet: Dutch translations
061e900 Merge "Adding more debug code for dup. ItemInfo bug" into jb-mr1-dev
f1237be merge in jb-mr1-release history after reset to jb-mr1-dev
6323a55 Merge "Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)" into jb-mr1-dev
0c83a5e Fix for install shortcut intent
d37b176 merge in jb-mr1-release history after reset to jb-mr1-dev
7a397e0 Merge "Debug code for bug b/6830207" into jb-mr1-dev
059798a Debug code for bug b/6830207
96610d5 Adding more debug code for dup. ItemInfo bug
e312ae1 Merge "es_ES: Added missing translations" into jellybean
ff7411e Trebuchet: Suggested minor improvements to Danish translation
7a25caf es_ES: Added missing translations
9164b43 Merge "Trebuchet: Fix NPE when rotating" into jellybean
ab310e5 Trebuchet: Fix NPE when rotating
8a43510 Fixing issue where we were not removing items from LauncherModel and only the add-queue. (Bug 7078244)
215b416 Fix an error that is not being expressed
a92dc33 merge in jb-mr1-release history after reset to jb-mr1-dev

   * packages/apps/VideoEditor
6f95463 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/VideoEditor into 1.1
906cf88 Import translations. DO NOT MERGE
19decbf Make the height of title template and transition selection dialog match_parent.
0314b4c Let's enhance
371b419 VideoEditor: Center the buttons instead of using fixed numbers
07ebe49 am e7889d23: (-s ours) Reconcile with jb-mr0-release - do not merge
e7889d2 Reconcile with jb-mr0-release - do not merge
0aa129b Use focal point for scrolling.
863925d Use a local copy of HorizontalScrolllView.
6e45d79 am 98515c8b: am 608edccd: Use focal point for scrolling.
ea79e20 am 86320deb: am 667f5956: Use a local copy of HorizontalScrolllView.
98515c8 am 608edccd: Use focal point for scrolling.
86320de am 667f5956: Use a local copy of HorizontalScrolllView.
608edcc Use focal point for scrolling.
667f595 Use a local copy of HorizontalScrolllView.

   * packages/apps/VoiceDialer
6e1564e es_ES: Fix spanish translation
3847435 VoiceDialer:  Allow App to load if Bluetooth is off
99c1a5d Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/VoiceDialer into HEAD

   * packages/experimental
1e0c48b Fix issue #7255954: API Review: rename Dream to DreamService
c0c316e Sample Dream showing an error message.

   * packages/inputmethods/LatinIME
7aeb6f4 LatinIME: FI translations
e29a747 LatinIME: Afrikaans translations
2408d7c LatinIME: Update German translation
1405458 LatinIME: Simplified Chinese Translations
682d874 LatinIME: NB translation
a2b9a62 LatinIME: refactor in cm_strings.xml
0d0c7e6 Merge "LatinIME: HU translation refactoring" into cm-10.1
91845e0 LatinIME: Fix aapt errors
1faf324 Merge "LatinIME: NL translations" into cm-10.1
18b5ecb LatinIME: HU translation refactoring
2dd7508 Merge "LatinIME: PT-BR update translations" into cm-10.1
9fc0cc0 Merge "Adds æ, ø and å to the 'more keys'-list for Danish locale." into cm-10.1
f1a12f8 Merge "LatinIME: ES translations" into cm-10.1
5fff85d LatinIME: Update italian translation
3b72e37 LatinIME: PT-BR update translations
c259bb8 LatinIME: ES translations
2b392ee LatinIME : FR translation
8a828be LatinIME: NL translations
5974d67 LatinIME: Refactor default translations
5868eb4 LatinIME: EL translations
c409f78 Adds æ, ø and å to the 'more keys'-list for Danish locale.
7f37dd9 LatinIME : add french translation
6069bde LatinIME: add Armenian keyboard layout
6da6ab0 LatinIME: Indonesian translations
6d264a0 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/inputmethods/LatinIME into 1.1
e0b878f Merge "Czech: fixed translation, added missing" into cm-10.1
647adba Add all untracked strings to maketext
2fedc0e Czech: fixed translation, added missing
a1cb665 Add hungarian to spellchecker languages
83ef5c8 Fix for duplication button on russian, belarusian, kyrgyz and ukraine keyboards layout-CM10.1
fe222a8 Fix Russian Keyboard-CM10.1
564aec9 Merge "Fix build warnings" into cm-10.1
f0299bb LatinIME: Add accents to german keyboard
ffd58c3 Merge "LatinIME: Add back double quote functionality to x key" into cm-10.1
7599fd7 Fix build warnings
a610aa2 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
65b7155 LatinIME: Enable spellchecker for additional languages
18d688c Use the amended user dictionary word for insertion
3755775 LatinIME: Add back double quote functionality to x key
7294883 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
5cb40f8 Fix IME settings icons
3448b04 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
cb1077b Merge "Match RU dictionary header." into jb-mr1.1-dev
240383f Merge "Update the dictionaries" into jb-mr1.1-dev
ceb6d48 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
4d64525 Match RU dictionary header.
526371f Update the dictionaries
7d04582 Request update shift state after shift-chording input
cdbf6fb Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
f732f4d Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
c9349db Merge "Add a constant for S_INT_MIN" into jb-mr1.1-dev
592f2b3 Add a constant for S_INT_MIN
ec60d60 Only add spaces automatically when appropriate.
c5653da Correctly add double quote to the space strippers
1cac9c1 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/inputmethods/LatinIME into mr1
fd1267e Add Spanish United States keyboard (DO NOT MERGE)
f5a194b Revert "Correctly add double quote to the space strippers"
06993cb Revert "Only add spaces automatically when appropriate."
66cee1f Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
86e5547 Revert "Correctly add double quote to the space strippers"
f9ff4fb Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev
5986931 Revert "Only add spaces automatically when appropriate."
191d49a Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev
6ce66d1 Only add spaces automatically when appropriate.
187e683 Merge "Fix a bug with some text fields" into jb-mr1.1-dev
e4958d5 Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
b240c38 Merge "[DO NOT MERGE] Correct a wrong base character in Russian" into jb-mr1.1-dev
929bfdd Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev
4826c3f Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev
aef0acd DO NOT MERGE - Fix an error in the base char table for LETTER L WITH STROKE
d0725a6 Update shift state only when input field is restarted
d62be28 Fix language switch key behavior (DO NOT MERGE)
f1d0b2b [DO NOT MERGE] Correct a wrong base character in Russian
af7264a Correctly add double quote to the space strippers
00c0010 Fix a bug with some text fields
7648b37 Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev
5c32b6d Make sure all FDs are correctly closed.
fac619a Merge "Don't restrict reset composing state to non-identical setText" into jb-mr1.1-dev
0e84041 Refactor all phantom-space-inserted spaces in one place
61cc2a3 Don't restrict reset composing state to non-identical setText
d53042e LatinIME:  Fix Italian strings for Auto correction settings
bc43e3f Reconcile with jb-mr1-release - do not merge
be07aad merge in jb-mr1-release history after reset to jb-mr1-dev
9cc22c4 am 5d2556b9: Reset the IME if requested by the app.
202c3a5 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
5d2556b Reset the IME if requested by the app.
c452ca4 Make keyboard hints a better visible
d5aecce Rupee Symbol in more keys of currencies. added unicode indian rupee symbol.
cbbfb47 merge in jb-mr1-release history after reset to jb-mr1-dev
60dea36 Assuming that NO_EXTRACT_UI mode is NO_FULSCREEN
134712d LatinIME: Apply "Enable more keys for top row on tablets" (f6620308ba) and "Add "more" keys to ALL the keys" (c561f31af9) to slavik layouts.
befa8fd Bring back productivity for QWERTZ keyboards
99a8169 merge in jb-mr1-release history after reset to jb-mr1-dev
306e0a8 Update AOSP dictionaries.
9f97ced merge in jb-mr1-release history after reset to jb-mr1-dev
f960eb1 Don't put spaces after characters that don't take one
95b4d7e LatinIME: Add accents to german keyboard
89b4a66 merge in jb-mr1-release history after reset to jb-mr1-dev
65225d8 Merge "Update AOSP dictionaries." into jb-mr1-dev
d03e065 Don't consider non-words for split word suggestion
3d83a16 Update AOSP dictionaries.
2dd5550 merge in jb-mr1-release history after reset to jb-mr1-dev
dbba676 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
1514258 Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
e91d495 Have "no whitespace before cursor" upon gesture trigger phantom space
c0bc336 Merge "Fix more suggestions text width calculation" into jb-mr1-dev
0cbc19b Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
97903bf Import translations. DO NOT MERGE
d631778 Restrict bogus move event detector to a horizontal movement
bdc8b9e Fix more suggestions text width calculation
6686e63 Honor automatic shift turned off for gestures
8fa3c6d merge in jb-mr1-factory-release history after reset to jb-mr1-dev
1e0255d merge in jb-mr1-release history after reset to jb-mr1-dev
de87b4d merge in jb-mr1-factory-release history after reset to jb-mr1-dev
c1bcb8e Let's enhance
ae3bb5e merge in jb-mr1-release history after reset to jb-mr1-dev
cecad3c merge in jb-mr1-factory-release history after reset to jb-mr1-dev
ac2a154 Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev
b095288 Detect bogus down-move-up event and add workaround
4d24838 merge in jb-mr1-release history after reset to jb-mr1-dev
2220aee Merge "Put temporary files under a separate directory." into jb-mr1-dev
e1bd1b5 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
be1162f merge in jb-mr1-release history after reset to jb-mr1-dev
66c90cd Put temporary files under a separate directory.
9d42353 Merge "Don't cancel long press timer too early" into jb-mr1-dev
c9ba269 Don't cancel long press timer too early
7c8f4a0 Import translations. DO NOT MERGE
0d5fa44 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
b1cd6e2 merge in jb-mr1-release history after reset to jb-mr1-dev
f9001d2 merge in jb-mr1-release history after reset to jb-mr1-dev
c822c89 merge in jb-mr1-release history after reset to jb-mr1-dev
5bc00e9 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/inputmethods/LatinIME into aosp-merge
471252b Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev
dc38a34 Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev
b49b094 merge in jb-mr1-release history after reset to jb-mr1-dev
516f9d6 Fix a bug in multiple shortcut handling code.
99b84b4 Use a freq of 1 instead of 0 for non-word shortcuts.
7a17c1f Tuning gesture detection parameters
2e3f261 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c561f31 latinime: Add "more" keys to ALL the keys
5f994e5 merge in jb-mr1-release history after reset to jb-mr1-dev
052b162 Merge "Add separate key hysteresis distance for sliding modifier input" into jb-mr1-dev
f731eb1 Add separate key hysteresis distance for sliding modifier input
792980d Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
d528f4c Import translations. DO NOT MERGE
5b2a5cf merge in jb-mr1-release history after reset to jb-mr1-dev
448e732 Follow up change for  I5f166a738f6e84a1b807be
78fe885 Merge "Fix addtional proximity correction" into jb-mr1-dev
441b3e5 Fix addtional proximity correction
3623b97 Fix detecting fast typing algorithm and parameter
4580b7e Merge "Move gesture detection and recognition paramters to resources" into jb-mr1-dev
80bcb99 Move gesture detection and recognition paramters to resources
47417ec Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
49d301e Add notice for Lexiteria dictionaries.
20f07e3 Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev
09fbd2c Import translations. DO NOT MERGE
28989ac Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
6e45a8c merge in jb-mr1-release history after reset to jb-mr1-dev
3f7fe82 Merge "Always consider a new line the start of a sentence" into jb-mr1-dev
2699b45 Always consider a new line the start of a sentence
b24cda3 Fix the Danish dictionary
c157264 Unlink an old file before moving the new file over it
4b58e20 Merge "LatinIME:Add Numbers to Hebrew keyboard" into jellybean
a1f2e4a Merge "LatinIME: Add missing ukrainian letters." into jellybean
a65a069 Import translations. DO NOT MERGE
01d9b1f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
da74af9 merge in jb-mr1-release history after reset to jb-mr1-dev
5d11ec4 Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev
a449428 Update the AOSP dictionaries for the 0-freq review
1fd10ea Merge "Throw illegal argument exception in BinaryDictionary::editDistance" into jb-mr1-dev
66d955a Throw illegal argument exception in BinaryDictionary::editDistance
d445b56 Fix possible NPE caused while monkey test
7a24a24 Import translations. DO NOT MERGE
d8e0375 merge in jb-mr1-release history after reset to jb-mr1-dev
15281ad Show gesture floating preview text by default
ba0220f LatinIME:Add Numbers to Hebrew keyboard
d80fd30 Import translations. DO NOT MERGE
541b994 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
5479212 merge in jb-mr1-release history after reset to jb-mr1-dev
574b80a Remove debug prints.
8722e0e merge in jb-mr1-release history after reset to jb-mr1-dev
1c2853f Import translations. DO NOT MERGE
58598e0 merge in jb-mr1-release history after reset to jb-mr1-dev
6052a81 Merge "Fix gesture detection algorithm" into jb-mr1-dev
58fe5a4 Fix gesture detection algorithm
a090ca5 LatinIME: Add missing ukrainian letters.
c8f2529 Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev
29d2d48 Temporarily suppress key popup preview after gesture input
ad6b493 Merge "Remove dead code for disabling gesture input after fast typing" into jb-mr1-dev
bf538ab Remove dead code for disabling gesture input after fast typing
587ab41 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
cf85160 Import translations. DO NOT MERGE
7a7d117 Ignore the broken file.
a36c595 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
c179aed merge in jb-mr1-release history after reset to jb-mr1-dev
6e5c2db Merge "Cleanups in LatinIME native source code" into jb-mr1-dev
5150e15 Cleanups in LatinIME native source code
a28a05e Cleanup: Make some classes as final
1775201 Calculate default touch position correction data for keys on 4th row
4d1f3d1 Merge "Make gestures work correctly on keyboards with accented keys" into jb-mr1-dev
84d858e Use BinaryDictInputOutput to save UserHistoryDictionary.
855c009 Import translations. DO NOT MERGE
7270fd0 merge in jb-mr1-release history after reset to jb-mr1-dev
c0a1dc0 Merge "Draw gesture trail that is above the keyboard" into jb-mr1-dev
157fe98 Draw gesture trail that is above the keyboard
2aea34f Add updateParentAddress.
2ee7080 Add moved char groups.
002a502 Merge "Update keyboard settings wording" into jb-mr1-dev
1c820c4 Merge "Don't cancel gesture trail update drawing" into jb-mr1-dev
1354910 Merge "Postpone gesture start detection on non-letter key" into jb-mr1-dev
1645902 Postpone gesture start detection on non-letter key
936371e Don't cancel gesture trail update drawing
edbf6b7 Merge "Fix lower case conversion bug for some characters" into jb-mr1-dev
f34ec5a Make gestures work correctly on keyboards with accented keys
edd5b73 Fix lower case conversion bug for some characters
9458e71 Update keyboard settings wording
270c0de Import translations. DO NOT MERGE
1dac2ff merge in jb-mr1-release history after reset to jb-mr1-dev
a161bda add capacity to FusionDictionaryBufferInterface.
35ffb90 Merge "Make getTerminalPosition read linked-list nodes." into jb-mr1-dev
93d7c62 Make getTerminalPosition read linked-list nodes.
630d9c9 Introduce typing aware gesture detection
d66f1a4 Merge "nl-rBE keyboard layout" into jellybean
10d76cd Merge "Fix touch position correction data passing" into jb-mr1-dev
6ca50d9 Fix touch position correction data passing
fa1b95c Merge "Make children addresses and parent addresses use signed addresses." into jb-mr1-dev
4d75fe9 FIX: Wrong way to gesture speed calculation.
8ec0064 Make children addresses and parent addresses use signed addresses.
089c7d4 Merge "Use touch position correction in the geometric input" into jb-mr1-dev
0d4d109 Import translations. DO NOT MERGE
20f75d2 Merge branch 'jb-release' of https://android.googlesource.com/platform/packages/inputmethods/LatinIME into aosp
ad3e50e am 886784f0: (-s ours) Reconcile with jb-mr0-release - do not merge
886784f Reconcile with jb-mr0-release - do not merge
3262c33 merge in jb-mr1-release history after reset to jb-mr1-dev
0edab9d Use touch position correction in the geometric input
0eef4b1 Merge "Add suggestion span upon starting a gesture." into jb-mr1-dev
6a58bb7 Add suggestion span upon starting a gesture.
2866106 Using relative speed instead of duration rate for gesture input distance calculation.
88985bf Merge "Fix a bug where the cursor pos wouldn't be tracked correctly" into jb-mr1-dev
72c5d32 Fix a bug where the cursor pos wouldn't be tracked correctly
d3fabe7 Merge "Set punctuation suggestions at start if activated" into jb-mr1-dev
6efe788 Set punctuation suggestions at start if activated
b760591 Merge "Second finger can start gesture input" into jb-mr1-dev
65ef260 Merge "Fix a race condition with shift" into jb-mr1-dev
b305e67 Second finger can start gesture input
fff8613 Fix a race condition with shift
1e974de Merge "Disable gesture input while fast typing" into jb-mr1-dev
5274a4a Merge "Combine mHasParentAddress with mHasLinkedListNode into mSupportsDynamicUpdate." into jb-mr1-dev
82d9dea Combine mHasParentAddress with mHasLinkedListNode into mSupportsDynamicUpdate.
9f09c6f Disable gesture input while fast typing
24da43c Merge "Use all Lexiteria sources and update existing directories." into jb-mr1-dev
8acb881 Add subtypeId to nl_BE
ed72e6f nl-rBE keyboard layout
1ac6c3a merge in jb-mr1-release history after reset to jb-mr1-dev
c565eeb DO NOT MERGE: Clear cache of the user dictionary when a word is added
08d7f2f resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603
c613f1e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
74043b1 merge in jb-mr1-release history after reset to jb-mr1-dev
d0cf964 Use all Lexiteria sources and update existing directories.
3088e0c Merge "Fix gesture start detection algorithm" into jb-mr1-dev
02a6720 Fix gesture start detection algorithm
8ae8c76 Cleanup settings
b1fbd69 am 4a80d413: am ca8af4ee: Merge "nl-rBE keyboard layout"
4a80d41 am ca8af4ee: Merge "nl-rBE keyboard layout"
66597f5 Add deleteWord.
ca8af4e Merge "nl-rBE keyboard layout"
546133d Import translations. DO NOT MERGE
b845ce4 merge in jb-mr1-release history after reset to jb-mr1-dev
73779f7 Make readUnigramsAndBigramsBinary read linked-list nodes.
5471753 Merge "Add getTerminalPosition." into jb-mr1-dev
81d2e93 Merge "Fix stuck gesture floatin preview text" into jb-mr1-dev
61dcaaf Use device independent parameter for gesture
77bcd6b Fix stuck gesture floatin preview text
d36245f Add getTerminalPosition.
84c1bbd Merge "Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStroke" into jb-mr1-dev
49d080f Merge "Auto correct on gesture when typed word is 1 char long" into jb-mr1-dev
b4e74cf Auto correct on gesture when typed word is 1 char long
f80f09c Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStroke
430eed6 am f5becbcd: (-s ours) am f1e13f1f: DO NOT MERGE: Clear cache of the user dictionary when a word is added
f5becbc am f1e13f1f: DO NOT MERGE: Clear cache of the user dictionary when a word is added
a0ac9cc Merge "Use normal font for Hindi keyboard" into jb-mr1-dev
f1e13f1 DO NOT MERGE: Clear cache of the user dictionary when a word is added
511218a Merge "Refine gesture point duration calcuation to be more localized" into jb-mr1-dev
bfcd2b3 Merge "Change to "Show language switch key" option" into jb-mr1-dev
cce6f9e Use normal font for Hindi keyboard
1a4aa7e Change to "Show language switch key" option
f1ee564 Smaller gesture preview trail
331a5e7 mako: adjust default keybpress vibration
a811938 Refine gesture point duration calcuation to be more localized
8ca1643 merge in jb-mr1-release history after reset to jb-mr1-dev
01a5a7d Merge "Clear cache of user dic" into jb-mr1-dev
17f7b40 Clear cache of user dic
c7dc673 Use Path to draw gesture preview trail
567204a Merge "Show gesture floating preview text is off by default" into jb-mr1-dev
4f8e451 Show gesture floating preview text is off by default
caf15c3 Merge "Fix a bug that would persist caps lock state" into jb-mr1-dev
8eb2065 Merge "Log for geometric input" into jb-mr1-dev
ad0642c Fix a bug that would persist caps lock state
87cecf7 Log for geometric input
63dd5b4 Merge "Simplify distance calculating method for gesture input." into jb-mr1-dev
a8dc30e Merge "Remove hack algorithm from GestureStroke" into jb-mr1-dev
f501e4d Remove hack algorithm from GestureStroke
41f12ee Simplify distance calculating method for gesture input.
65feee1 Make BinaryDictIOUtils.
c2fdf0d Make readNode read linked list nodes.
8336d33 nl-rBE keyboard layout
a149c53 add limit to FusionDictionaryBufferInterface.
a0ebb28 Merge "Fix a bug with capitalizations (A15)" into jb-mr1-dev
3bf113f Merge "Mark 2 resolved TODOS as such (A14)" into jb-mr1-dev
c992343 Merge "Support the gesture + phantom space case (A13)" into jb-mr1-dev
246d227 Fix offdevice full debug build crash
c041d24 merge in jb-mr1-release history after reset to jb-mr1-dev
b686df1 Add a new flag for linked list nodes.
bf45dc4 Make writePlacedNode write the linked-list node.
061d225 Add a new option to FormatOptions.
e55785e New flag for the internal settings
2040090 Merge "Log touch timing" into jb-mr1-dev
f8b35b9 Log touch timing
75b3f81 Fix a bug with capitalizations (A15)
e4783f9 Mark 2 resolved TODOS as such (A14)
d461bfd Support the gesture + phantom space case (A13)
717d493 Merge "Remove useless code (A12)" into jb-mr1-dev
ed47131 Merge "Fix a bug with surrogate characters" into jb-mr1-dev
6c721b5 Fix a bug with surrogate characters
b128b1c Merge "Take space state into account for caps (A11)" into jb-mr1-dev
5822323 Remove useless code (A12)
90a9127 Take space state into account for caps (A11)
8adc015 Remove populateOptions(final ByteBuffer buffer).
65e4970 Fix hackCanUseDictionaryFile.
91dad5d merge in jb-mr1-release history after reset to jb-mr1-dev
764dd71 Stop using GNU extension in-class initializer for non-integral members
76070cb merge in jb-mr1-release history after reset to jb-mr1-dev
03dc8fe Use more int values in ProximityInfoState::getPointScore()
252da38 Take locale into account for caps (A10)
da8aca6 Merge "Fix comment warnings (A9)" into jb-mr1-dev
32c8704 Merge "Remove an unused function (A8)" into jb-mr1-dev
5cb9b70 Merge "Fix abbreviations processing for English (A7)" into jb-mr1-dev
a3f06ba Merge "Do not auto-correct upon starting a gesture." into jb-mr1-dev
6e65ff8 Fix comment warnings (A9)
50e61b8 Remove an unused function (A8)
2c0d916 Fix abbreviations processing for English (A7)
b29efec Merge "Fix a bug with open parens and some other chars" into jb-mr1-dev
7e4ad33 Fix a bug with open parens and some other chars
47684fb Merge "Using isSkippableChar instead of '\'' and '-'." into jb-mr1-dev
e8db06f Merge "Replace immediate values with named constants for characters (A6)" into jb-mr1-dev
371e7d7 Merge "Make the arrobase sign a space stripper." into jb-mr1-dev
d806065 Merge "Simplification again (A5)" into jb-mr1-dev
f035649 Asynchronously look up dictionary for gesture input
1cd7ca9 Using isSkippableChar instead of '\'' and '-'.
eda0965 Do not auto-correct upon starting a gesture.
8d35b20 Make the arrobase sign a space stripper.
35dc8cf Replace immediate values with named constants for characters (A6)
e94c276 Simplification again (A5)
6f8dfd9 Simplify the code some more (A4)
33a226f Merge "Small simplification (A3)" into jb-mr1-dev
c869a22 Merge "Don't show gesture preview trail while detecting gesture input" into jb-mr1-dev
9c5d165 Don't show gesture preview trail while detecting gesture input
cc958dd Refactor BinaryDictInputOutput.
568fb60 merge in jb-mr1-release history after reset to jb-mr1-dev
5fbe376 Small simplification (A3)
d7fdc73 Merge "Simplify a call, and add comments (A2)" into jb-mr1-dev
50f0388 Merge "Fix gesture floating preview on up event" into jb-mr1-dev
350fab6 Fix gesture floating preview on up event
3d54e1c Simplify a call, and add comments (A2)
2427f57 Merge "Import TextUtils.getCapsMode to fix it internally (A1)" into jb-mr1-dev
737e915 Merge "Show gesture floating preview text at oldest finger" into jb-mr1-dev
3787289 Merge "Make onUpdateSelection much more resilient to race conditions." into jb-mr1-dev
0e301bd Merge "Generalize incremental recognition to non-Latin languages" into jb-mr1-dev
f8986ac Merge "Add tests for BinaryDictInputOutput." into jb-mr1-dev
f0e8304 Show gesture floating preview text at oldest finger
7e35841 Add tests for BinaryDictInputOutput.
9d1c73f Import TextUtils.getCapsMode to fix it internally (A1)
5ed8845 Make onUpdateSelection much more resilient to race conditions.
71fcf0f Assign subtypes' hashCode value as its subtypeId
9144eec Merge "Add boolean resource isDefault=true for all supported locales" into jb-mr1-dev
328755e Merge "Move FormatOptions and FileHeader to FormatSpec." into jb-mr1-dev
1a34772 Move FormatOptions and FileHeader to FormatSpec.
82902e7 Add boolean resource isDefault=true for all supported locales
9deb52c Merge "Cosmetic change to remove trailing space" into jb-mr1-dev
c54614d Cosmetic change to remove trailing space
f4554d8 Fix an issue on FP calculation diff of osx and linux
81d97ee Move constants and comments.
1321685 Generalize incremental recognition to non-Latin languages
b9c288c merge in jb-mr1-release history after reset to jb-mr1-dev
18fc3bf Merge "Make Latin IME aware of its surrounding text." into jb-mr1-dev
57e9511 Merge "Use offscreen bitmap buffer to draw gesture preview trail" into jb-mr1-dev
28d765e Make Latin IME aware of its surrounding text.
9ad4b2a Use offscreen bitmap buffer to draw gesture preview trail
8d031a6 Add put method to FusionDictionaryBufferInterface.
9182daf Output detailed log in ProximityInfoState
64c65ce Add missing MoreKeySpec.hashCode
655be14 Merge "When Accessibility is on, intercept touch events during dispatch." into jb-mr1-dev
e30c4e0 Stabilize gesture recognition algorithm that looks for the nearest key.
b0c693d Merge "Stop auto-correcting non-whitelisted one-char strings" into jb-mr1-dev
8c06a46 Stop auto-correcting non-whitelisted one-char strings
040f1c5 Merge "Debug flag" into jb-mr1-dev
952ec49 Debug flag
41c2765 Remove an unused file.
dc2ee77 When Accessibility is on, intercept touch events during dispatch.
e09b15f merge in jb-mr1-release history after reset to jb-mr1-dev
2935276 Merge "Add debug utils for geometric input" into jb-mr1-dev
d45c0fa Add debug utils for geometric input
c80b3a2 Merge "Add DEBUG_GEO_FULL flag" into jb-mr1-dev
23a57ea Add DEBUG_GEO_FULL flag
32e85fd Merge "Have makedict support the new file format." into jb-mr1-dev
debe3b4 Have makedict support the new file format.
8223086 Merge "Variable type cleanups" into jb-mr1-dev
5964d4e Variable type cleanups
9a7e02d Merge "Add new binary dictionary format." into jb-mr1-dev
14faf7a Merge "Fix backtrace tool" into jb-mr1-dev
e55b644 Add new binary dictionary format.
60af4f0 Fix dicttool_aosp build
1c8fc83 Fix backtrace tool
eae7b29 Check the length of the word when add to FusionDictionary.
1370e63 merge in jb-mr1-release history after reset to jb-mr1-dev
096f35f Fix the condition of continuation for gesture input and make ProximityInfoState incremental.
b922da8 Merge "Fix bimanual gesture preview trail" into jb-mr1-dev
f117f77 Fix bimanual gesture preview trail
b85df9d Merge "Fix bug of sampling and become to save corner points for geometric input." into jb-mr1-dev
aba26e4 Fix bug of sampling and become to save corner points for geometric input.
7914e90 Add comments for meaningless lines
389b986 Android Keyboard: Updated italian translation
3ef13f7 merge in jb-mr1-release history after reset to jb-mr1-dev
3051966 Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev
3811a28 The processNextKey becomes to use actual average duration.
3518ed6 Merge "Fix one-off bugs reported by Valgrind" into jb-mr1-dev
3069e22 Merge "Add tests for readDictionaryBinary with byte array." into jb-mr1-dev
18ebba3 Fix one-off bugs reported by Valgrind
be5db53 Add tests for readDictionaryBinary with byte array.
a47a17a Merge "Revise gesture preview trail design" into jb-mr1-dev
c1780c1 Revise gesture preview trail design
fc9ea5b Merge "Refactor BinaryDictIOTests." into jb-mr1-dev
f76bb32 Merge "Check shortcuts in checkDictionary." into jb-mr1-dev
13b85c4 Refactor BinaryDictIOTests.
6e422af Check shortcuts in checkDictionary.
15496ec Merge "Revise gesture floating preview design" into jb-mr1-dev
71e2e81 Revise gesture floating preview design
aa7cc7b Merge "Cosmetic cleanup" into jb-mr1-dev
6fbb8ed Merge "add logging code" into jb-mr1-dev
1093952 Merge "ResearchLogging do not even show basic data for password fields" into jb-mr1-dev
625cfe3 Merge "ResearchLog uploadingService now waits for logging to finish" into jb-mr1-dev
d3a9b70 Cosmetic cleanup
6929a3a merge in jb-mr1-release history after reset to jb-mr1-dev
8a599c4 Merge "Utilize StateListDrawable for key preview background" into jb-mr1-dev
e8c6d5a Utilize StateListDrawable for key preview background
cde005c Fix apostrophe issue
2a2b5ed Change BinaryDictIOTests's package.
83dfe0f Add FormatOptions.
8c220a0 Fix bug that can cause unexpected off-keyboard chars to appear as suggestions.
fe05b88 add logging code
5969114 ResearchLogging do not even show basic data for password fields
1711405 ResearchLog uploadingService now waits for logging to finish
58bb1d7 Merge "Fix variable type" into jb-mr1-dev
23c3562 merge in jb-mr1-release history after reset to jb-mr1-dev
d86d313 Fix variable type
ac25fca Display punctuation suggestions on cursor move
2e4713a Merge "Check the length of the word when add to userhistory." into jb-mr1-dev
613aab2 Merge "Use string-array resource to define predefined-subtypes" into jb-mr1-dev
4989428 Merge "Add a preliminary test for basic Russian spell check" into jb-mr1-dev
c61bed6 Add a preliminary test for basic Russian spell check
1b11da1 Merge "Add a first test for the spell checker" into jb-mr1-dev
2ecf625 Merge "Restricting children for gesture input." into jb-mr1-dev
5d96585 Add a first test for the spell checker
8483312 Use string-array resource to define predefined-subtypes
95a49a5 Restricting children for gesture input.
147a62a Merge "Reduce amount of empty space in which keypresses are detected" into jb-mr1-dev
3f00c61 Reduce amount of empty space in which keypresses are detected
dd435b3 Check the length of the word when add to userhistory.
d34dd5b Merge "Cosmetic fixes and a bug fix in UnigramDictionary::testCharGroupForContinuedLikeness()." into jb-mr1-dev
f278981 Cosmetic fixes and a bug fix in UnigramDictionary::testCharGroupForContinuedLikeness().
2c0c1cc Merge "Fix key info reported by keyboard accessibility node provider." into jb-mr1-dev
f7f8709 merge in jb-mr1-release history after reset to jb-mr1-dev
1a397ec Merge "Add backtrace tool" into jb-mr1-dev
5540acb Add backtrace tool
720e105 Merge "Consolidate Esperanto layout into Spanish layout" into jb-mr1-dev
9357ceb Merge "Smart sampling for geometric inputs." into jb-mr1-dev
d9c10b1 Smart sampling for geometric inputs.
eceea87 Consolidate Esperanto layout into Spanish layout
ab5f953 Use 5-row layout for Thai phone keybopard
8624a0a Use normal font for Thai
8251036 Match calls in I8a70e43b for Icbe60bdf
2035b94 Merge "Reinstate the shortcut-only attribute" into jb-mr1-dev
70226f2 Merge "LatinIME: Missing Danish translation" into jellybean
27c093f am 70fb1d1a: am f0adce8a: Merge "Esperanto keyboard"
70fb1d1 am f0adce8a: Merge "Esperanto keyboard"
f0adce8 Merge "Esperanto keyboard"
72b1c93 Reinstate the shortcut-only attribute
a643b54 Add missing KeyDrawParams default constructor to fix build
aa54607 Merge "Support per-Key and per-Keyboard key visual attributes" into jb-mr1-dev
dc34da2 Support per-Key and per-Keyboard key visual attributes
67d0a59 Merge "Use resource to specify 5-rows keyboard parameters" into jb-mr1-dev
74b89db Merge "Fix key label padding" into jb-mr1-dev
36b5f4a Fix key label padding
518838b Use resource to specify 5-rows keyboard parameters
9d05f36 Use normal font for Arabic and Farsi
666a433 add UserHistoryDictIOUtils.
9bbc7ec Merge changes Ifb983c35,I0b947421 into jb-mr1-dev
48643b08 Merge "add readUnigramsAndBigramsBinary." into jb-mr1-dev
25405ea ResearchLogger clean up splash screen
58eb4d9 ResearchLogger no longer offers option to disable logging
b2a43a2 add readUnigramsAndBigramsBinary.
71b52a8 Move key label padding attributes back to KeyboardView
f645ecf merge in jb-mr1-release history after reset to jb-mr1-dev
49d8af8 Separate inner classes of KeyboardView out under internal package
749cc18 Move some key top visual attributes from KeyboardView to Key
3ed057a Esperanto keyboard
35ff945 Separate inner classes of keyboard package out under internal package
ded498d Merge "add readHeader." into jb-mr1-dev
62ed901 add readHeader.
5ad47f0 Merge "Fix a bug giving broken characters" into jb-mr1-dev
29d5973 Optimize rare Key attributes to separate class
61bc66b Revert "Revert "Fix key letter size of 5-rows Thai keyboard""
b590d69 Merge "Revert "Revert "Move resource related methods to ResourceUtils""" into jb-mr1-dev
d2a81ab Merge "Add FusionDictionaryBufferInterface." into jb-mr1-dev
85cb45c Merge "Add defaults for manta" into jb-mr1-dev
26b424b Fix key info reported by keyboard accessibility node provider.
3b54385 Add defaults for manta
4163eca merge in jb-mr1-release history after reset to jb-mr1-dev
9282161 Revert "Revert "Move resource related methods to ResourceUtils""
cc6ddb0 Merge "Revert "Move resource related methods to ResourceUtils"" into jb-mr1-dev
bfc02a7 Revert "Move resource related methods to ResourceUtils"
7a5ca99 Revert "Fix key letter size of 5-rows Thai keyboard"
07aea40 Fix a bug giving broken characters
f5c4ff4 Add FusionDictionaryBufferInterface.
ac621d1 Fix key letter size of 5-rows Thai keyboard

   * packages/inputmethods/PinyinIME
a08d08c Merge "PinyinIME crashed in userdebug version"
89b07ea PinyinIME crashed in userdebug version

   * packages/providers/ApplicationsProvider
0b55005 Czech: merge from GB
7edd1b6 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/ApplicationsProvider into HEAD
f4c7588 Fix searchable icon for search app.

   * packages/providers/CalendarProvider
c3ad288 calendar: Privacy Guard support
cb9ff02 Czech: small fixes
49b7d3c Fix race condition for missing alerts after boot up.
65dd538 am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not merge
1687164 Reconcile with jb-mr0-release - do not merge
485a184 Fix event color query (which fixes the failing CTS test).
d2e4cb0 am f4b1756f: Fix event color query (which fixes the failing CTS test).
f4b1756 Fix event color query (which fixes the failing CTS test).
b557005 Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-dev
a7c3f32 Fix possible NPE in runScheduleNextAlarm.
501e60b Adding new column 'uid2445' to Events table to support future handling of ical/ics format.
b2695bf Add some columns

   * packages/providers/ContactsProvider
6e992cf Use MemoryCursor code in framework.
1fe9d60 contacts: Privacy Guard support
e5adf1f Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into 1.1
f0fdf30 Czech: fixed translation
2fdccd6 ContactsProvider : Add new projection columns for contact
dacd5de Change default sort order for email queries.
a465c9d Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into HEAD
f5c0020 Rebuild SQLITE_STAT1 table after drop operations.
17f1fe1 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
e5cf9b3 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/providers/ContactsProvider into aosp-merge
29f419a merge in jb-mr1-release history after reset to jb-mr1-dev
d2f6ad6 Make sure to rebuild search index on locale changes...
0472522 merge in jb-mr1-release history after reset to jb-mr1-dev
9ff2587 Make sure to invalidate fast index cache when
468e39e merge in jb-mr1-release history after reset to jb-mr1-dev
7b4a5d5 Remove Secure setting usage.
59eb0c6 merge in jb-mr1-release history after reset to jb-mr1-dev
2b7c28c Merge "Send a broadcast when profile changes" into jb-mr1-dev
a6f9ec0 Skip suffix match if mUseStrictPhoneNumberComparison is true
0bdbe75 Send a broadcast when profile changes
6db6c6d Change fallback method  for contact matching
1a2ef0f ContactsProvider: Dutch translations

   * packages/providers/DownloadProvider
459fc32 Fix download notification click behaviour.
58fe9af Open images with content://media/ instead of content://downloads/ URI.
c150c8d Czech: fixed translation
f41085f Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/providers/DownloadProvider into 1.1
b0bb182 Cancel stale notifications when starting.
1d71eb6 Import translations. DO NOT MERGE
99de1b6 Import translations. DO NOT MERGE
5f956af Import translations. DO NOT MERGE
0daff11 Import translations. DO NOT MERGE
e495c97 Merge "Improve download remaining time calculation." into jb-mr1.1-dev
fec5f50 Improve download remaining time calculation.
8ec8bde Merge "Update extras for in-progress download." into jb-mr1.1-dev
f818eec Update extras for in-progress download.
d912ebe Import translations. DO NOT MERGE
65ab05d Import translations. DO NOT MERGE
892ed77 Import translations. DO NOT MERGE
516f77f Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/DownloadProvider into HEAD
53948fb Import translations. DO NOT MERGE
253e36a Merge "Show remaining time in download notifications." into jb-mr1.1-dev
52b703c Show remaining time in download notifications.
a8e93e6 Import translations. DO NOT MERGE
a40a349 Rewrite of download notifications.
2fa007e Better sanity checking for finished downloads.
169ab53 Bring back DRM mimetypes.
7444bae Let's enhance
70b5c30 Skip scanning a file which will be deleted.
b92aa3a Handle not fully connected networks.
f161f8b Merge "Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent." into jb-mr1-dev
46bb7dd Send uid of the application that initiated the download
a2304fb Remove FLAG_ACTIVITY_NEW_TASK from the VIEW intent.
14991c6 Properly dispatch checkbox toggling Bug #6995003

   * packages/providers/DrmProvider
4ceef45 Czech: merge from GB
4dcc7ea Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/DrmProvider into HEAD

   * packages/providers/MediaProvider
b4fe429 Merge "MediaProvider: get UUID of removable volumes for non-FAT filesystems" into cm-10.1
afb5a28 MediaProvider: Allow scan for directories
df019ae MediaProvider: get UUID of removable volumes for non-FAT filesystems
4564f44 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/MediaProvider into HEAD
0ac6e4e merge in jb-mr1-release history after reset to jb-mr1-dev
81befca Ack, scanner doesn't take volume paths.
0d65afa merge in jb-mr1-release history after reset to jb-mr1-dev
5c18164 MediaScanner: Don't delete entries of secondary storage on shutdown
9bc0e81 Update bucket_display_list and bucket_id columns when renaming directories via MTP
6d1fac3 Merge "Update buckets after path changes." into jb-mr1-dev
8bd4260 Update buckets after path changes.
6896d29 merge in jb-mr1-release history after reset to jb-mr1-dev
f58f4b9 Merge "Multi-user MTP, handle secondary user boot." into jb-mr1-dev
8efd65f Multi-user MTP, handle secondary user boot.
704fe6b Make sure file paths are canonical in scanFile()
2a99744 merge in jb-mr1-release history after reset to jb-mr1-dev
57b65f1 Leave trigger intact during upgrade.
0071500 merge in jb-mr1-release history after reset to jb-mr1-dev
395ad25 Include user identifier in external storage paths.
4a7bf68 Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)

   * packages/providers/TelephonyProvider
0f829fe Improve delete handling code.
6cea074 Store phone blacklist in content provider (2/4)
60511cf telephony: Privacy Guard support
330e81b Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/providers/TelephonyProvider into 1.1
73583f0 Czech: fixed translation
68575a6 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/TelephonyProvider into HEAD
15156cd App crashed as it was moving to foreground and message was received
1a45ce5 Empty draft created on deleting a group MMS message
9052dc2 Let's enhance
842e311 SMS delete behavior odd
49c9ede Old thumbnail shown
f88d1d6 Group MMS flickers between white square and received message when initially checking

   * packages/providers/UserDictionaryProvider
a8d15d3 UserDictionaryProvider: Indonesian translations
58cb987 Czech: added translation
cc76658 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/providers/UserDictionaryProvider into HEAD

   * packages/screensavers/Basic
bf8a398 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/screensavers/Basic into 1.1
ada8b30 Czech: changed name to something better understandable
d3042ca Import translations. DO NOT MERGE
c35d6b2 Import translations. DO NOT MERGE
e9ccbb7 Import translations. DO NOT MERGE
e355d20 Update "Basic Sleep Mode Apps" -> "Basic Daydreams"
d5839a5 Import translations. DO NOT MERGE
0b28710 Import translations. DO NOT MERGE
02b2011 Import translations. DO NOT MERGE
f070a5c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
a042f4a Various fixes for the Colors dream Bug #7171323
838c614 Import translations. DO NOT MERGE
a59bd02 Import translations. DO NOT MERGE
0a8e1e8 Import translations. DO NOT MERGE
11348f9 Fix threading and stopping issues in Colors dream.
1e73eb4 Import translations. DO NOT MERGE
6d21e69 renaming Sleep Mode feature.
73f5331 Merge "Convert Colors from GLSurfaceView to TextureView." into jb-mr1-dev
e3498c8 Fix issue #7255954: API Review: rename Dream to DreamService
b77c1ce Basic Dreams: abstract away strings for transalation
0b4c919 Convert Colors from GLSurfaceView to TextureView.
74a589c Migrate away from lightsOut() in Basic color dream.
8bc55ec new icons for Color Dream.
71db4d5 Icon
0b1b96b Something a little prettier.
e05bc41 This was so much harder than it should have been.

   * packages/screensavers/PhotoTable
1a18051 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/screensavers/PhotoTable into 1.1
8e9254b Czech: changed name to reflect nature of application
948a386 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
85756a8 remove padding on table, also lifecycle cleanup.
c39ee47 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
ac1127e merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
3f0216e merge in jb-mr1-release history after reset to jb-mr1-dev
b6c75a5 don't reuse mOptions across threads.
9bb6659 merge in jb-mr1-release history after reset to jb-mr1-dev
9ab175f swap output dims after rotating image.
68bc9d9 handle image queues of length one.
c6bebae Take advantage of proportional screennails.
21713d8 merge in jb-mr1-release history after reset to jb-mr1-dev
c688f88 Add missing layout attributes Bug #7334849
315c853 Merge "Make my dreams pretty Bug #7353771" into jb-mr1-dev
a50a7ff merge in jb-mr1-release history after reset to jb-mr1-dev
f64bb8f Make my dreams pretty Bug #7353771
2887cd9 Merge "Save memory" into jb-mr1-dev
01a3c2e merge in jb-mr1-release history after reset to jb-mr1-dev
7b5201e Save memory
4f0d632 Merge "Better handling for network lag and large images." into jb-mr1-dev
6d78106 Move the hardwareAccelerated attribute in the tag
3758c1b merge in jb-mr1-release history after reset to jb-mr1-dev
5006d40 Better handling for network lag and large images.
e8f4d55 Be miserly with metered data.
aa4543e merge in jb-mr1-factory-release history after reset to jb-mr1-dev
a4a8d8b merge in jb-mr1-release history after reset to jb-mr1-dev
9163ae4 Merge "tweak photo dreams to be a little more relaxing." into jb-mr1-dev
cf64ff0 tweak photo dreams to be a little more relaxing.
71b0484 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
11a0e18 merge in jb-mr1-release history after reset to jb-mr1-dev
25eb917 merge in jb-mr1-release history after reset to jb-mr1-dev
14a31af Add permission for accessing PicasaContentProvider.
146ce64 handle some edge cases: many albums, deleted albums, and slow network.
6122ffd merge in jb-mr1-release history after reset to jb-mr1-dev
012590f Merge "Keep up with new Dreams API." into jb-mr1-dev
ac1d753 merge in jb-mr1-release history after reset to jb-mr1-dev
179bbb0 Keep up with new Dreams API.
51b6bdd Import translations. DO NOT MERGE
c6260b0 Merge "look harder for images to load." into jb-mr1-dev
58e2a16 look harder for images to load.
78db95a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
89ada97 fix NPE un stream unpacking failure.
7888e06 Import translations. DO NOT MERGE
98f5192 merge in jb-mr1-release history after reset to jb-mr1-dev
2f40712 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
375838b Import translations. DO NOT MERGE
d9b659a find the disappearing settings, plus some layout.
c225e17 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
b7fe720 turn off debug logging.
077a589 merge in jb-mr1-release history after reset to jb-mr1-dev
1c1faec Hopefully fix build.
fe0e98b Fix issue #7255954: API Review: rename Dream to DreamService
45fe502 Import translations. DO NOT MERGE
c2cdcb6 merge in jb-mr1-release history after reset to jb-mr1-dev
8698583 Merge "Photo dreams declare settings activities using xml." into jb-mr1-dev
56e419c Photo dreams declare settings activities using xml.
b8235ac refine handling of exceptional cases: no settings, network failure, load error.
aa77b48 merge in jb-mr1-release history after reset to jb-mr1-dev
cbbd63f Merge "New photo borders for PhotoTable." into jb-mr1-dev
6a7a7cb save settings asynchronously. also, catch click on the whole item row.
fb8edb8 merge in jb-mr1-release history after reset to jb-mr1-dev
fab692c New photo borders for PhotoTable.
803d037 Migrate away from lightsOut() in photo table dreams.
f1a60e6 merge in jb-mr1-release history after reset to jb-mr1-dev
cbe7a5c new icons for photo dreams.
e38c0c8 Segment album list by account.
b0a2207 merge in jb-mr1-release history after reset to jb-mr1-dev
06f3294 merge in jb-mr1-release history after reset to jb-mr1-dev
c6175b1 coalesce instant upload photos.
7dc9c76 Update photo dream names.
728f866 merge in jb-mr1-release history after reset to jb-mr1-dev
ef8b8af disable vignette
1d58274 more efficient vignettes
651ee92 add vignetting to the photo table
f98687b deal out new images in batches
70ef3e7 tune photo screensaver transisitons.
f40bfb6 multiple landing zones for photo table.
7608640 New animation curves for photo table.
08897b2 merge in jb-mr1-release history after reset to jb-mr1-dev
5b4b446 updated visuals for photo flipper
f46f18b merge in jb-mr1-release history after reset to jb-mr1-dev
d85f53c Add ability to select the albums to display.
cefe9ed merge in jb-mr1-release history after reset to jb-mr1-dev
83fee90 refactor photo sources and other cleanup.
c150104 Add Picasa as a source of photos.
e4c6f69 merge in jb-mr1-release history after reset to jb-mr1-dev
c91cbab add a simple photo flipper dream.
8cee061 merge in jb-mr1-release history after reset to jb-mr1-dev
f61019c fix lightsout mode and workaround a multifinger fling bug.
135f525 fix and enable flicking, also refactor
d131228 merge in jb-mr1-release history after reset to jb-mr1-dev
23f9b01 PhotoTable Polish:  + remove manual rotation  + better icon  + gradient background  + remove tap to dismiss  + (temporarily disabled) flick to replace

   * packages/screensavers/WebView
6e0a80f Really keep up with new Dreams API.
f7ef7c1 Keep up with new Dreams API.
a96eae0 Fix issue #7255954: API Review: rename Dream to DreamService
39f9b3d Migrate away from lightsOut() in webview dream.

   * packages/wallpapers/Basic
40dc0d4 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/wallpapers/Basic into HEAD

   * packages/wallpapers/Galaxy4
0ea354c Merge "Galaxy4: EL translations" into cm-10.1
ee671f8 Galaxy4: Afrikaans translation
80d7d82 Galaxy4: German translation
d9a9cd3 Galaxy4: EL translations
9e9c26f Galaxy4: DA translation
57bac00 Galaxy4: RU translation
93bbdef Galaxy4: NB translation
4f34996 Galaxy4: ES translations
18ab217 Galaxy4: PT-BR update translations
2a6d653 Added missing hungarian translation
0352ac5 Merge "Czech: translated" into cm-10.1
da5c87c Czech: translated
d7a2408 Galaxy4: Simplified Chinese + French Translations

   * packages/wallpapers/LivePicker
fd3290c Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/wallpapers/LivePicker into 1.1
f2f2fc3 Czech: fixed translation
0d0460a Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/wallpapers/LivePicker into HEAD
fbbdc9f Adding high-res live wallpaper picker asset
f14b1d2 Update to follow framework.

   * packages/wallpapers/MagicSmoke
9ca6687 Czech: added translation
0bc134c Update to follow framework.

   * packages/wallpapers/MusicVisualization
7d5ea7d Czech: fixed translation
817da75 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/wallpapers/MusicVisualization into HEAD

   * packages/wallpapers/NoiseField
d9ccb53 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/wallpapers/NoiseField into HEAD
2215802 Left clipping plane update. Bug 7311919

   * packages/wallpapers/PhaseBeam
53f5ba9 Czech: added translation

   * prebuilt
8cd7b1d Remove everything that isn't a build tool
f6e5b79 Update ninepatch prebuilt library for the SDK. do not merge.

   * prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6
837cdd9 Merge "Update mips toolchain mipsel-linux-android-4.6 (darwin-x86)"
093291c Update mips toolchain mipsel-linux-android-4.6 (darwin-x86)

   * prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6
042d613 Merge "Update x86 toolchain i686-linux-android-4.6 (darwin-x86)"

   * prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6
4b88bc4 Added missing defines and headers (x86_64)

   * prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6
90fc0bd Merge "Update mips toolchain mipsel-linux-android-4.6"
432e0ae Update mips toolchain mipsel-linux-android-4.6

   * prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6
b9ebba0 Merge "Update x86 toolchain i686-linux-android-4.6"

   * prebuilts/misc
f32b66a am e63e2c84: Manually update tradefed prebuilt from jb.
e63e2c8 Manually update tradefed prebuilt from jb.
cc86adc Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
6e204c6 am 50fd6f44: (-s ours) Update Layoutlib_api to API 9. do not merge.
50fd6f4 Update Layoutlib_api to API 9. do not merge.
25e81f3 merge in jb-mr1-release history after reset to jb-mr1-dev
853b881 Update Layoutlib_api to API 9.
6342bef merge in jb-mr1-release history after reset to jb-mr1-dev
26c3d3b Update ninepatch prebuilt library for the SDK.

   * prebuilts/qemu-kernel
f1b132a arm: update kernel for iptables
0d01374 Merge "Update location of prebuilt kernel path"
9920399 Update location of prebuilt kernel path

   * prebuilts/sdk
de5b622 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
5243f86 am 07a523b2: Drop official SDK 17
07a523b Drop official SDK 17
a11e2d2 Reconcile with jb-mr1-release - do not merge
f03c017 merge in jb-mr1-release history after reset to jb-mr1-dev
8a1238b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
94d1dc5 am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release
bfb2561 [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release
60b34f4 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2f56080 merge in jb-mr1-release history after reset to jb-mr1-dev
118e3fd [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release
28a5b54 merge in jb-mr1-release history after reset to jb-mr1-dev
dae9c8c [DO NOT MERGE] Drop current SDK as of build JOP31 #520834 from jb-mr1-release.
4a21768 merge in jb-mr1-release history after reset to jb-mr1-dev
30789c2 Update prebuilt aapt to as of JOP23B #513372 in jb-mr1-release
baae9c8 merge in jb-mr1-release history after reset to jb-mr1-dev
d98af14 Drop current sdk as of build JOP07C #493301 from jb-mr1-release.
291c670 merge in jb-mr1-release history after reset to jb-mr1-dev
16331d9 am 6ab59c98: am 7337fade: Add prebuilts/sdk/16/uiautomator.jar as of JZO54K  #485486
6ab59c9 am 7337fade: Add prebuilts/sdk/16/uiautomator.jar as of JZO54K  #485486
7337fad Add prebuilts/sdk/16/uiautomator.jar as of JZO54K  #485486
61bb71c merge in jb-mr1-release history after reset to jb-mr1-dev
ef6a43c Drop current SDK as of build #482637 in jb-mr1-dev.
1b29913 merge in jb-mr1-release history after reset to jb-mr1-dev
af3121d [DO NOT MERGE] Drop current SDK as of build# 474859 in jb-mr1-dev
2ef907c merge in jb-mr1-release history after reset to jb-mr1-dev
3a60b22 [DO NOT MERGE] Drop the current SDK as of JOO82C #472361 in jb-mr1-release.
9973a86 Use prebuilts for PDK build.
7fff9dd Use prebuilts for PDK build.
fd32b77 Check in prebuilt signapk.jar as of build #470905
08d16f3 [DO NOT MERGE] Drop the current SDK as of JOO76  #466372 in jb-mr1-release.

   * prebuilts/tools
bbf7c25 Merge "Add EasyMock 3.1, Objenesis 1.2 and cglib 2.2.3"
f607558 Add EasyMock 3.1, Objenesis 1.2 and cglib 2.2.3
6d8d77a Merge "Upgrade from Guava 10.0.1 to Guava 13.0.1."

   * sdk
938c8d7 adb bash completion: add support for sideload command
d7fe725 Delete duplicate files
11cc5da Add a new skin 'dynamic'.
daaada5 Some changes added to compile and run with Java 6 and Java 7.
779041f Merge "Improve the Device menu"
6538a60 Merge "Fix missing class detector to work for incremental manifest edits"
f51c736 Fix missing class detector to work for incremental manifest edits
0ac28ee Improve the Device menu
322b78f Merge "37688: Completion doesn't work with Library Project's resources"
9623832 Merge "Prevent potential NPE"
09bc0be Prevent potential NPE
7ba4007 37688: Completion doesn't work with Library Project's resources
646cdd6 Merge "gltrace: Preserve alpha information"
889236a gltrace: Preserve alpha information
d2cd79f Merge "Remove null warnings"
de9325d Merge "Allow users to save current GL state to a text file."
58fa2a0 Remove null warnings
92348b7 Allow users to save current GL state to a text file.
595e0de Merge "Fix import statement"
5689aa3 Fix import statement
4ae6018 Merge "gltrace: Do not save thumbnail images in memory"
e8952c7 Merge "Add allowBackup lint security check"
225fe91 Merge "Pre-dexed libraries."
98b631c Pre-dexed libraries.
944abd9 Merge "Manifest Merger: expand FQCNs to merge them properly."
91c8d33 gltrace: Do not save thumbnail images in memory
ab035b6 Add allowBackup lint security check
e5762ef Merge "Move some utility functions from AdtUtils to common"
4b46cf9 Merge "Fix new R class generation for libraries"
992cacc Merge "config.py is not needed anymore"
5328393 config.py is not needed anymore
bbfb294 Fix new R class generation for libraries
6fafd2c Merge "Validate user edits in XML files"
a5217f0 Merge "37497: Templates should escape string literals in resource files"
69e16b2 Merge "find_java: wrap toShortPath in disableWow64FSRedirection."
1fb4609 Move some utility functions from AdtUtils to common
78a419f Manifest Merger: expand FQCNs to merge them properly.
1d96433 Merge "MIPS company name is all-caps"
f48bde5 Validate user edits in XML files
845b6ab Merge "gltrace: Allow exporting current frame to a text file."
dc15b34 gltrace: Allow exporting current frame to a text file.
15c7978 MIPS company name is all-caps
0be1d50 Merge "Improve last editor mode handling"
ff8d9cd Merge "gltrace: Allow ability to save images"
f5a41c4 Merge "gltrace: Better progress indicator"
201e9f2 gltrace: Allow ability to save images
630d28a Improve last editor mode handling
053a790 Merge "Generate smaller R classes for libraries."
aea408b Generate smaller R classes for libraries.
454f0e0 37497: Templates should escape string literals in resource files
005c987 Merge "Add Android IDE package product build"
0b0513a Add Android IDE package product build
e0bff52 gltrace: Better progress indicator
ba21bdb Merge "Improvements to stacktrace handler for constructors"
ab71977 Merge "37546: Graphical layout in Eclipse does not render unicode characters"
16c6cf1 37546: Graphical layout in Eclipse does not render unicode characters
64ac523 Merge "Rename ide_common to sdk_common"
6837aad Rename ide_common to sdk_common
2e35274 Improvements to stacktrace handler for constructors
6184f12 Merge "Fix possible NPE reading dep file."
f92c116 Fix possible NPE reading dep file.
4e31a8f Merge "Manifest Editor: class selector for <application backupAgent>."
4c440c3 Manifest Editor: class selector for <application backupAgent>.
75b705f Merge "Add labelFor lint check"
e97536a Add labelFor lint check
e4dffb3 Merge "Add nullness annotations on overridden methods"
b49179e Add nullness annotations on overridden methods
8ead7de Merge "Code cleanup"
0502801 Merge "Support separate layout editors for a single layout resource"
0f86143 Merge "Fix build: InstanceScope.INSTANCE is not available in 3.6"
29aa122 Fix build: InstanceScope.INSTANCE is not available in 3.6
f705b3c Merge "Fix unit test for LocalSdkParser."
7801fad Fix unit test for LocalSdkParser.
6940ec1 Merge "gltrace: Allow fully qualified activity names"
a117eae gltrace: Allow fully qualified activity names
a21b9b4 Code cleanup
fe51dba Support separate layout editors for a single layout resource
f8d4d4c Merge "Refactor PackagesPage to make it testable."
8daea84 Refactor PackagesPage to make it testable.
bd2f7c9 Merge changes Ic70c0c36,Ia35f8af9
0386f5d ManifestMerger: fix handling of codenames in min/targetSdkVersion.
a35f8af Revert "Fix manifest merger for non-integer values"
d38457b Merge "Add guava to common and sdklib."
5910447 Add guava to common and sdklib.
34c9f0e Merge "Restore widget listeners in new project page"
d099954 Merge "Constants refactoring."
79fefd5 Merge "avd launch: Fix paths using build target instead of minApi"
7a9e046 Merge "launch: Refresh AVD selector dialog during initial setup"
07d9455 avd launch: Fix paths using build target instead of minApi
a27fdbc Merge "Remove unnecessary file"
fac515e Remove unnecessary file
d91db4f Merge "Add standard compiler flags to the uiautomatorviewer project"
d7c3e89 Add standard compiler flags to the uiautomatorviewer project
3fa94a2 launch: Refresh AVD selector dialog during initial setup
93145c6 Restore widget listeners in new project page
12d4581 Constants refactoring.
7b1c36c Merge "Update ADT template format docs to include additional built-in functions."
d042e74 Update ADT template format docs to include additional built-in functions.
540e10a Merge "Add class to resource name conversion for templates"
c254841 Add class to resource name conversion for templates
4fc6ddd Merge "Properly dispose DeviceManager from AvdManager."
3430f28 Properly dispose DeviceManager from AvdManager.
82256a9 Merge "SDK Manager refactor: remove obsolete UpdaterPage"
c191224 Merge "Allow sys-img.xml in user-defined addon sites"
e4ff778 Merge "Select AVD to run an app based on minSdkVersion"
411503f Merge "35959: ADT Layout Editor should fill id field for Fragments"
9a2dcfd 35959: ADT Layout Editor should fill id field for Fragments
190d385 Select AVD to run an app based on minSdkVersion
3239823 Allow sys-img.xml in user-defined addon sites
37612be Merge "NPW Sample Wizard: list extras with a "sample" directory."
4e278fe NPW Sample Wizard: list extras with a "sample" directory.
866d138 Merge "Add lint flag for setting a custom library path"
99e8e3d Add lint flag for setting a custom library path
b1fe0b6 Merge "Attempt to work around XML editor state bug"
b081e29 Merge "Add unit test for lint CLI"
89fec25 Merge "Work around missing DOM method implementation in Eclipe 3.6"
54aba95 Attempt to work around XML editor state bug
73f5489 Work around missing DOM method implementation in Eclipe 3.6
d1f0bd9 Add unit test for lint CLI
a6054a8 Merge "Fix false positives in field getter lint check"
7216856 Fix false positives in field getter lint check
320ff2f Merge "ddms: report user id if available"
2da2735 ddms: report user id if available
26a6128 SDK Manager refactor: remove obsolete UpdaterPage
a4da123 Merge "Don't report unused resources in projects with errors"
ff3d4a4 Don't report unused resources in projects with errors
cbae93b Merge "Collapse layout properties by default"
0b05c63 Collapse layout properties by default
7ce6049 Merge "37001: Lint check: non existing Activity/Service/Receiver"
f963bda 37001: Lint check: non existing Activity/Service/Receiver
7200016 Merge "Avd Creation Dialog: Enable sdcard if user asks for it."
09f6b5e Avd Creation Dialog: Enable sdcard if user asks for it.
69c15f8 Merge "Support systrace in monitor."
e745b3b Support systrace in monitor.
c7ba95a Merge "36829: Unused resource check does not handle merged manifests"
b16e595 Merge "Make some libraries be buildable with Gradle."
f4fa30a Merge "Remove obsolete stuff."
085c4be Make some libraries be buildable with Gradle.
31bbaa5 36829: Unused resource check does not handle merged manifests
198d527 Merge "Default action for view rules."
1f7a2f7 Merge "Refactor SDK Manager into "core" vs "ui" packages."
105d693 Merge "SDK: fix sed filter in monitor makefile."
91ef059 SDK: fix sed filter in monitor makefile.
f25890c Default action for view rules.
e46e702 Refactor SDK Manager into "core" vs "ui" packages.
8f569b2 Merge "Suppress errors for missing markers"
58930b6 Merge "Improve render exception error messages"
cf254cc Suppress errors for missing markers
2f28a7e Merge "36951: Lint API Level Warnings for Enums are Confusing"
ed2eed3 Merge "36942: tools:ignore="DuplicateActivity" just doesn't"
3136126 Merge "36987: TaskHelper can't parse the tools revision number "21 rc3""
243dbe7 36951: Lint API Level Warnings for Enums are Confusing
6d266a1 36987: TaskHelper can't parse the tools revision number "21 rc3"
04e0362 36942: tools:ignore="DuplicateActivity" just doesn't
5e6a790 Merge "SDK Manager: fix support for file:// URLs in UrlOpener."
5066e02 SDK Manager: fix support for file:// URLs in UrlOpener.
09c422e Improve render exception error messages
18142a3 Remove obsolete stuff.
b783ba0 Merge "Avoid "Marker id: 123456789 not found" errors"
a7a42ea Merge "Close XML editors when files are deleted or projects are closed"
ca6ebe9 Avoid "Marker id: 123456789 not found" errors
ec0dfbb Close XML editors when files are deleted or projects are closed
3f1353f Merge "Let ApkBuilder package bitcode library into APK."
fd7b0bc Merge "Add Translation dialog"
9a3a382 Merge "Suggest using SparseIntArray instead of SparseArray<Integer>"
c4f51ba Merge "Also check SimpleDateFormat calls for explicit locale"
100c65a Merge "Fix keybindings in manifest editor (issue 36540)"
1413cae Fix keybindings in manifest editor (issue 36540)
3bdb0f0 Merge "Add HTML documentation for ADT templates."
c09ba7a Add HTML documentation for ADT templates.
507724d Also check SimpleDateFormat calls for explicit locale
420d07a Add Translation dialog
8f286c0 Suggest using SparseIntArray instead of SparseArray<Integer>
e37f814 Merge "Add lint rule to find incorrect alias files"
0ba3653 Add lint rule to find incorrect alias files
b6518d2 Merge "Add lint check for potential string locale errors (issue 36822)"
a8d4bcc Add lint check for potential string locale errors (issue 36822)
c742488 Merge "Minor tweaks and typos"
007f2b5 Merge "Update Guava from 10.0.1 to 13.0.1"
c2ee341 Update Guava from 10.0.1 to 13.0.1
04f2ae3 Merge "Fix source attachments in the *base plugin"
fda1e3a Fix source attachments in the *base plugin
7a1f21f Merge "Fix SdkManager.hasChanged"

   * system/bluetooth
098826f Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/bluetooth into mr1

   * system/core
8399419 Fix failure to build from source with modern _host_ glibc/gcc.
9df8c47 fs_mgr: Drop the context mount option from non-selinux builds
3cd83bf Revert "fs_mgr: Drop the context mount option from non-selinux builds"
a73b226 fs_mgr: Don't assume all fstab entries have options
806fc56 fs_mgr: Drop the context mount option from non-selinux builds
1a18b8b toolbox: Add levelFromUid categorization support to restorecon
d0808c7 Fix building without SELINUX
482ec0c Explicitly add the theme manager's AID to fs config
0298df1 Add support for socket security context specification.
2c22ff6 Fix perms on /data/security
ed9fa86 sys/capability.h does not exist in the 4.2 bionic.
01996ab Sync with master auditd.
911cbea Correct run-as with seinfo parsing capability.
44677e4 Auditd initial commit
1f34e1c Reserve AID_AUDIT
345e3d2 Fix mode on /data/security.
cef7220 Create a new location for /data policy files
0cbf7ea toolbox: silence some compiler warnings
56ef4f0 Change setsebool syntax to be consistent with other init built-ins.
0995719 Label sockets consistently with the seclabel value if specified.
fd44b1c Add persist.mac_enforcing_mode property
7db7210 Document the SELinux extensions to the Android init language.
5841849 run-as:  Get seinfo from packages.list and pass to libselinux.
e46e20d run-as:  set the SELinux security context.
f97984a Allow system UID to setenforce and set booleans for SELinux.
7cee873 Add support for -R (recurse) to init chown builtin.
ac8ccac init.goldfish.rc: use ext4
fee496b rootdir: Set permissions for additional interactive sysfs nodes
530595c Correct LOCAL_LDLIBS of adb
4ffddab Merge "Fixed reversed output in netstat Recv-Q Send-Q columns" into cm-10.1
1fb3b1d lolcat
4852f0a rootdir: Set permissions for additional ondemand sysfs nodes
f1c0385 Merge "libsysutils: fix null pointer and memory leak issue" into cm-10.1
26be679 Merge "init.rc: setup qtaguid group ownership of ctrl and stat files" into cm-10.1
5f1aa1e Fixed reversed output in netstat Recv-Q Send-Q columns
de5ae87 libsysutils: fix null pointer and memory leak issue
fb0360b Merge "init: provide initial pemissions for ondemand governor" into cm-10.1
b36889f init: provide initial pemissions for ondemand governor
a86c50a init: fix indentation and tab
e79310e init.rc: setup qtaguid group ownership of ctrl and stat files
ddca232 Revert "init: allow media to set persist.camera property"
49506dc init: allow media to set persist.camera property
2c71443 backup service: fall back to /sbin/bu
1a51d7f adb : add missing connection states
b66a4a4 Fix issues where the filename is referred to as 'sideload'
bb8d238 mount: fix incorrect string length calculation
c7fdf81 init: Load init.carrier.rc for carrier-specific bits
bec571f adb: Add a few more wait-for commands
7b08018 adb: Add "wait-for-sideload" command
b954a7e libnetutils: add ifc_set_mtu
dd2d189 liblog: Move log messages from Diag_Lib to radio log
823c688 Fix the QCOM_BSP ifdef
d33ce43 add 8K 16K 32K 64K and 128K pagesizes in bootimage
f7eba0c qcom-fm: audio: Add support for FM feature
96f1188 Set permissions on io_is_busy node for interactive governor
67e1cf2 Merge "init: create mountpoint for fuse" into cm-10.1
61a20d6 init: Check for symlinks with lstat() not open()
a0900e2 init: create mountpoint for fuse
33bfa99 Merge "fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef" into cm-10.1
29e9e0f Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_system_core into mr1.1-staging
7b3c541 fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef
0b8a83c Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/core into 1.1
1c8f8ce Fix audio recording for ICS audio blobs
4d83011 Merge "charger: do not suspend when handling home" into cm-10.1
8d77557 rootdir: set perms on ondemand governor's up_threshold
fd4d11e rootdir: Set perms on interactive governor's min_sample_time
d559a35 charger: do not suspend when handling home
c925999 Merge commit 'android-4.2.1_r1.2' into cm-10.1
4900c5c Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1
e15eeba Init: Allow building of init that is compatible with second init boot
7d5f33e charger: Do not suspend when disconnecting from charger
3493f18 charger: suspend enable in charger mode
aae1ce4 libsuspend: compile as a static library
5366657 init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes
36c0ce8 FM Radio: Add support for FM Radio in Android
674a79d Merge "Revert "init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes"" into cm-10.1
7cc5037 Revert "init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes"
aea2556 Merge "unpackbootimg: remove host LOCAL_MODULE_TAG" into cm-10.1
420437d unpackbootimg: remove host LOCAL_MODULE_TAG
3645436 init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes
171456b audio: fix build break for non QCOM
8413e2b audio: add QCOM supported audio devices
9b1ad4a audio: Fix input enums for pre-4.2 audio blobs
4f247d7 rootdir: init.rc: set perms for cpufreq governor boostpulse_duration
16753a4 Set ANDROID_PROPERTY_WORKSPACE in exec.
becea6e Merge "Fix ELF header parser bug." into jb-mr1.1-dev
c076030 Fix ELF header parser bug.
da448f6 libnetutils: Fix up the dhcp request arguments
57bf34d camera: Add new commands to compatibility block
d7fbac3 camera: Remove histogram commands
f6c2802 Revert "init: Never allow two same-service processes to exist simultaneously."
fd8e650 charger: Do not suspend when disconnecting from charger
40156b8 charger: fix build
9255713 charger: suspend enable in charger mode
a2411ee Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev
c3b3837 liblog: add required function
80828af init.usb.rc: set sys.usb.config to none before changing it
2cc3527 libsuspend: compile as a static library
10766db Fixed improper size displaying in 'df' utility
9655a86 rootdir: Add mediaserver to qcom_diag group
ec1f281 libion: Support for old ION API
91137e1 init: Bring back support for arbitrary chargermode cmdlines
a39679f toolbox: new applet restart
44cc2f9 ramdiskaddr is now ramdisk_offset
4a82b34 init.rc: Move CM's sysinit to the init.cm file
e682ec2 Fix /cache permissions for the dexopt cache
f299ff5 Deprecate distinct boot paths for androidboot.emmc
5056eab init: Add support for properties expansion in exec command
d23a32d Add support for exec command in init scripts.
7fe7916 Revert "init: Implement exec support"
299c604 Revert "init: Add support for properties expansion in exec command"
cd7c576 adb: Fix missing header paths
7fe624e Revert "init: Check for symlinks with lstat() not open()"
5827cc4 Revert "libcutils: Fix aliasing violations"
39d33d8 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/core into mr1
b20fa76 Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
ba70ed9 Reconcile with jb-mr1-release - do not merge
31da9db merge in jb-mr1-release history after reset to jb-mr1-dev
d42d327 Fix fs_mgr to properly invoke e2fsck on encrypted devices
c424456 am d1e39491: Add usb vendor id for Teleepoch.
d1e3949 Add usb vendor id for Teleepoch.
c8e3a27 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
d8aa8ab Merge "charger: allow home button to wake" into jellybean
feb666d Update tcp buffersize settings
1323e37 charger: allow home button to wake
1e6a58b Allow a device to define the max number of service groups in init.h
d2c2b10 init: Allow device-specific appends to the property service permission structs
40b7fa2 libion: Disable for omap3
152977d Provide permission for graphics to set service.bootanim.exit prop
943dba1 init.rc: Fix compcache and cleanup init file
74365b1 merge in jb-mr1-release history after reset to jb-mr1-dev
9f239af second user doesnot pickup input operations from A2DP
80a99e3 merge in jb-mr1-release history after reset to jb-mr1-dev
7b4aa67 Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev
4ef6e4b init.trace.rc: Set perms for power/clock_set_rate events
1407556 Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
b151510 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
a26ee49 merge in jb-mr1-release history after reset to jb-mr1-dev
209c7b0 charger: allow devices to skip the initial display blank
371fc00 Remove force use definition for remote audio submix
32429a9 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
f3f1d01 merge in jb-mr1-release history after reset to jb-mr1-dev
f7d3ae2 adbd:fix framebuffer handle when(fbinfo.size % 640 != 0)
bdec5ea Change dev/uhid group id from bluetooth to net_bt_stack
7f9349d merge in jb-mr1-factory-release history after reset to jb-mr1-dev
41d1bc0 Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" into jellybean
035649e merge in jb-mr1-release history after reset to jb-mr1-dev
a0941d2 merge in jb-mr1-release history after reset to jb-mr1-dev
bd0816f merge in jb-mr1-release history after reset to jb-mr1-dev
dd91699 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/system/core into aosp-merge
d22b2a1 Merge "audio policy: add forced uses for system" into jb-mr1-dev
4daa843 audio policy: add forced uses for system
fb2f282 merge in jb-mr1-release history after reset to jb-mr1-dev
c6f8bd3 Merge "rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups" into jb-mr1-dev
e1d9986 toolbox/dmesg: do not hardcode KLOG_BUF_LEN
33978c4 init: Set ADDR_COMPAT_LAYOUT before spawning processes.
d282dfc Merge "init: Set ADDR_COMPAT_LAYOUT before spawning processes." into jb-mr1-dev
01b1dee init: Set ADDR_COMPAT_LAYOUT before spawning processes.
6fe9240 merge in jb-mr1-release history after reset to jb-mr1-dev
9eca69b Merge "Create bluetooth stack aid for sharing gid between all bluetooth processes" into jb-mr1-dev
f7ac9ae Add HTC Logging functions to support newer HTC props.
ece565c rootdir: init.rc: add drmrpc to surfaceflinger supplemental groups
971153a Create bluetooth stack aid for sharing gid between all bluetooth processes
6800ae9 merge in jb-mr1-release history after reset to jb-mr1-dev
48f3b57 Merge "Update fastboot to wipe ext4 partitions before flashing" into jb-mr1-dev
5ee5d38 Update fastboot to wipe ext4 partitions before flashing
8183fc4 merge in jb-mr1-release history after reset to jb-mr1-dev
bc930ed Move dequeue-buffer-and-wait out-of-line
6babec5 merge in jb-mr1-release history after reset to jb-mr1-dev
22d8f16 Merge "core: Add API to retrieve mtu size" into jellybean
d6d4780 Add writable data space for radio.
67952e6 merge in jb-mr1-release history after reset to jb-mr1-dev
38eee0f charger: make default to not suspend in charge mode
00615f0 Merge "Allow mkdir() race to succeed." into jb-mr1-dev
9481266 init.rc: chmod slabinfo to 440 to capture slabinfo in BRs
489609b Allow mkdir() race to succeed.
74b6e3d merge in jb-mr1-release history after reset to jb-mr1-dev
fdd2ff4 Dump 256 bytes per chunk pointed by general-purpose registers.
cc3f9d1 Merge "Add RAW burst message" into jellybean
c9d9080 Merge "Camera: Adds burst camera message type" into jellybean
0b76d02 Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev
f1c50bf init: import init.trace.rc after h/w-specific rc
c47b772 Dump 256 bytes per chunk pointed by general-purpose registers.
0e7ce5d Add RAW burst message
1faaf38 Camera: Adds burst camera message type
46495f9 rootdir: Tighten permissions on boostpulse nodes
a17cf4c Revert "Upgrade to dlmalloc 2.8.5."
c611911 am 0933c6f4: (-s ours) am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
0933c6f am e2a3fe23: am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
e2a3fe2 am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
2dbef6a Merge "The localtime_tz and mktime_tz extensions are now in bionic."
7c9bc37 core: Add API to retrieve mtu size
00f983a merge in jb-mr1-release history after reset to jb-mr1-dev
b988655 libsuspend: force autosleep off during init
638d805 merge in jb-mr1-release history after reset to jb-mr1-dev
d39f524 init: Set the "ro.boot.emmc" property
96094ae ANW: fix my fix for a file descriptor leak
c181583 rootdir: Add terminfo path
45b0385 Merge "remove unneeded import" into jb-mr1-dev
e16534f Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
ede5cf6 remove unneeded import
37bd30b Merge "ANW: fix an fd leak" into jb-mr1-dev
8136017 Merge "Move AndroidConfig.hs to the build project." into jb-mr1-dev
0d699de Merge "Add explicit sync call to ion library" into jb-mr1-dev
5d38295 Upgrade to dlmalloc 2.8.5.
fbafa63 Merge "Print the revision number in the tombstone file." into jb-mr1-dev
9bd8dd3 ANW: fix an fd leak
c2f59d8 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
07a56fb Move AndroidConfig.hs to the build project.
3cfcc30 Add explicit sync call to ion library
c24eac1 merge in jb-mr1-release history after reset to jb-mr1-dev
d7760c1 Print the revision number in the tombstone file.
e1df9ad Merge "init: Don't read local properties if ro.debuggable=0" into jb-mr1-dev
32b9023 init: Don't read local properties if ro.debuggable=0
e580fc6 merge in jb-mr1-release history after reset to jb-mr1-dev
1683413 Merge "DO NOT MERGE Add event log tag for cert pin failures." into jb-mr1-dev
7241a04 merge in jb-mr1-release history after reset to jb-mr1-dev
2a3f900 Merge "system/core: Add command NATIVE_WINDOW_UPDATE_BUFFERS_GEOMETRY" into jellybean
8886cb5 Merge "charger: suspend when not animating" into jellybean
4a31de8 Wrap system calls in TEMP_FAILURE_RETRY.
a6cf774 Merge "Wrap more system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
6de7026 Wrap more system calls in TEMP_FAILURE_RETRY.
7918d81 Merge "Wrap system calls in TEMP_FAILURE_RETRY." into jb-mr1-dev
ddb1733 Wrap system calls in TEMP_FAILURE_RETRY.
ad59e0a am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"
c92961d am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"
b905f12 am 9796a83a: Merge "Add shared app gid to fs config"
9796a83 Merge "Add shared app gid to fs config"
7e41c84 Add shared app gid to fs config
007ce1d merge in jb-mr1-release history after reset to jb-mr1-dev
4a23e1d DO NOT MERGE Add event log tag for cert pin failures.
7e014ce am cdc4a400: am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
cdc4a40 am cb71ed30: am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
cb71ed3 am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
50e2555 Merge "Always include <sys/socket.h> before <linux/netlink.h>."
b77d3d7 Always include <sys/socket.h> before <linux/netlink.h>.
6e9038b system/core: Add command NATIVE_WINDOW_UPDATE_BUFFERS_GEOMETRY
ae3a615 rootdir: Update cpufreq permissions when governor changes
673adb2 Revert "libpixelflinger: Build NEON optimized routine per target configuration"
3d2c63d Revert "libpixelflinger: Add ARM NEON optimized scanline_t32cb16"
590e705 init: Add support for properties expansion in exec command
be5bb1d init: Add "export_rc" command to export env from a specified file
d03072f The localtime_tz and mktime_tz extensions are now in bionic.
a95c0fa merge in jb-mr1-release history after reset to jb-mr1-dev
0f5e303 Merge "Add /data/app-lib for native library sharing" into jb-mr1-dev
fb4a4c3 am e6b89810: am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
e6b8981 am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"
eb7ee9c am 922b460c: Merge "fastboot: move help command before usb connect"
922b460 Merge "fastboot: move help command before usb connect"
80f9867 fastboot: move help command before usb connect
ae807aa Merge "fastboot: move help command before usb connect" into jb-mr1-dev
bf929a9 merge in jb-mr1-release history after reset to jb-mr1-dev
5054417 Add /data/app-lib for native library sharing
6460484 am 6de26787: am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
6de2678 am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma."
0991797 am 82959f5e: Merge "Remove unnecessary compiler pragma."
82959f5 Merge "Remove unnecessary compiler pragma."
eeeee80 audio: new audio devices enum values
38f10f8 Merge "Device and mode definitions for remote submix" into jb-mr1-dev
e11866a Device and mode definitions for remote submix
d2f9bf3 Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev
707b258 Bring back ADB_EXTERNAL_STORAGE.
58d3980 Keep /mnt/secure private to default namespace.
d8a8979 Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev
d6d4286 Bring back ADB_EXTERNAL_STORAGE.
83e3842 am 7908a68e: (-s ours) Reconcile with jb-release - do not merge
7908a68 Reconcile with jb-release - do not merge
05e2599 merge in jb-mr1-release history after reset to jb-mr1-dev
3994880 Revert "window: Add API to set the min undequeued buffer count"
097efdb Merge "include/system: JB upgrade for the MPQ8064" into jellybean
96535ba Dist fastboot and adb for the sdk build.
4b01926 merge in jb-mr1-release history after reset to jb-mr1-dev
50fa901 include/system: JB upgrade for the MPQ8064
d932c55 merge in jb-mr1-release history after reset to jb-mr1-dev
6479e18 Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
345ca13 adb: Link statically with libcrypto
5968014 Merge "adb: Create private key with 0600 mode" into jb-mr1-dev
64b3103 adb: Create private key with 0600 mode
9685194 File-system utilities for installd and zygote.
b2c75f7 merge in jb-mr1-release history after reset to jb-mr1-dev
c7b75dc fastboot: move help command before usb connect
04b5ac3 Remove unnecessary compiler pragma.
c4e7e97 merge in jb-release history after reset to jb-dev
98a7c86 merge in jb-release history after reset to jb-dev
84ac402 Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
db59e65 merge in jb-mr1-release history after reset to jb-mr1-dev

   * system/extras
2f98a98 make_ext4fs: fix static utility executable, this time for SELinux
7068855 Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/extras into 1.1
604363b Merge commit 'android-4.2.1_r1.2' into cm-10.1
917e120 am c04808a5: make_ext4fs: fix sepolicy lookup for lost+found
f69ebab am 0f92e16a: make_ext4fs: insert lost+found directory into filled filesystems
c04808a make_ext4fs: fix sepolicy lookup for lost+found
0f92e16 make_ext4fs: insert lost+found directory into filled filesystems
da06804 Reconcile with jb-mr1-release - do not merge
1275cfc am 430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
6a73c51 make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
cb95c86 make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
430b67d make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
2812d05 make_ext4fs: fix static utility executable
a6b059f Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/extras into mr1
c3dc892 Use updated stop supplicant API
07c8a6d Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
80d69a7 merge in jb-mr1-release history after reset to jb-mr1-dev
3f91534 atrace: add sync trace support
d5c3000 merge in jb-mr1-factory-release history after reset to jb-mr1-dev
f5ccdc6 merge in jb-mr1-release history after reset to jb-mr1-dev
a09aa3e Add -n and -S options for 'nohup', offline traces
bbbeeb3 merge in jb-mr1-release history after reset to jb-mr1-dev
24505a5 atrace: make clock & bus bw tracing optional
76a5077 merge in jb-mr1-release history after reset to jb-mr1-dev
a404a7e atrace: add clock rate and bus utilization
d7be21e merge in jb-mr1-release history after reset to jb-mr1-dev
fa98203 More Issue #7211769: Crash dialog from background user has non-working "report"
a8a3069 Build bugreport paths for emulated storage.
496afad Always read bugreports from EXTERNAL_STORAGE.
b568de0 Build bugreport paths for emulated storage.
cf4e11b Always read bugreports from EXTERNAL_STORAGE.
aef25b7 merge in jb-mr1-release history after reset to jb-mr1-dev
818b58c Guard against NPE in SendBug

   * system/media
139237f Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/media into 1.1
555aac8 Camera2: Fix metadata alignment for double and int64 types
b10d56a Camera: Actually make camera_metadata memcopyable
3154036 Camera: Fix metadata data alignment, other minor bugs.
6c94a62 Camera: Add quirk for metering regions to ignore crop region
94879bd Camera: Add scene mode override and quirks fields.
ceb22cf Camera: Add android.jpeg.size field.
fdb26f8 Camera2: Separate AE/AWB locks from AE/AWB modes.
b388078 Camera: Add request type and input streams metadata tags.

   * system/netd
9331e81 netd: Enabling softAP/Hotspot for TI solution
c3532a0 Revert "system/netd TI mac80211: Hostapd updates from omapzoom JB"
f48516f Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/netd into 1.1
d67cc36 resolved conflicts for merge of b40c2385 to jb-mr1.1-dev
b40c238 resolved conflicts for merge of 7b90f090 to jb-mr1-dev
7b90f09 am 43682d94: Fix a TOCTOU and symlink attack in netd.
2b62f6b SoftapController: fix broken WPA2 tethering
43682d9 Fix a TOCTOU and symlink attack in netd.
e064432 Fix a TOCTOU and symlink attack in netd.
31bf751 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/netd into mr1
60eeac1 Revert "Allow removing hostapd entropy parameter (-e)"
d86ae70 Revert "netd: Insert Android iptables rules on top"
d2fe728 Revert "Support LGE's version of the bcm4329 SoftAP"
a108106 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
d553ad3 merge in jb-mr1-release history after reset to jb-mr1-dev
0b02d05 remove Pan service which is not used anymore.
51a9509 merge in jb-mr1-release history after reset to jb-mr1-dev
40cdfe4 am 78b00d81: Merge "Don\'t include <linux/...> header files directly."
78b00d8 Merge "Don't include <linux/...> header files directly."
970274a Don't include <linux/...> header files directly.
87482aa Demoting a non-critical error to a warning: unable to load net cmd dll.
f2f4e7a merge in jb-mr1-release history after reset to jb-mr1-dev
bec6d04 Add LOG_TAG to NetdConstants.

   * system/vold
bcd5a74 vold: Add NTFS read+write support via ntfs-3g
ce6e95e vold: exFAT support
e336c0c vold: add support for ext4 media
fc1dcc1 vold: use blkid to detect filesystem type
3ffe02b Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/vold into 1.1
3fd60b4 Fix issue #7503920: Log spew from vold
74f10db vold: do not try and unmount asec when unmounting non-primary storage
57e08d0 Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/vold into mr1
b7afc4e Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
3e61f1d UMS support with any volume, not only primary (1/3)
1cbe0ce merge in jb-mr1-release history after reset to jb-mr1-dev
92736ef Another fix for encryption
f1a6123 Fix encryption on certain devices
9dedfd4 Fix encryption on certain devices
42c34c8 Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/system/vold into aosp-merge
2a012c0 merge in jb-mr1-release history after reset to jb-mr1-dev
7a3c3d4 Unmount in-place instead of using MS_MOVE.
13f393d Update environment variable for multi-user.
b77bc46 Update environment variable for multi-user.
9f910d8 merge in jb-mr1-release history after reset to jb-mr1-dev
e919efe Workaround a kernel race when loading dmcrypt table
2bbf02c merge in jb-mr1-release history after reset to jb-mr1-dev
6947904 Handle multi-user mountObb() requests.

   * tools/build
7eff274 Merge "Remove the default java tasks and fix packaging java res"
a53003c Remove the default java tasks and fix packaging java res
88575aa Merge "Add a multi-component app that uses a maven repo."
afd0972 Add a multi-component app that uses a maven repo.
7c2d81b Merge "Fix tests for the flavors project."
919a98d Merge "Rework the way tests are installed and run."
d3079f3 Fix tests for the flavors project.
4518ee9 Rework the way tests are installed and run.
0bfbe9a Merge "Support for multi-flavor builds."
2c7ccec Merge "Some changes to 'multiproject' test app"
9d9d663 Merge "Build the library dependency graph."
f58330d Some changes to 'multiproject' test app
9aca9ef Build the library dependency graph.
484f4ca Support for multi-flavor builds.
481e086 Merge "Only create R class for libraries when the project is not a library."
4b9ac14 Only create R class for libraries when the project is not a library.
58d6448 Merge "Make library projects use their library dependencies."
01d2910 Make library projects use their library dependencies.
7678ec5 Merge "Fix to include transitive jar dependencies of libraries."
0ff445b Fix to include transitive jar dependencies of libraries.
9a8ebcb Merge "Fixes for publishing library bundles to repositories"
c223875 Merge "Restructured the 'multiproject' test project."
fb90a38 Merge "Fix jar name in library bundle when library project specifies a version."
b2d299b Fixes for publishing library bundles to repositories
b4e5d93 Merge "Fix overly agressive cleanup."
1ba19cf Fix overly agressive cleanup.
5ee6a22 Restructured the 'multiproject' test project.
67c5c39 Fix jar name in library bundle when library project specifies a version.
991c146 Merge "New test app to test libraries."
0a48c83 New test app to test libraries.
67ef91a Merge "Some clean up."
245a289 Some clean up.
b6ecf15 Merge "Fix setting up classpath with jars from libraries."
df01802 Fix setting up classpath with jars from libraries.
996695c Merge "Started wiring up library and jar dependencies."
1005683 Started wiring up library and jar dependencies.
48ff1b8 Merge "Don't use an empty main manifest when merging library manifests."
5157d56 Don't use an empty main manifest when merging library manifests.
7f82a50 Merge "Ensure manifest changes trigger new builds."
f7a8a1f Ensure manifest changes trigger new builds.
74a7c16 Merge "Defer calculation of compile classpath until required."
36f78e6 Defer calculation of compile classpath until required.
aef748b Merge "Add support for building AILD files."
6ac01a9 Add support for building AILD files.
ccb67c7 Merge "Rename task classes to be more consistent."
8edc575 Rename task classes to be more consistent.
387c04e Merge "Add support for extra lines in BuildConfig."
94d5c80 Add support for extra lines in BuildConfig.
521425f Merge "Make sure the build detects changes in config classes."
22477ac Make sure the build detects changes in config classes.
b519b3f Merge "Add guava as a dependency to AndroidBuilder."
5415480 Add guava as a dependency to AndroidBuilder.
c014284 Merge "Fix support for building and testing libraries."
8701f80 Fix support for building and testing libraries.
30eaca7 Merge "Refactor VariantConfig to contain the tested config."
f17a45b Refactor VariantConfig to contain the tested config.
db998f3 Merge "Start planning for checking inputs of all tasks."
57b2589 Start planning for checking inputs of all tasks.
4d7a487 Merge "More refactoring to build library tests."
20c4c27 Merge "Split android-builder out of android-gradle."
f08573e Merge "Add support to build and bundle library projects."

   * tools/motodev
6ddc600 Merge "Updates to makefiles and sources to support third-party builds"
1e88063 Updates to makefiles and sources to support third-party builds

   * vendor/acer
41d0943 Merge pull request #1 from pawitp/cm-10.1
def25e1 a700: borrow hwcomposer from grouper
7b1f662 Initial commit

   * vendor/akm
4a4c031 Merge pull request #4 from burnsra/jellybean
86ed3c7 crespo: Binaries for Android 4.1.1 (JRO03R)

   * vendor/amazon
6248b30 Merge pull request #4 from KFire-Android/cm-10.1
3699809 add jemlte wan binaries
0af4a0e tate: add specific camera dcc files + provisioning
72088b4 jem: add specific camera dcc files + provisioning
36452a0 bowser-common: remove shared camera dcc files, moving to specific devices
a40c0f0 bowser-common: add Dolby Decoder libs
cbee8d1 Merge pull request #3 from KFire-Android/cm-10.1
645d251 SGX-BIN: DDK binaries and KM source 1.9@2291151
3264095 Rebuilt sgx binaries required because of a kernel change that requires sgx to be rebuilt.
b6cb2a0 Merge pull request #2 from KFire-Android/cm-10.1
4d9d9e6 cleanup prop files
21e75ee Merge pull request #1 from KFire-Android/cm-10.1
e62887d otter/otter2: remove sensor HAL from vendor files
87c4cbf tate: cleanup old location for bluetooth firmware
9cb152e jem: cleanup jem-vendor-blobs.mk
7a48f09 tate: fix bluetooth blobs
70a6024 Alter blobs so that 26mhz BT firmware doesn't load. For me, BT would only work using the 20mhz file (which is also loaded by stock).
448a2c9 Revert "Update powervr.ini"
1647365 Merge pull request #3 from BigHead2k/patch-1
6d2bb90 Update jem-vendor-blobs.mk
f0526d3 Merge pull request #2 from javabugz/cm-10.1
351ae14 Firmware files should be in this new location for bluetooth to work. Reboot after the move & bluetooth discovery + audio streaming starts working.
0162db9 Update powervr.ini
78df8ea tate: remove provisioning blobs
a6ac4a5 tate: 7.3.0 binary update
694ac14 jem: 8.3.0 binary update
36c21b8 remove unused audio libs
3e99142 remove unused copy of bbx
cea3b7a bowser-common: remove smartvolume
cd4405d move symlink for gralloc to device/omap4-common
c1dfafb Merge branch 'cm-10.1' of github.com:KFire-Android/proprietary_vendor_amazon into cm-10.1
6059383 jem: remove audio prebuilt
9d53e7b remove smartvolume
688bbd7 remove smartvolume
b186475 vendor-amazon: license fix
da74dbf omap4-common: fix location for pvr binaries
04b857d omap4-common: update .mk for etc/wifi/TQS_S_2.6.ini location
018c991 omap4-common: fix symlink to gralloc file
30772fd omap4-common: move powervr.ini to the proper location
4a6a3a8 tate: update vendor.mk files
4a2cf0c tate: add invensense files
16183eb tate: move HALs to proper location
3862b3f tate: move firmware to proper location
81c78ac otter2: update vendor.mk files
247aafb otter2: move sensor HAL to proper location
a1d128f otter: update vendor.mk files
87861b7 otter: move sensor HAL to proper location
afcdea9 otter-common: update vendor.mk files
a4df2ac otter-common: move firmware to proper location
58e4583 omap4-common: add common vendor setup
7326086 jem: update vendor.mk files
c0352b4 jem: move firmware files to proper location
9464ada jem: add invensense files
514e066 jem: moved HALs to proper location
30b3479 update bowser-common vendor.mk files
1fbc312 merge bowser-common blob files
7e67be2 re-add bowser camera_dcc
b55b16c move bowser-common etc/wifi files to proper place
95bd288 move camera files to proper place
b1f4cb4 add setup vendor files for Amazon Kindle Fire devices
f6d2e7a initial commit

   * vendor/asus
afc914e Merge pull request #42 from chrmhoffmann/cm-10.1
4970c97 tf300t: blobs from 10.6.1.27.1
61e2f98 Merge pull request #40 from chrmhoffmann/cm-10.1
a7ff217 update blobs and kernel to 10.6.1.15.3 - forgot libstagefrighthw.so
55c2e7c update blobs and kernel to 10.6.1.15.3
f4bcea4 Merge pull request #39 from dasunsrule32/cm-10.1
da1258a tf700t: update blobs to 10.6.1.14.8
fb984e1 Merge pull request #38 from dasunsrule32/cm-10.1
16335f0 tf700t: update blobs to 10.6.1.15.3
ec13610 Merge pull request #37 from dasunsrule32/cm-10.1
aba36ad tf700t: remove ASUS exfat and ntfs support
8c5e13c Merge pull request #36 from dasunsrule32/cm-10.1
741175c tf700t: update to 10.6.1.14.4 props
728385c Merge pull request #33 from nemith/cm10.1
b79a517 Merge pull request #34 from burnsra/cm-10.1
f48e880 Update to 4.2.2 binaries
19ecc27 Grouper: Binaries for Android 4.2.2 (JDQ39)
b499b1a Merge pull request #32 from chrmhoffmann/cm-10.1
95742cd gps: modified and moved to device tree
9e1dddc Merge pull request #31 from dasunsrule32/cm-10.1
493778a tf700t: remove unused bcm firmware
4795a6d Merge pull request #30 from mempf/cm-10.1
f247256 Updated to 4.2.2 binaries Also removed traces of asound and keystore.grouper from makefiles
7296da0 Merge pull request #28 from dasunsrule32/cm-10.1
9b704b5 tf700t: BtService: fix interpretor path
3601e26 Merge pull request #27 from dasunsrule32/cm-10.1
872c88f tf700t: add missing pppd_btdun binary
0c09699 Merge pull request #25 from dasunsrule32/cm-10.1
c09dc82 Merge pull request #26 from loganmc10/cm-10.1
333a905 Updates from .20 ROM
eeb3316 tf700t: remove unused lib
75b0dbc Merge pull request #24 from dasunsrule32/cm-10.1
ff3979f tf700t: update BtService.sh
8c0e65d tf700t: update to 10.4.4.25 blobs
698774c Merge pull request #23 from dasunsrule32/cm-10.1
c09786d add btmacreader
ad43437 Merge pull request #22 from dasunsrule32/cm-10.1
80b4f3b tf700t: cleanup vendor tree
57e8aa4 Merge pull request #21 from loganmc10/cm-10.1
d36f615 This is my proposed vendor tree. It contains blobs from the .18 release and only contains what is needed. Tested and working. I will follow up with commits for the device and kernel trees. Merging this without the updated kernel and device tree will likely break wifi, because this uses nvram_nh615.txt instead of nvram4329.txt
f974405 tf201: we dont use prebuilt sensorservice
df12dd4 tf300t: Use nh615 nvram for 4329
b959091 tf300t: Bring back wpa_supplicant.conf
f1cfa5b Merge branch 'cm-10.1' of git://github.com/TheMuppets/proprietary_vendor_asus into HEAD
7c98eb5 tf300t: remove wifi unneeded blobs
00c7eef tf201: update to jellybean prebuilts
631af8a tf101: enable prebuilt audio HAL
2644280 Merge pull request #20 from dasunsrule32/cm-10.1
687147b make camera.tegra.so use libtjpg.so
d27ec3b Merge pull request #18 from dasunsrule32/cm-10.1
745d43f update props to 10.4.4.23
6d6cecb Merge pull request #17 from nemith/mr1-staging
bdd1a65 Add tilapia (Nexus 7 GSM) blobs.
d431e29 Merge pull request #14 from dasunsrule32/jellybean
9de6233 add missing dbus.conf
fed4c06 Merge pull request #13 from dasunsrule32/jellybean
66d75b7 remove prebuilt wifimacwriter
88d44aa Update blobs to fit rewritten wifimacwriter
2f68cda Merge pull request #12 from dasunsrule32/jellybean
df92842 update blobs to 10.4.4.20
95085e3 Update tf300tt to Asus JellyBean Blobs (finally!)
133b217 Merge pull request #11 from dasunsrule32/jellybean
20503d2 change to our camera hal
d6125d0 fix cameras
866e759 Merge pull request #10 from dasunsrule32/jellybean
3c5a548 add updated blobs
d8f4162 Merge pull request #9 from burnsra/JZO54K
3135535 grouper: removal of nfc related file
611d305 Merge pull request #7 from burnsra/jellybean
b09cdd1 grouper: Remove specialized keystore to restore compatability with certain certificates
37f92a8 Merge pull request #6 from burnsra/jellybean
f46c823 grouper: Touch panel binaries moved to elan vendor for Android 4.1.1 (JRO03R)
9c3414f grouper: GPS binaries moved to broadcom vendor for Android 4.1.1 (JRO03R)
69445a2 Merge pull request #5 from dasunsrule32/jellybean
fe1f827 add missing audio libs
907ea96 add missing libqcom-ril.so
5fbbdc6 remove additional cruft
c8d93db add tf700t

   * vendor/audience
58bddf8 Merge pull request #2 from atinm/cm-10.1
810074b Updated to Android 4.2.2 (JDQ39) binaries
5d4b8ac Updated to output of setup-makefiles.sh
184a7bf Audience for manta

   * vendor/bn
5fe4624 Merge pull request #12 from steven676/cm-10.1
8538843 encore: remove powervr.ini from proprietary blobs
19f22a8 Merge pull request #10 from Hashcode/cm-10.1
d7973f2 add TI license file
dbc629f Merge pull request #8 from Hashcode/cm-10.1
876bb79 add TI omap4470 PVR bins
c0f0d00 add proprietary files for NookHD/NookHD+
78752a8 Merge pull request #5 from steven676/cm-10.1
df58424 Don't ship audio components from the vendor blobs tree
c41244c Merge branch 'jellybean-encore' into cm-10.1
b9e09fb Merge pull request #4 from chrmhoffmann/cm-10.1
2e727a8 cm-10.1: fw for ducati and ti sits in acclaim. minor cleanup to sync with extract shell script
e7f62e2 Merge pull request #3 from chrmhoffmann/cm-10.1
6a38356 cm-10.1 review: setpropex as blob
2efc8c0 wlan: Upgrading firmware to R5.SP3.06
612752a cm-10.1: fix prop import
281fc90 cm-10.1: prop extraction
d9795b0 cm-10.1: prepare for nightlies
4db5e8b Merge pull request #3 from mateor/jellybean
1ef2f72 Move vendor files to proprietary/vendor
ea0e7e7 Merge pull request #2 from steven676/jellybean
c3d5675 Remove egl.cfg and libGLES_android.so from the tree
0528b8a Remove OMX blobs replaced by source builds from the tree entirely
e4f0f34 Remove obsolete blobs from repo entirely
023f4de Replace PVR userspace blobs with ones from Lenovo IdeaPad A1 ICS build
9bd1622 Don't install egl.cfg and libGLES_android.so
c610d6d Remove obsolete and unused blobs from install
e427663 Don't install a bunch of prebuilt codecs
1bc9632 encore-vendor-blobs.mk cleanups
2a57206 update DSP firmware for 720P
6adaa59 [PATCH] Increase PVR parameter buffer size
b1e720e Revert "install vendor blobs to /vendor"
f641dc9 install vendor blobs to /vendor
a2f746c fix libOMX.TI.720P.Decoder.so
0cf3639 update 720p decoder

   * vendor/broadcom
c6b1f5b Merge pull request #17 from nemith/cm10.1
4bcff92 Merge pull request #20 from burnsra/cm-10.1
0e69abd Toroplus: Binaries for Android 4.2.2 (JDQ39)
5729bd4 toro: Update props for Android 4.2.2 (JDQ39)
b56b1cd Merge pull request #19 from atinm/cm-10.1
e0d7e36 Updated to Android 4.2.2 (JDQ39) binaries
8efb157 Update tilapia to 4.2.2 binaries
9f8fba0 Merge pull request #15 from burnsra/cm-10.1
acd5d8d Toroplus: Binaries for Android 4.2.2 (JDQ39)
51b6969 toro: Update props to 4.2.2
2586269 Merge pull request #14 from burnsra/cm-10.1
898e689 Grouper: Binaries for Android 4.2/4.2.1 (JOP40C/JOP40D)
5dfa672 Toroplus: Binaries for Android 4.2 (JOP40C)
1068181 Merge pull request #13 from atinm/jellybean
98a41ef Added manta
8e86499 Merge pull request #11 from TeamRogue/jellybean
3f5512c Motorola Xoom (everest) binaries (based off wingray JRO03H)
c9e90f9 Motorola Xoom (stingray) binaries (based off wingray JRO03H)
bbf886e Motorola Xoom (wingray) binaries for Android 4.1.1 (JRO03H)
1875c31 Merge pull request #10 from burnsra/jellybean
2803434 grouper: Binaries for Android 4.1.1 (JRO03R)
f67d022 Revert "Update maguro bin file"
6249a6d Update maguro bin file

   * vendor/cm
a0919a9 Prevent stock OTA activities from running in CM
754bef5 sepolicy: Start CM Common sepolicy
ab97793 Fixed APN setting for LV LMT MMS
80cd7fe Correct BPL APN to Vodafone IN/India
589f128 Correct Claro PR APN
dcf176c Add C-Spire APNs
3019710 Drop Proxy from Digitel APN
de04aba Remove Proxy from Globul APN
869151c New apns settings for Everything Everywhere (new UK operator)
ba2ec9e android-vendor-cm: Renamed T-Mobile SK to Telekom SK in APNs list
8475d72 Rename Babel to VoicePlus
8994907 selinux: When adding userdata labels, do cache too
b52874d selinux: Use a more reliable sentinel to flag /data labelling
d2d1a7f Add SELinux filesystem relabeling to init
1f14343 Add Babel in preparation
5d4847b remove libGoogleAnalyticsV2. This is contained in external/google now.
f3c610a Merge "change APN for Orange countries" into cm-10.1
2978e20 cm: Add ntfs-3g and exfat tools to the build
bea29fd Correct 2Degrees APN
19425dd remove leading hypen from extraversion before adding one
c8a6193 ByTel, update to use recommended APN & fix MMS sending with B&You
d724377 update manta maintainers
6b098f6 Merge "cm: Include private signing keys if present" into cm-10.1
86c55be Merge "cm audio: update sounds, add new ones" into cm-10.1
5ab6b93 cm: Include private signing keys if present
8cb806c Merge "Add Lycamobile PT MVNO apn" into cm-10.1
34158a7 change APN for Orange countries
df0d20d APN: Update StraightTalk AT&T
b409a89 Bump version to 10.1.1-RC0
c79bca0 Merge "Fix Vip mobile APN" into cm-10.1
2617984 Add Lycamobile PT MVNO apn
b9409b1 cm: Fix default notification sound
79ba997 init.cm: Fix sysinit dependencies
c094975 Merge "apns-conf: update Personal Argentina APNs" into cm-10.1
e4d4a3c Merge "init.cm: make directory for ssh" into cm-10.1
605bb78 apns-conf: update Personal Argentina APNs
dbb169a cm audio: update sounds, add new ones
13a3760 cm: update maintainers for Samsung CDMA family.
19d9f78 Merge "Add Fido Canada LTE APN" into cm-10.1
41f9d86 update note 2 lte maintainers
f302728 cm: apns: correct proxy for orangeworld
733d775 Fix Vip mobile APN
e63c087 Add Fido Canada LTE APN
1f57b83 Contributors: add fireball maintainers
ce88540 init.cm: make directory for ssh
dca9861 add htc one maintainers
1c83328 Revert "cm: apns-conf.xml: (eHRPD/LTE handoff) Change pdp type for default APNs"
58bc76b repo bash completion: _find_repo: improve check
0c7371e Merge "apns: Add hollandsnieuwe (NL)" into cm-10.1
a09c056 cm: Add initial Galaxy S4 maintainers
0a0ea35 apns: Add hollandsnieuwe (NL)
c42e8b1 Fix Rogers LTE APN (broken mms)
fd4f49d add of Claro Puerto Rico LTE apn Configuration
0203fd7 Add Motorola OMAP4 Device Maintainers
e467935 MTNL apn fix
42f2db9 tell curl to be quiet in vendorsetup.sh
60bdf73 use curl like everything else on vendorsetup.sh
2b9c7cd Merge "cm: update maintainers for tsubasa, yuga, odin, t0lteatt, t0ltetmo" into cm-10.1
44ba0ac Remove comments before parsing vendorsetup.sh
97dc96f cm: update maintainers for tsubasa, yuga, odin, t0lteatt, t0ltetmo
d1ccb43 Fix Straight Talk T-mobile APN
6238e55 Merge "Add Ukrainian dictionary." into cm-10.1
e18b84b Contributors: fix typo
c9a872f Merge "repo.bash: replace with better version" into cm-10.1
d308210 repo.bash: replace with better version
6e043e2 Add TMOUS LTE APN
7a7185b CellBroadcastReceiver
643b330 Merge "Enable some CM options by default" into cm-10.1
853905c Merge "vendor/cm: New default wallpaper" into cm-10.1
1e0fbdd vendor/cm: New default wallpaper
4431ea1 Enable some CM options by default
e9c1561 cm: Enable cLock by default
b15f106 add libGoogleAnalyticsV2 target
b8e7c15 add bash completion script for git
635747a Contributors: Add tf700t devs
88401db Don't enable ADB authentication on eng builds
4f3c7e1 Use jpegOptimized bootanimations
a830556 add bash completion script for repo
b14edf3 Update Straight Talk ATT MMS proxy
49422de Add Ukrainian dictionary.
0fe9260 vendor: Remove CMFM themes app
e3dd237 contributors: add Galaxy R maintainers
71fcbe8 add i9305 maintainers
e662783 Merge "apns: update telekom DE to make LTE working" into cm-10.1
c1a5cc7 Merge "get rid of otapackage tools" into cm-10.1
38bf66e apns: update telekom DE to make LTE working
7959080 cm: 1080 pixel boot animation
b710947 Merge "cm: Update Android version in changelog" into cm-10.1
9d15c7a add SUPERUSER_PACKAGE_PREFIX in prep for switch to new superuser
48b5c97 get rid of otapackage tools
82d0fda prepare for switch to new superuser
7531f0f CM: Update contributors
4f61874 cm: Update Android version in changelog
0fcbbd9 apns: add "phone" APN for AT&T
59df363 Enable ADB authentication by default.
31a3bbf CM: Add general development contributors to list
73450a7 Chronus > cLock
9945178 Fix Simple APN
96ee150 Merge "Overlay: New hungarian dictionary" into cm-10.1
918a7ea Enable wireless Xbox 360 controller support
a57590d Update README for CM 10.1
397a99d Update Changelog
e2f7204 add i605/l900
a8fbd1c Overlay: New hungarian dictionary
e59a416 cm: cleanup
c43127d Merge "Remove whitespaces from apn type parameters" into cm-10.1
040148f add Galaxy Note 2 LTE (t0lte) maintainers
22122ea update readme and changelog
cc57dce Remove whitespaces from apn type parameters
0937db3 Merge "Revert "Fix copy JNI files of Term.apk"" into cm-10.1
e55fa7e Tele2.lv internet settings does not require proxy anymore
13e5cb0 Update path for build roster
7ce9d9e Revert "Fix copy JNI files of Term.apk"
f007403 Vendor: Add the LockClock app (part 2 of 3)
ee35e66 Merge "Trebuchet: Remove overlay" into cm-10.1
16fb9fe Trebuchet: Remove overlay
d6a6738 get-prebuilts: update Term.apk download URL
af96ba2 Merge "Fix copy JNI files of Term.apk" into cm-10.1
7718d2a Fix copy JNI files of Term.apk
901e885 Make output of md5sum more uniform.
3b460c3 cdma: Add Cricket LTE Apns
4cf6cd8 cm: added missing translators from jellybean branch
bd404d2 squisher: force hardlink.
47a84b2 squisher: link the target $OUTFILE.
6ed2e1b squisher: Get rid of it. The pngcrush tool does not add any noticeable value any more, such that it justifies the extra build time: 240MB vs 238MB. The build.prop changes are now no ops, since the key for ro.kernel.android.checkjni no longer exists. Changing the ro.build.type from eng to user is also a no op, since CM is now userdebug. Deleting bins is also unncessary now. Stripping modules is also unnecessary now. (plenty of space)
129989b backuptool: Disregard known bad backup scripts
5ae470e Merge "Add AT&T broadband apn" into cm-10.1
ed436c2 Merge "backuptool: only restore from same major.minor version" into cm-10.1
eb74521 Adjust vendorsetup to current build target location
e0b729e Remove jenkins build targets
81ce262 Add AT&T broadband apn
700fc8f backuptool: only restore from same major.minor version
98e3d97 Merge "cm: apns-conf.xml: (eHRPD/LTE handoff) Change pdp type for default APNs" into mr1-staging
e6e6163 cm: include minor version in CM_VERSION if not 0
da95d9f Add tilapia (Nexus 7 GSM)
2f46c96 Merge "jenkins: add manta" into mr1-staging
5a1c0e3 Merge "cm: Add mini tablet config" into mr1-staging
e340140 LatinIME: Add whitelists and shortcuts to the english dict
285d4c2 cm: apns-conf.xml: (eHRPD/LTE handoff) Change pdp type for default APNs
0a4d7d8 jenkins: add manta
fb9eb29 cm: Add mini tablet config
aacc160 Merge "cm: bump version" into mr1-staging
6698e5e init.cm.rc: Fix startup banner, and move sysinit here
ef30454 Rebuilt dictionaries from AOSP wordlists
909ce86 cm: bump version
77621a4 Adjust to 4.2 location provider config format
365894b jenkins: add p4wifi, p4vzw, p4tmo, p4 and p3
95b7614 cm: add Samsung Galaxy Note II (GT-N7100)
d542274 cm: Integrate jenkins-generated files if present
5394b36 cm: Add B&N NookColor (encore)
c35e7a6 cm: Prepare for release
3515e79 cm: Change the default sounds
b16a30f vendor_cm: Add CMFileManagerThemes
5d6867d cm: Update Android version in changelog
56f3250 jerkins: enable sony msm7x30 mogami targets
eca9dc9 update samsung maintainers
cfe8ad3 jenkins: remove p3113 and p5113 (dedup)
65361c1 LatinIME: Bulgarian predictive dictionary
669746a Merge "vendor: add Xperia T maintainers" into jellybean
7bd6121 cm: Build CMFileManager
faa36a9 add d2mtr to build target
83b2d81 add support for metropcs  LTE
270b76a Add p990 to build targets
56a66b6 cm vendor: add tf700t to jenkins-build-targets
c1d27de apns-conf-cdma: Remove Sprint CDMA MMS apn, conflicts with LTE/eHRPD service
8e8b477 built-targets: resort alphabetically
8f412cb cm: init.rc: Fix compcache and cleanup init file
b79e54f vendor: add Xperia T maintainers
62cb5a8 cm: Add UMTS 3G Xoom (everest) to build targets
39cb878 otatools: build-with-colors
260d3ac Added myself as a contributor for Italian translation
242141b cm: Add Acer A700
67a18b3 Add Sony Xperia T to Jenkins build targets
a58cdbc Add SGH-T769 to Jenkins build targets.
eb99493 add skyrocket/hercules to jenkins builds
37e05ec Merge "Added myself as contributor for Croatian translation" into jellybean
5c7de02 Merge "Add Galaxy Note Tab 10.1 (N8000 and N8013)" into jellybean
2526fef cm: Start bundling the updater
83eb6b5 apns: more love for Zain JO
d86b192 apns: update Zain JO
df4dbfe Added myself as contributor for Croatian translation
7d4082e Fixed the incorrect APN details for Telenet Mobile in Belgium as detailed in issue 6228.
a2887fc apns: update MTNL settings, unified for mumbai and delhi
37c3cea Add Galaxy Note Tab 10.1 (N8000 and N8013)
643e71a Merge "LICENSE: update year" into jellybean
dd36387 Add p970 to the jenkins build roster
d74bb33 cm: Add quincytmo to nightlies
1949eb5 cm: Build the commandline tools
5ed21af squisher: Don't set the OTAPACKAGE name
abfc079 cm: Compile Superuser from source
ff61dbe LICENSE: update year
74902fb Merge "fix for a typo in the comments of 50-cm.sh" into jellybean
320b73e fix for a typo in the comments of 50-cm.sh
7ec1af2 add endeavoru aka HTC One X to build targets
ed62094 jenkins: Add n7000 to build targets
fa2e25d apns-conf.xml: Add CSL (one2free) lte.internet APN
f2cd15c apns-conf.xml: Add CSL (one2free) mobile APN
fbedba0 apns-conf.xml: Add Rogers LTE APN
9a0ce16 Add Virgin Mobile CL apn settings
a69dc02 cm: Move wallpapers to a common_full Makefile.
59ff680 apns-conf: EE EMT MMS apn update
7914f33 Merge "APN: Fix GolanTelecom MMS APN" into jellybean
ab367e3 add p1c (Samsung Galaxy Tab 7" CDMA) to build-targets
5174188 APN: Fix GolanTelecom MMS APN
5295aee build-targets: add p1 gsm device
08e251a add mesmerizemtd to build targets
0f6d1f8 cm: Add stingray and wingray to build targets
2603cfd cm: Add epicmtd to build targets.
2621d14 added i777, i9100 and i9300 to build targets
efa2824 Changelog cleanup.

   * vendor/cm-priv
4fdfb49 Get back to regular test-keys whole-file signing
85d46fe Add private key stuffs

   * vendor/elan
b82af8e Merge pull request #1 from nemith/cm10.1
f9d1b42 Update tilapia to 4.2.2 binaries
04d076b grouper: Update binaries for 4.1.1(JRO03R)

   * vendor/google
6ae07f4 Add steelhead blobs

   * vendor/hardkernel
5ce0301 Remove Dice player from U2 blobs
625830d odroidu2: Initial blob commit

   * vendor/htc
03b5602 Merge pull request #6 from HoxPlusCMOfficial/cm-10.1
e1bd3f0 enrc2b: added audio libs from endeavoru
f811eca Added enrc2b proprietary files
4e49790 m7-common: update camera proprietary files
265303a m7-common: remove unused mfg.bin
0d23b6f m7-common: remove NFC firmware for on-chip version
c9dec4a evita: use original NFC firmware path
6986af0 m7-common: add Irda files
4bb3551 s4-common: fix typo in Widevine lib name
f9a4f1c s4-common: Add Widevine libs
94d4740 m7-common: Add Widevine libs
9388efa s4-common: use face detection libs from HTC m7
f4d21e6 s4-common: remove modem and q6 firmware
b971955 m7-common: GSM: update libpn544_fw.so from Google Edition
dcd42ed m7-common: remove unused llvm lib
e0e8079 m7-common: update proprietary libs to Google Edition
4dbf40d m7-common: remove extraneous proprietary files
d5b5c00 m7: update RT5501 config
6d855f0 evita: move QMI libraries to device-specific folders
df89bce ville: move QMI libraries to device-specific folders
7c77221 fireball: move QMI libraries to device-specific folders
7378962 jewel: move QMI libraries to device-specific folders
d1db4fe s4-common: move QMI libraries to device-specific folders
bc61589 fireball: use proprietary files from s4-common
7e62977 jewel: use proprietary files from s4-common, update files for 3.4
0578094 evita: use proprietary files from s4-common
0ad2ef4 ville: use proprietary files from s4-common
700dd64 s4-common: create new common vendor repo for HTC 8960 devices
370a7af evita: update C2D2 libraries
e6e3a81 evita: update modem to correct 3.17 firmware
8906b04 evita: re-add missing camera props
8242138 evita: rename camera library for camera wrapper
0bab758 evita: update C2D2 libraries Qualcomm version: AU_LINUX_ANDROID_JB_MR1.04.02.02.49.185
541dbf3 evita: update Adreno firmware Qualcomm version: AU_LINUX_ANDROID_JB_VANILLA_04.02.02.060.053
9dc3bf9 evita: update proprietary files Squashed commit of the following:
e8e4403 ville: update C2D2 libraries
9429ce9 ville: rename camera library for camera wrapper
8275dd3 ville: update C2D2 libraries
7a77efb ville: update Adreno firmware
05291e9 ville: update proprietary files
4ee571a m7: make proprietary file system dir implicit
14b18ef m7-common: remove HTC diagnostic binaries
58066ae Revert "m7: fix files on sbin"
4c29329 m7: fix files on sbin
2f855fa m7: update bt and wifi firmware from 2.17.401.1
8eb411c m7spr: remove libril blob
a3f9453 jewel: remove libril and rild blobs
3173fc1 m7: improve common proprietary file handling
6c31b67 m7ul: rename from m7 to m7ul
c42d4a1 m7spr: rename from m7wls to m7spr
0b4a6cf m7: remove nfc blob
d2802a8 m7: use c2d2 libs from jf
b81a4f3 m7: don't use proprietary libril
27b8fa9 Merge pull request #3 from htc-msm8960/cm-10.1
20f5496 m7: move vendor nfc props to device specific repos.
906a300 Merge pull request #2 from intervigilium/cm-10.1
3465663 m7-common: remove unneeded adreno firmware
096916c m7-common: regenerate makefiles from script
def48c4 m7-common: remove unneeded egl.cfg
7405b59 m7-common: remove non-b0 wifi firmware
1168cf5 m7-common: no need to copy libmmjpeg, we are not building the HAL
9fba775 m7-common: remove chromatix libs for non-m7 sensors
83b0e73 Merge pull request #1 from intervigilium/cm-10.1
53fa768 m7-common: update C2D2 libs from Qualcomm
e4c5cb2 m7: add blobs from 1.29.1540.3 developer RUU.
755646c ville: remove hostapd

   * vendor/imgtec
af48186 Merge pull request #16 from djMesias/cm-10.1
786d32b Maguro: Update binaries to 4.2.2 (JDQ39)
dee00bc Merge pull request #14 from burnsra/cm-10.1
204b1be Toroplus: Binaries for Android 4.2.2 (JDQ39)
5d01376 toro: Update props to 4.2.2
537d9c2 Merge pull request #13 from burnsra/jellybean
c444b32 crespo: Remove incorrectly added file

   * vendor/invensense
f932bba Merge pull request #7 from nemith/cm10.1
75ea07f Update tilapia to 4.2.2 binaries
601fbe5 Merge pull request #6 from burnsra/cm-10.1
1fd6b29 Grouper: Binaries for Android 4.2.2 (JDQ39)
04ac2ce Merge pull request #5 from burnsra/cm-10.1
1e65469 Grouper: Binaries for Android 4.2/4.2.1 (JOP40C/JOP40D)

   * vendor/lge
20eb4a0 p760: Update radio libraries
b9175cd e975: Switch to JB_VANILLA adreno drivers
d53ef22 e975: Move QMI messages to radio log
6b0e36b p880: Change radio data bootstrap
cac3d77 Add missing keymaster firmware.
a77036d p880: Updated blobs from new 4.1 OTA
a46dff3 Add p880 proprietaries
c3387d3 e975: Switch thermald
15d5a57 Add e975 blobs
088c032 Add p760 blobs
b551496 add vs920
918e8e1 mako: Updated to 4.2.2 binaries
a27cb2b iprj: Update adreno blobs
e34c974 p920: Updated blobs for ICS
2b5fb5a Add mako props
0fbde37 p990: Updated audio HAL
81169b3 p990: Switch radio libraries again
f1921d5 Remove props for devices without support beyond gingerbread
20499c2 p990: Rename radio library
6a02a9e p990: Add speexrate blob
a4347c3 p990: Refresh blobs
fd1a138 p990: Updated blobs for ICS
5c01398 p970: Remove OMX and DSP blobs
078c450 p970: Updated audio blob
0a379fd p970: Switch MPL implementation
8f0a92f Updated B-Proj props for ICS
61e270f Merge branch 'jellybean' of github.com:TheMuppets/proprietary_vendor_lge into jellybean
52c381a p930: Updated camera blob

   * vendor/motorola
af5cae2 Merge pull request #53 from Motorola-OMAP4-CM/cm-10.1
dac29ba umts_spyder: Use gps.spyder from spyder 9.8.2O-72_VZW-16
4cc3db4 Merge pull request #49 from razrqcom-dev-team/cm-10.1
815f7f4 Merge pull request #51 from Motorola-OMAP4-CM/cm-10.1
707461e Merge pull request #1 from Atrix2-Dev-Team/cm-10.1
af78d60 xt926: add updated firmware from 9.8.1Q-79 and Baseband
1de176f fix gps.umts_spyder location and spelling
626a201 edison: update to match extract-files
aa6095a edison: add more blobs to build
4eac59e xt925: Add baseband and firmwares from 9.8.2Q-50-XT925_VQLM-21
7bb9d1a Merge pull request #50 from Motorola-OMAP4-CM/cm-10.1
27e4f44 update maserati bins from 4.1.2/9.8.2O-72_VZW-18
0a67477 omap4-common: fix ifdef
0fd2699 Update makefiles to match extract-files.sh
6c8097f 9.8.1Q-79 blob update
029a739 msm8960-common: sensors.qcom: kill the log spam
d2889e3 msm8960-common: xt926 9.8.1Q-79 xt926 blob update
d81f160 msm8960-common: vendor-camera: Fix up extract-files for copying to destination
fede94f msm8960-common: gps: use Motorola libloc_api_v02.so
c86b5c4 msm8960: Use mmosal from jf
535b7f4 msm8960: Use vidc_1080p.fw from jf
2d5de7b msm8960: Fix derp
2a82f88 msm8960: Add libExtendedExtractor from jf
d9e9a33 msm8960: Use C2D2 from jf to be compatible with libcopybit
e106b89 msm8960: Rename camera HAL to vendor-camera for camera wrapper
a2edf4d Add Motorola msm8960 devices
a7a78d1 Merge pull request #47 from Motorola-OMAP4-CM/cm-10.1
f104003 edison: Use audio libs from spyder JB 4.1 release
7c170fb Targa & Solana: Use targa gps lib to match audio.primary
d4b2f18 Merge pull request #46 from Motorola-OMAP4-CM/cm-10.1
0b0d146 OMAP4 Devices: Uses device specific 4.1 audio.primary and ap_gain
c2b19e9 Merge pull request #45 from Motorola-OMAP4-CM/cm-10.1
10d1d40 speakerphone fix
da0a60f Merge branch 'cm-10.1' of https://github.com/Motorola-OMAP4-CM/proprietary_vendor_motorola into cm-10.1
25731ae Merge pull request #44 from Motorola-OMAP4-CM/cm-10.1
534cef3 OMAP4: audio typo
4d90b18 Remove accidental subprojects
1d3eedf Merge pull request #43 from Motorola-OMAP4-CM/cm-10.1
c110b60 OMAP4 audio: Derp moved the wrong file
25f96cf edison proprietary files
804215d Merge pull request #42 from Motorola-OMAP4-CM/cm-10.1
12da49b Fix audio ...
4674e9c Merge pull request #41 from Motorola-OMAP4-CM/cm-10.1
f5e94c7 targa solana: more audio fixes
eda5a36 targa solana: Fix speakerphone with targa 98.72.22 JB blob
80fbcfd Solana: update with targa 98.72.22 JB props
93b9f90 targa: Update blobs to 98.72.22 JB
67284ec Merge pull request #40 from Motorola-OMAP4-CM/cm-10.1
d3cc5cb umts_spyder: update with 982.124.14 blobs
90ecee0 Merge pull request #39 from Motorola-OMAP4-CM/cm-10.1
0d96d90 solana: fix missing files from device merges
53ce462 Merge pull request #38 from Motorola-OMAP4-CM/cm-10.1
eb42fd9 OMAP4: Remove duplicate files
4781c6c OMAP4: Add imgtec License file
65efb3e Maserati: 98.72.18 binary update
525f6ec Merge pull request #37 from Motorola-OMAP4-CM/cm-10.1
ed368b1 OMAP4: libsensorhub_jni is device specific
5586879 OMAP4: Use device specific akmd8975
43af967 OMAP4: pvr bins from omapzoom: IMG DDK 1.9@2166536
9e0c22c OMAP4: Use common props from spyder 98.72.16 JB 4.1.2 ota
e7fbccf Merge pull request #36 from Motorola-OMAP4-CM/cm-10.1
ea05511 Update with 98.72.16 JB 4.1.2 props
7b375fa Merge pull request #35 from Motorola-OMAP4-CM/cm-10.1
a92efc9 OMAP4: Update blobs to fix Bluetooth audio and speaker phone
2b0fde6 Merge pull request #34 from Motorola-OMAP4-CM/cm-10.1
7e3f467 OMAP4: Clean up unneeded blobs for all devices
38b248c Merge pull request #33 from Motorola-OMAP4-CM/cm-10.1
067f121 umts_spyder: remove useless camera files
ea4cc75 targa: remove useless camera files
fa12300 spyder: remove useless camera files
eba8faa maserati: remove useless camera files
64b9968 fix trailing slash
b3742fe Add props for Motorola solana
83c5130 Use MR0 audio from spyder 9.8.20 leak on all devices
9dfdbd8 Add props for OMAP4 motorola devices
2754eef stingray: fixed for JB 4.2
0b8c493 everest: remove libril
c13eb02 Remove devices which are sure to never get cm10
0563220 everest: Bring more in line with stingray
9abcd37 wingray: Updated files from JZO54K
fbdc159 everest: Add widevine stuff
a582009 stingray: Add widevine stuff
ee84575 wingray: Add widevine stuff
2c8addb everest: Clean up props
e3de354 everest: Reorganize files
0931f0b stingray: Reorganize files
fee4c8f wingray: Reorganize files
1244945 everest: Updated files from JRO03H OTA (wingray)
bb05ad3 everest: Go back to Honeycomb RIL for now
9ec50a3 everest: Vendor files from Telstra MZ601 (I.7.1-42)

   * vendor/nvidia
1fa0832 fix
9e84a32 fix
a3e2188 Merge pull request #6 from nemith/cm-10.1
c6e0b21 Merge pull request #7 from burnsra/cm-10.1
99c63af Update tilapia to 4.2.2 binaries
a5aacd0 Grouper: Addition of tf_daemon
f63a561 Grouper: Binaries for Android 4.2.2 (JDQ39)
6832613 Merge pull request #5 from burnsra/cm-10.1
5907261 Grouper: Binaries for Android 4.2.2 (JDQ39)
844a920 Merge pull request #4 from burnsra/cm-10.1
d12677e Grouper: Binaries for Android 4.2/4.2.1 (JOP40C/JOP40D)
865d512 Merge pull request #2 from TeamRogue/jellybean
1c1f80e Motorola Xoom (everest) binaries (based off wingray JRO03H)
fea962d Motorola Xoom (stingray) binaries (based off wingray JRO03H)
2972d03 Motorola Xoom (wingray) binaries for Android 4.1.1 (JRO03H)
462b70a Merge pull request #1 from burnsra/JZO54K
cf7a537 Binaries for Android 4.1.2 (JZO54K)

   * vendor/nxp
11e8164 Merge pull request #9 from nemith/cm-10.1
5c73e7a Update tilapia to 4.2.2 binaries
585f10f Merge pull request #8 from burnsra/mr1-staging
16f056c Toroplus: Binaries for Android 4.2 (JOP40C)
7f40007 Add maguro props for 4.2
b9e0862 Galaxy Nexus (Verizon) binaries for Android 4.2 (JOP40C)
1085551 Merge pull request #6 from burnsra/JZO54K
f098423 grouper: addition of nfc related files

   * vendor/oppo
1c7b331 Add libacdbloader, libaudcal from Color 4.2
37a29aa Update camera blobs from Chinese 4.2 Color ROM
34dc616 JB_VANILLA Adreno drivers from QDevNet
9e84ee7 find5: Blob is also vendor-camera
189e900 find5: Push camera blobs as vendor-camera
3073b15 find5: Ooops, forgot libAKM
31a58fc Revert "keymaster"
b4c7996 keymaster
b07b42e nfc: Use blob temporarily
65008a4 camera HAL: Reorder in .mk file
5dd4cc3 find5: Camera blobs
c0a571c find5: Add mpdecision and thermald
c7f2e1b Merge branch 'cm-10.1' of github.com:teamgruntled/proprietary_vendor_oppo into cm-10.1
8d72e52 find5: add nfc firmware
5c9ccc6 find5: Add GPS blobs
69841f0 Fix typos in destination name for libqmi stuff
ddc6236 find5: Add video firmware
bbca37e Remove WLAN blobs for the time being
d3eee54 Please increase my amount of sleep D:
712774c find5: Add last ril blobs
485dd64 Underp^2
e3ebd7c Underp netmgr
691da81 find5: add more blobs
2fef0a4 Add more blobs from bin/
1d5fe99 sensors: typo
bb719dd update QMI-related blobs from stock
241b9b2 Add efsks and ks binaries
943f1f8 Blobs from stock /firmware/image
e13beb7 Update q6 fw blobs from stock.
90b76b7 remove wcd9310 hax
97f2bd5 sensors
705a9f7 find5: Put libacdbloader in both obj and out
b4fe2aa find5: Add prima blobs
c2b9feb find5: Add qcks binary
a02af20 find5: Put acdbloader in obj/lib
9081606 find5: Add audio blobs
bcafb66 Import Oppo graphics proprietary files

   * vendor/samsung
da0d7b2 Merge pull request #280 from arco/cm-10.1
71239ea serrano: Blob updates from MH1
a5a0612 Merge pull request #278 from arco/cm-10.1
d04f53c Use libloc_api_v02.so from Mako
67b081e serrano-common: Remove NFC firmware
affbe2a Merge pull request #273 from dastin1015/cm-10.1
fe4b955 d710: update JB blobs for cm-10.1
489846e Merge pull request #256 from invisiblek/cm-10.1
9a9d82b Merge pull request #246 from Kick-Buttowski/cm-10.1
525c9eb Merge pull request #266 from arco/cm-10.1
2b66623 Initial commit for serrano
be4f43b d2att: update rilblob (UCDMG2)
84c4a04 Merge pull request #252 from SGH-I577/cm-10.1
ff9ccad add i577 support
3523ae8 Renamed camera libs to implement CameraWrapper in device tree
9a64632 Merge pull request #230 from sbrissen/cm-10.1
a0bd5d6 Merge pull request #243 from Kick-Buttowski/patch-3
8a8bf56 fixed another derp
ffdfbae Merge pull request #242 from Kick-Buttowski/patch-1
587b59d fixed a derp
8e0924c updated to use open source libril
1aaacad Merge pull request #241 from sam3000/cm-10.1
514ffe1 jf-common: jf-common-vendor-blobs.mk update to match extract-files.sh
72f1dfc jf: upgrade ril to  intl MGA and upgrade jfltetmo to mdl
07e4682 jf: update mf3 ril and rename && combine ril
dbaeea5 add n5110 support and update smdk4412 wifi firmware
8d851d0 Merge branch 'cm-10.1' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
8c4ff65 Merge pull request #240 from invisiblek/cm-10.1
18c33b1 d2-common: bcmdhd: update firmware to 6.10.58.93
fb64084 Merge branch 'cm-10.1' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
d87455f exynos: update mali r3p1-01rel1 BUILD_DATE=Tue Jul 2 15:06:24 KST 2013
b2bd458 Merge pull request #239 from garwynn/cm-10.1
43bfd19 Update jflter970 to C-Spire MFA
bf24df8 t0ltecdma: revert ril blobs
2ccf5e2 jf: upgrade audio blobs to sprint's mf9
4ffbb6c i9103: libsecril-client.so
fd93ea5 jf:upgrade to mf9 ril
2f44f69 Merge branch 'cm-10.1' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
4d99af6 n7100: remove ril blobs
936cd46 n80xx: remove ril blobs
8fb3319 i9103: remove libril
d3af7b1 Merge pull request #238 from Jiangyi/cm-10.1
7e3ff44 jf: bring back samsung ril. problems with slow data on certian modem
6c9fa38 SGX-BIN: DDK binaries and KM source 1.9@2291151
eed3c81 jf: commonize ril blobs
65f0117 Merge pull request #236 from invisiblek/cm-10.1
a9f76b1 jf-common: copy nvram to _murata as well
f38d793 jf: Update some blobs from GED release
52fffa4 jf/d2: Remove thermald configurations
3c5aabe jf: Add WCD9310 firmware
0e57eba p4: sync with pershoot (github.com/pershoot/android_vendor_samsung_p4)
570c35c p4tmo: sync with pershoot (github.com/pershoot/android_vendor_samsung_p4tmo)
48c9da5 p4vzw: sync with pershoot (github.com/pershoot/android_vendor_samsung_p4vzw)
0c923df p4wifi: sync with pershoot (github.com/pershoot/android_vendor_samsung_p4wifi)
af688d8 Merge pull request #233 from slayher/cm-10.1
9db023d Merge pull request #234 from invisiblek/cm-10.1
6662b00 jf-common: re-add murata
47ac8f8 google samsung mfd upgrade
59492de smdk4412-common: add support for i925
c6798b3 Merge branch 'cm-10.1' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
f5c328a smdk4210: update mali r3p1-01rel1 BUILD_DATE=Mon May 13 15:55:05 KST 2013
ca07097 smdk4412: update mali r3p1-01rel1 BUILD_DATE=Mon May 13 15:55:05 KST 2013
a93c9f4 Correct filenames to ensure correct blobs get copied.
dd02b57 Merge pull request #231 from invisiblek/cm-10.1
fcfd381 jf-common: revert libcsd-client.so
4eb5d2d p4notelte: add support for p4notelte(common) and i925 (vzw note 10.1 lte)
2dd14d6 Merge pull request #229 from invisiblek/cm-10.1
d3ded4a add jaspervzw
e954563 add pn544fw stuff
6dc66b3 fix apexq ril
ac1fe59 fix script screwup
64c87df add more stuffadd more stuff
44cbda8 add apexqtmo
77ec274 Merge pull request #228 from sbrissen/cm-10.1
5249c89 t0lte: remove RIL blobs from common props
67cfb07 Merge pull request #227 from invisiblek/cm-10.1
fb6f562 jf: add murata nvram
a914396 Merge pull request #226 from Adam77Root/cm-10.1
a9dbad7 i9103: remove unused blobs, prepare for camera wrapper
58b0066 Merge pull request #225 from invisiblek/cm-10.1
fbc45ee d2: let's build macloader instead
f86bddf Merge pull request #224 from invisiblek/cm-10.1
f790e8f Merge pull request #223 from invisiblek/cm-10.1
db8e4c7 jf: remove macloader, we'll build it instead
87f68c0 jfltexx: fix naming derp
00dbe7a Merge pull request #222 from invisiblek/cm-10.1
9681ec7 Revert "jfltevzw: use our own rilblobs. enjoy working gps"
044d9b9 Merge pull request #218 from iurnait/cm-10.1
50f2190 Merge pull request #221 from invisiblek/cm-10.1
502fef7 jfltevzw: use our own rilblobs. enjoy working gps
d8133f3 Merge branch 'cm-10.1' of github.com:invisiblek/proprietary_vendor_samsung into cm-10.1
8c2cd9a d2r530: MD6 rilblobs
c0182df Merge branch 'jf' of github.com:invisiblek/proprietary_vendor_samsung into cm-10.1
ecda657 qcom: update c2d2 lib
044919d jfltexx: update rilblobs
6e2062d jfltexx: update rilblob
620052c d2: update c2d2 blobs
0040206 jf-common: update blobs
8e351c4 d2: fix name
ec0cac9 Merge pull request #219 from invisiblek/jf
d89f7ad jf: move R970 props to a common dir
75bcaa8 Add vendor files for the Samsung Galaxy Player 5.
29b5556 Merge pull request #217 from sbrissen/cm-10.1
8c281c5 t0ltecdma: clean up now that we share props from t0lte
5d78be9 d2/jf: Add missing media lib
a731e5c Merge branch 'cm-10.1' of github.com:TheMuppets/proprietary_vendor_samsung into cm-10.1
1500ccc d2: revert adreno firmware
1a088b4 Merge pull request #216 from mkasick/cm-10.1
8bafea1 jf-common: Update libloc_api_v02.so to jfltespr MDL.
88e9409 Merge branch 'cm-10.1' of github.com:TheMuppets/proprietary_vendor_samsung into cm-10.1
0c0336b d2: update all to MDx RILs.
db350ff jf: Use stock csd-client library
49bf949 jfltexx: initial commit of GT-I9505
15a48e9 d2: update to VRBMD3 blobs (d2vzw)
616b7fe i9305: update libloc_api_v02
f6b8a72 Merge branch 'cm-10.1' of github.com:TheMuppets/proprietary_vendor_samsung into cm-10.1
59456a7 jf: align with vanilla adreno blobs
03827e0 Merge pull request #208 from sbrissen/cm-10.1
bb507e5 t0ltecdma: update props from vzw I605VRAMC3
1f16abe Merge branch 'cm-10.1' of github.com:TheMuppets/proprietary_vendor_samsung into cm-10.1
002ea4a jf: fix naming and update ril to MDL
f80ac47 Merge pull request #214 from attn1/cm-10.1
eda58a3 added jflteatt
99faee1 add jflteusc props
f02a2ce i9100g: remove blob libril
8bd7271 p3100, p5100: remove blob libril
9894389 Revert "Revert "i777, i9100, n7000: remove rild and libril blobs""
c389a8b Revert "i777, i9100, n7000: ifdef ril blobs"
b291692 i777, i9100, n7000: ifdef ril blobs
3b14408 Revert "i777, i9100, n7000: remove rild and libril blobs"
43c16bc galaxys2: remove prebuilt hostapd
05d746a i777, i9100, n7000: remove rild and libril blobs
82b0680 Merge pull request #213 from invisiblek/cm-10.1
d10ef1d jfltespr: initial commit
c263f7d jfltevzw: use spr rilblobs
1c3f4bb Merge pull request #212 from invisiblek/cm-10.1
a5052c8 jfltevzw: initial addition
d2cc5f8 qc: New C2D2 library
7aecdda hercules: Update to UVMC6
504c6cc Merge branch 'cm-10.1' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
08db5b6 galaxys2: update mali r3p1-01rel1 BUILD_DATE=Mon May 6 11:20:56 KST 2013
1e9b984 exynos4412: update mali r3p1-01rel1 BUILD_DATE=Mon May 6 11:20:56 KST 2013
94069be Revert "qc: Fix copybit"
492ee69 qc: Fix copybit
5571a0f Merge branch 'cm-10.1' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
c76bbc6 Merge pull request #209 from Jiangyi/camblob
26a8093 smdk4412-common: Add ZM camera blob
9bce105 t0lte: update libloc_api_v02 for updated gps commit (http://review.cyanogenmod.org/#/c/37051/1)
0e12655 Merge pull request #207 from mkasick/cm-10.1
721000e d2-common: Update libloc_api_v02.so to d2spr MD4.
67ade7e Add jfltecan blobs
2011538 jf-common: Remove NFC module
31df2fe jf: Add JF blobs
878e6c3 quincy: Update blobs
053cad5 d2: Readd extra camera firmware
40d71d4 quincy: Update WiFi firmware
6b87633 msm8660: New Adreno driver
31e0c24 d2: update blobs
5ae6836 msm8660: Update blobs
e67fdd4 Merge pull request #203 from invisiblek/cm-10.1
a57903e d2vzw: update rilblobs (VRBMB1)
f7f0b86 i9300: use opensource libril
4b214cd Revert "d2: Update Adreno driver"
5ff47e3 Add t0lteatt/t0ltetmo blobs
cd809a5 d2: Update Adreno driver
11f1c48 Merge pull request #202 from Adam77Root/cm-10.1
241118e Update i9103 blobs
e8768ff Merge pull request #201 from alanorth/smdk4210-tabs-cm10.1
c1fad2c t0ltecdma: use qcom gps hal
3ccfede i9305: use qcom gps hal
ab4aa9b t0lte: use qcom gps hal
d1ad26f smk4210-tab: Update Mali blobs to r3p1-01rel1
a27b160 smdk4210-tab: Switch to open source libsecion
91d240e Merge pull request #200 from jt1134/cm-10.1
7ede8ba p1-common: use opensource libGLES_android.so
1e584b8 smdk4412: add SlimISP_BH camera fw
52cf4e4 Merge pull request #199 from pawitp/cm-10.1
e279577 aries-common: remove libGLES_android.so blob
5316e9d d2: upgrade adreno fw to 2.5.1 release
7f76dfd i777, i9100: update RIL to LSJ
afe3391 smdk4412: remove prebuilt mr0 hostapd
97ab9f1 smdk4412: camera firmwares are common
47a863a msm8660/msm8960: Update C2D blobs
8498c0d toro: Update additional props for Android 4.2.2 (JDQ39)
36bef33 i9305: inital
0feecba Merge pull request #197 from epsylon3/cm-10.1
256dbd1 i9103: add blobs for cm-10.1
1e863b9 toro: Update props for Android 4.2.2 (JDQ39)
18ddef4 i777: update ril from i9100
43c6e7a i777: update akm lib
ae5e8c4 galaxys2: use opensource libsecion
b21f134 smdk4412: use opensource libsecion
6edf5a7 smdk4412: cleanup
f671ec5 galaxys2: update mali to r3p1-01rel1
08238a8 smdk4412: update mali to r3p1-01rel1
2d56ac3 smdk4412: use mr0 hostapd
bcce997 galaxys2: use mr0 hostapd
722433c i9100g: use mr0 hostapd
1346d4d p31xx, p51xx: use mr0 hostapd
63181f1 n7000: update ril and gps blobs from LSZ
f14f133 galaxys2: split wifi blobs, update n7000 wifi blobs from LSZ
10135e0 i9100: underp
6a083a7 i9100, i777, n7000: samsung jb blobs
a8b2890 Merge pull request #191 from djMesias/cm-10.1
565d38c Maguro: Update binaries to 4.2.2 (JDQ39)
4e7cf5c Merge pull request #190 from burnsra/cm-10.1
643cd9f Toroplus: Binaries for Android 4.2.2 (JDQ39)
8ee1c97 toro: Update props to 4.2.2
8ac5ba6 msm8660: Update blobs
29d809c smdk4412: dont use prebuilt hostapd, keyfiles cleanup
1f502e2 p31xx, p51xx: add smc blobs
9c894df p31xx, p51xx: blobs from JB update
61d441e Merge pull request #189 from kornyone/cm-10.1
8220700 manta: update blobs for 4.2.2
69798e7 d2: adreno blobs update from 4.2.2
e013600 i9100g: update blobs from LSD, add omap4 common blobs
e4488eb i9100g: update ril from LSD
f875734 i9300: add SlimISP_ZH.bin camera fw
7c70b8c hercules: Update to UVLI4 blobs for radio and audio
9d3412b quincy: Update blobs
a5559d3 hercules: Fix path to NFC blob
9382eae Merge pull request #187 from TeamChopsticks/cm-10.1
9db9cb9 hercules: Fix NFC
ecd0c1f skyrocket: Fix NFC
e9db67e smdk4412: add i9305
644a4d3 d2: Update blobs
0caa2f5 Merge pull request #185 from sbrissen/cm-10.1
c2e91c2 Merge branch 'cm-10.1' of https://github.com/sbrissen/proprietary_vendor_samsung into cm-10.1
27be7bb add libsecnativefeature - used for cam and smdexe
2210450 add libsecnativefeature - used for cam
f4c5dad Merge pull request #184 from sbrissen/cm-10.1
e87c72d add support for R950
ed3a53b smdk4412-common: delete nfc blob from updating. This prevent the firmware updater component from crashing. Not needed for startup nfc because nfc has it own firmware to update.
b91b7cc hercules: Update blobs
db3b8d4 skyrocket: Update blobs
fc03d29 t0lte: remove audio blobs
0901817 Merge pull request #183 from sbrissen/cm-10.1
6f6433f t0ltecdma: use opensource audio
76a2022 Merge pull request #182 from fuhry/cm-10.1
c02e905 Add "SlimISP_ZH.bin" firmware file from my fairly recent d2tmo
3267e05 n7100: update camera firmware
1114183 i9300: update camera firmware
cd2866b Merge pull request #180 from alanorth/cm-10.1-tabs
6c09ec9 Update props and configs for Tab 7 Plus variants
2d70009 i815: add sirfgps
a55973a p68x0: update for camera wrapper and gps
a4f5749 p68x0: build libsecril-client from source
107d646 i815: update for ril bringup
0e77288 smdk4210-tab: libwvm
ded4a5f smdk4210-tab: libUMP package stub
3956658 smdk4210-tab: switch to opensource audio HAL
238eddd smdk4412: cleanup
bbf6af0 smdk4412: update bt and wifi firmware
31d1624 Merge pull request #181 from sbrissen/cm-10.1
b7ca70a add t0ltecdma support
987b666 t0lte: initial
ab8ad68 p3: sync with pershoot
d3a59e0 p4: sync with pershoot
8b3ef6f p4tmo: sync with pershoot
badaa0e p4vzw: sync with pershoot
dae4cef p4wifi: sync with pershoot
49a67d5 smdk4412: add t0lte
53c6c7f p1-common: move BT firmware to proper location for 4.2
81e492f p3: sync with pershoot
d6a19aa p4: sync with pershoot
85f6610 p4tmo: sync with pershoot
5ff46b2 p4vzw: sync with pershoot
5c3430e p4wifi: sync with pershoot
db9aeec d2att: update to  lk3 blobs
fd4acc9 d2: unconsolidate
c5488d1 d2: do not consolidate libril
4f622a3 Revert "d2: don't consolidate qmiproxy"
54dde12 Revert "d2: fix backslash"
23a5e3f d2: fix backslash
1d7697d d2: don't consolidate qmiproxy
3bbff87 d2: add camera blob back
ec40636 Merge git://github.com/invisiblek/proprietary_vendor_samsung into cm-10.1
0b3c6ce d2: update to usc lk5 sources and use nexus adreno firmware`
0a85c32 d2: update to d2usc's LK5 blobs
bda331b d2: consolidate ril blobs
bfc30f4 d2: fix this mess
09a9dd8 d2: add newer camera binary for support on later revision of the galaxy s III
b16fcf3 Merge branch 'cm-10.1' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
4a37d23 d2: clean all the things!
5d0a6ee Revert "p1: update BT firmware"
b441b5b d2: fix  compile
b1889f9 d2: add missing ril blobs
c305523 Merge pull request #175 from invisiblek/cm-10.1
6806b77 d2tmo: forgot a blob in d2tmo-vendor-blobs.mk that doesn't exist anymore
42b6058 Merge pull request #174 from invisiblek/cm-10.1
c68ce84 d2: fix spacing problem
26d1c5a Merge pull request #173 from invisiblek/cm-10.1
486db2c d2vzw: underp from last commit
6847e52 d2-common: move more ril stuff back to individual trees
e63537b p1: update BT firmware
7a591cd d2: move all common props to d2-common
a029e11 d2: on some devices nfc firmware aren't updated because the current is the same as file and never updated
189c7f7 Merge branch 'cm-10.1' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
6323cf2 d2: refix nfc blobs
ad0b082 Merge pull request #172 from pawitp/cm-10.1
6d6e01b aries: copy modem in vendor/
2bde841 fix d2 inheritants
3f748a2 consolidate d2r530 family
600be0a Merge branch 'cm-10.1' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.1
6ae8b8b d2: update usc blobs
c65e91e p31xx/p51xx: rename camera module for use with wrapper
d1d03d7 d2: Update blobs
08725a0 Merge remote-tracking branch 'origin/mr1-staging' into cm-10.1
2e4fe19 Remove devices which are sure to never get cm10
ed0892e d2tmo: Update blobs
eed849c p1: copy bt fw to /vendor/firmware
4de91e4 d2spr: remove binary blobs for gps hal
abeafcd Merge pull request #171 from invisiblek/mr1-staging
2433e86 d2vzw: revert to 4.2 adreno blobs
f5bec86 Merge pull request #170 from invisiblek/mr1-staging
90be836 d2vzw: cleanup after VRBLK3 update and remove gps
bf7a8b4 Merge pull request #168 from invisiblek/mr1-staging
065d981 Merge pull request #167 from alanorth/smdk4210-tab
4e4bbf5 d2vzw: update to VRBLK3 blobs and cleanup
ca14cf5 Merge branch 'mr1-staging' of git://github.com/TheMuppets/proprietary_vendor_samsung into mr1-staging
b95ce8b d2spr: cleanup blobs
cffc5d7 smdk4210-tab: Cleanup old blobs
458cf69 Merge pull request #165 from alanorth/smdk4210-tabs
878f73f smdk4210-tab: Updates for mr1
d806c12 d2att: Update blobs
ee75c75 i927: add blobs
cba2bf7 Merge branch 'mr1-staging' of git://github.com/TheMuppets/proprietary_vendor_samsung into mr1-staging
7a74326 d2: add newer adreno blobs
4bf5dbe Remove maguro libs that are already present on nxp repo
2cea75b Merge branch 'mr1-staging' of git://github.com/TheMuppets/proprietary_vendor_samsung into mr1-staging
ad67eb6 d2spr: add jb blobs
c0e6437 Merge pull request #164 from burnsra/mr1-staging
39e79f2 Toroplus: Binaries for Android 4.2 (JOP40C)
2ac96cb n7100: Remove sensorservice prebuilt
7662d7c galaxys2: update for mr1
ed27b67 smdk4412: use opensource gralloc and hwcomposer
9000371 Merge pull request #162 from atinm/jellybean
aeec2ee Added manta
165420c d2spr: jb update
1c355a2 Merge branch 'mr1-staging' of git://github.com/TheMuppets/proprietary_vendor_samsung into mr1-staging
d510289 d2: Update Adreno blobs
1e1c4ff Add widevine vendor to makefiles for 4.2
1e8d2ca Update maguro blobs to 4.2
7a22546 toro: Replace lib_gsd4t.so with previous version
a3accca Galaxy Nexus (Verizon) binaries for Android 4.2 (JOP40C)
b50713a Update d710/BoardConfigVendor.mk
0b9dfc6 Update d710/BoardConfigVendor.mk
ab87c9f Merge pull request #159 from UberPinguin/jellybean
07c71fe t769: Relocate NFC firmware to hardcoded path.
5f818ad Merge branch 'jellybean' of github.com:TheMuppets/proprietary_vendor_samsung into jellybean
4ff216f add nexus 4 adrenoblobsw
f60c010 Merge pull request #155 from jt1134/jellybean
8544275 Merge pull request #157 from Utacka/jellybean
36fcf9f More derps
0fd6bc1 n7100 dont share sensor blobs with i9300/n80xx + fix derps
9246ac0 Merge pull request #156 from Utacka/jellybean
73a1aa7 Rearrange to proper order
dfbe427 Merge pull request #154 from Utacka/jellybean
b53f3f0 Revert "d2vzw: update nfc props from VRBLI5"
5db7c97 mesmerizemtd: update pppd_runner; fix issues with 3G dropping
e015960 n7100 dont share common gps blobs with i9300/n8xx
8d74152 Merge pull request #153 from Utacka/jellybean
4284861 Update libpn544_fw.so from stock n7100, to fix nfc. Also moved i9300 nfc to i9300 vendor to not break it.
8585531 Merge pull request #151 from TeamChopsticks/jellybean
2f3f1c1 p3: sync with pershoot
8c45d34 p4: sync with pershoot
2c67e47 p4tmo: sync with pershoot
3e11467 p4vzw: sync with pershoot
f6f7323 p4wifi: sync with pershoot
26c3824 Merge pull request #149 from teamhacksung/jellybean
2c2f152 skyrocket: update blobs to UCLI3
2f56120 n7100: Hack ZK camera firmware version (to avoid kernel hack)
c5ee742 n7100: fix typo on camera firmwares
5221fca smdk4412-common for i9300, n7100, n80xx
59098d2 vibrantmtd: update gps.conf again
9e39dfc vibrantmtd: update gps conf
d7519e0 d710: props
e363457 Merge pull request #147 from alanorth/smdk4210-tabs
5b48729 Merge pull request #148 from invisiblek/jellybean
99f2b55 d710: open source akm
41d4b34 d2vzw: update nfc props from VRBLI5
b51f651 smdk4210-tab: Remove prebuilt sec_keyboard binary
8fb53de smdk4210-tab: Use opensource macloader
3fec812 d710:Use common drm files
ac78248 d2mtr: add ril support
024c9fd Merge branch 'jellybean' of github.com:TheMuppets/proprietary_vendor_samsung into jellybean
d48908b Add d2mtr
c6f40f2 hercules/quincy: relocate libpn544_fw.so to hardcoded path.
2c34a9c d2:add dependancy blob
5b6da21 d2 jbtest: add missing blob
a60b773 d2: use current jb driver
7222a84  fix linking issue
fb0d372 d2spr: add jb blobs to a test folder
df67587 d710: Update makefile
736668d d2:add dependancy blob
fd352e2 d2 jbtest: add missing blob
e6f8693 d2: use current jb driver
d1fb104  fix linking issue
0b65f9a Merge branch 'jellybean' of github.com:TheMuppets/proprietary_vendor_samsung into jellybean
914fb4e d2spr: add jb blobs to a test folder
993f02a d710: prop changes
c877a28 d710: Remove broken audio props
6c7abbf d710: rename props
658f55b Relocate skyrocket's libpn544_fw.so to hardcoded path. See packages/apps/Nfc/src/com/android/nfc/nxp/NativeNfcManager.java:39
5ff8b76 Revert "Update audio blobs to JB"
f959b4f Update audio blobs to JB
f7056e1 d710: updating to jb props d710: change wimax jar
12f3acc Merge pull request #141 from jt1134/jellybean
9eac039 fascinatemtd/mesmerizemtd: cleanup gps.conf
458a7a6 d710: fixing props
74bed2d i9300: downgrade wifi blobs to LG8
266eefd mesmerizemtd: update RIL blobs (fixes roaming issues)
63713e8 d710: reset props to FG31
da63e39 d710: update
2211a19 d710: prop changes
43a3768 d710: fix mk file
55b4ae4 permissions
5482398 d710 reset to fh13 props
b28dbca d2-common: update blobs to LIH update
9160368 Merge branch 'jellybean' of github.com:TheMuppets/proprietary_vendor_samsung into jellybean
a8e5855 d2-common: update blobs to li3. d2spr: update ril daemon blob to li3
48a770d Change Props
b64dbe2 more props
975e5f7 add libs
490579c update props
0214bf1 Merge pull request #138 from burnsra/JZO54K
4518e59 toro: Revert lib_gsd4t.so to prevent crash
56e7416 toroplus: Revert to HiddenMenu
aa17fdb Merge pull request #137 from burnsra/JZO54K
991e37d Merge pull request #125 from TuckJ/jellybean
a7b8053 Binaries for Android 4.1.2 (JZO54K)
e57e893 Merge pull request #133 from UberPinguin/jellybean
a63e9a2 Add macloader for t769.
497e15c Merge pull request #132 from UberPinguin/jellybean
8e689fc Files for Blaze 4G / SGH-T769.
84b6d77 Update d710/d710-vendor-blobs.mk
d93ebab Update d710/d710-vendor-blobs.mk
ce60a7b Merge pull request #128 from techomancer/jellybean
6bbc767 Merge pull request #131 from xplodwild/jellybean
65142dd i9300: Add back hostapd as a temporary workaround for tethering
ea372ee Merge branch 'jellybean' of git://github.com/TheMuppets/proprietary_vendor_samsung into jellybean
cb028f3 Merge pull request #129 from bbelos/jellybean
00fe822 epicmtd: Modify SprintMenu for uart switch path.
6c839f4 add sec_keyboard keyboard daemon
1e1d40f Merge pull request #127 from espenfjo/r3p0
8723e0f Remove libsync dependencies
984d15d Merge branch 'r3p0' of git://github.com/ohanar/proprietary_vendor_samsung into r3p0
8ee172e Update with mali r3p0 libraries
e1aa64a Update with mali r3p0 libraries
9132f3f Allow r760 to pull.
f24bb70 Merge pull request #123 from fitsnugly/jellybean
41d7d2a toro: fix libsec-ril_lte.so derp
044ded3 Merge pull request #120 from fitsnugly/jellybean
be6f9f0 Merge pull request #122 from espenfjo/jellybean
aba1f36 Revert "Update with mali r3p0 libraries"
75db431 Merge pull request #121 from espenfjo/jellybean
d2d4803 Update with mali r3p0 libraries
e9ad711 Fix cbd/rild derp
b20e836 i9300/n80xx: libsync is opensource
85bdb76 Merge pull request #117 from burnsra/jellybean
1428342 toro: Update binaries to latest OTA (JRO03O)
d03f1cb crespo4g: Removal of unnecessary files as of Android 4.1.1 (JRO03R)
17054f6 msm8660: Update blobs
599379c Merge pull request #116 from espenfjo/5395de2cc49c147b4362fe6c79afbb21bfe0791c
61ff81a Merge pull request #115 from burnsra/jellybean
12adbc9 toroplus: Update binaries to latest OTA (JRO03U)
5395de2 Add Note 10.1 n80xx blobs
0107b39 Merge pull request #114 from pawitp/jellybean
362cbb4 aries-common: Remove no longer used proprietary lpm binaries
7a0471a galaxys2-common: remove legacy hostapd
b8ff51e i9300: remove legacy hostapd
0140d73 i9300: update blobs to LI8, except NFC firmware
0c027a6 i9100g: fix typo
6f043fb i9300: back to LG8 gps
5c17973 i9300: blobs from LH4 (mali r3p0)
fcb49b2 p31xx/p51xx: added dock keyboard service
deac1d4 P5 blobs
2a1139d quincy: Update blobs
c8b985a msm8660: Update props
7190545 p31xx: variant specific sensor module
1745af9 Merge pull request #112 from jt1134/jellybean
853a502 mesmerizemtd: update ril blobs from EH09
8eeaa57 Merge pull request #111 from bbelos/jellybean
0059dc8 epicmtd: Modified charging_mode binary for 3.0 kernel.
e3c2cdf msm8660: Update blobs
7433cc6 Merge pull request #110 from jt1134/jellybean
edd3384 mesmerizemtd: remove files unneeded for jellybean
3bf098d d2: fix nfc on d2vzw board family
cf223e5 Merge pull request #109 from sbrissen/jellybean
1ec82b1 gs2-common: copy hwcomposer
fd7465e d710: fix using common props
f2de021 Merge pull request #108 from sbrissen/jellybean
199e87f d710: make use off galaxys2-common
dbacabe path change
5f1a21c Merge pull request #106 from sbrissen/jellybean
b3f7f25 d710: fix headers
97da544 d710: update props for jb
fa346ab renamed to d710 as per other SGSII variants

   * vendor/sony
4f54984 proprietary-files: camera: updates from 10.3.A.0.423
48ac6b4 dogo: update blob
691c9cd add dogo device
b4141c5 fusion3: update common firmware from 10.3.1.A.0.244
2c5af6b fusion3: WCNSS WLAN version 1.4.1.2
d5afdf1 pollux_windy: cleanup
5ba7b0f Merge pull request #21 from pulser/cm-10.1
e2239ff Update pollux_windy blobs to 370
f1297eb Add pollux_windy gss blobs from 370
9165a18 blue: fusion3: remove nfc firmware
b19be58 prepare for camera wrapper
ab725d1 fusion3: 4.2.2 kernel bring up
c11e8f8 blue-common: fix file path
7f1aacf blue-common: path fix
130a306 wlan: remove prima config
7cb7e71 pollux_windy: initial blob
deeb5a9 fusion3: updated prima firmware
d1dc947 Revert "qcom-common: use c2d2 from jf"
a211bad qcom-common: use c2d2 from jf
dc6c9f7 blue: drop prebuilt qrngd
6ed9d02 fusion3: update blob
e34d7bc fusion3: add common firmware
58cfd8e odin: updated blob from 10.1.1.A.1.253
60d5f61 yuga: updated blob from 10.1.1.A.1.253
6113aaf misc: remove unused file
2401913 fusion: blue: cleanup
b36c0b8 pollux: update wcd9310 firmware
049fd07 pollux: fix and cleanup
67e69cf pollux: update blobs from 10.1.1.A.1.253
fec6a55 pollux: fix copy of touch firmwares, add some
39ac3ad fusion3: fix thermald
7bb1b37 fusion3: update audio blob
3a47030 yuga: odin: remove unused files
55b77ee qcom-common: update adreno prop
ec98918 pollux: initial blob
6846365 hayabusa: update blob from 9.1.B.0.411
755680e tsubasa: update blob
6691a56 mint: update blob
afb24b0 odin: update blob
33dc9ca yuga: add camera blobs
4c9b0d9 Merge pull request #12 from chirayudesai/cm-10.1-cleanup
f0c3408 qcom-common, fusion3-common: regenerate
ce98521 fusion3: remove sensor hal
887054c fuji: move adreno to qcom-common
a288a9b fusion3: add prebuild GPS
476ba41 yuga: updated blob from 10.1.A.1.434 release
cdb0a59 blue: use prebuilt GPS blob
cbc14c4 Merge pull request #11 from championswimmer/cm-10.1
4569983 hayabusa: update blob to 9.1.A.0.489
eb141de blue: update libacdbloader
15ae44a mint: update blob to 9.1.A.0.492
a20d2fd drop qmiproxy on msm baseband
33fd90b fusion3: add blob DASH
97604c0 blue add wcd9310 firmware
7e0754d mint: remove unused firmware
96fad88 blue: remove bridgemgrd
fdf3620 tsubata: update blob from Sony 9.1.A.0.490
8c82400 mint: add missing blob
803de7b blue: update prima firmware and remove adreno blob
3f03c61 mint: update blob to 9.1.A.0.489
d81eb18 sony:  blob cleanup
da45762 fusion3: remove DASH blob
01ce981 fusion3: add missing libals.so
0a62767 fusion3: use mako acdbloader
00ae426 fusion3: add missing blob
91b2127 fusion3: use mako libQSEEComAPI
f323146 blue: drop ATFWD-daemon blob
457fff6 odin: base 10.1.A.1.350 blobs
4af09e6 yuga: base 10.1.A.1.350 blobs
3e6c995 fusion3: common prima blob
35cd606 qcom-common: common adreno blobs from 4.2.2 mako
3eca0e1 blue: add wcnss fw back to it's new home
44db44d blue: prima cfg cleanup
a63005c blue: adreno blob cleanup
0725386 Merge pull request #7 from chirayudesai/cm-10.1-mako-egl-4.2.2
2ea7270 mint: update egl blobs for 4.2.2
d91ea4b tapioca: cleanup
fb333d5 mesona: cleanup
20c3f40 blue: add fm libs
faf884d Merge pull request #6 from chirayudesai/cm-10.1-ril
24604e0 blue: switch back to closed source RIL
1708906 blue: camera blob
30d5da5 blue: misc blob update
846ccbf mint: revert wcnss firmware update
05f3dcb blue: blobs for prima wlan 3.1.7.16
1a81348 blue: use mako wifi firmware
f0a1c19 mint: update blob from 7.0.A.3.223
260febe blue: update libqmi_cci from mako
782a58b blue: update blob
d8b4905 blue: use mako mpdecision
c5024d8 mint: update blob
c2c9f8d tsubasa: wcd9310 firmware
613b5bf tsubasa: update blob
cecf64c Merge remote-tracking branch 'origin/mr1-staging' into cm-10.1
9f41bfc mint: updated blob from 7.0.A.3.197
9de064c mint: updated blob from 7.0.A.3.197
a70f6bd nozomi: updated blob from 6.1.A.2.55 release
9c61a25 blue: add libloc_api_v02 from mako
3902fbe mint: blob cleanup
a9935e8 blue: remove wiperiface
14155ed blue: update thermal daemon
6d6c7dc blue: remove profiler daemon
d42d9a9 blue: update blob list
ade383f mint: remove sdcard blob
5475bac blue: update blob list
289c63b tapioca: more camera blobs
bc587c2 mint: temporaly remove camera blob
e81561a blue: import mr1 adreno libs
92d74a7 tsubasa: use mint wifi firmware
336bf90 tsubasa: add libsysmon_idd
238586e blue: drop wifi conf
caa3d0e tsubasa: add missing wifi firmware
d89fe5b hayabusa: update blob
18e8c3d Initial Xperia V (tsubasa) import
2000ddb sony: update 8x60 blob
f4c4a53 mesona: remove gps blob
9dcd1bd mesona: camera blob update and tapioca rename
681beb0 tapioca: blob update
fcc7330 tamsui: unused blob cleanup
296c78e mesona: rename blob as cm standard
ce69cc9 mesona: more blob
bac28c9 mesona:  blob updates and cleanup
2606f8e mesona: initial blob push
60d71dc blue: drop illumination blob
dcb36a9 sony: update libqc-opt
162b14c mint: revert wifi firmware update
e012f28 sony: remove qcom network optimizations plugins
d97420f fuji: adreno C2D2 update
65a2bb2 aoba/hikari: ion enabled acdbloader
8089b76 fuji: add aoba device
fa44461 fuji: new dep blobs
ea103d1 fuji: blob update and cleanup
5138bd1 fuji: add NFC blob
d5b7d56 mint: updated blob from 7.0.A.3.195
b39e210 sony: update blob
acd8281 hikari: updated blob from 6.1.A.2.50
e7fd716 hayabusa: initial blob import
8a18e91 mint: update blob
0705a28 hikari: update blob
50092ac mint: haxed camera blob
5f05098 nozomi: updated blob from 6.1.A.2.50
59e40f3 mint: idd remove
d48b0b1 mint: add fm blobs
0a6b7ca mint: qcom networking optimizations plugins 2
06d18c3 mint: qcom networking optimizations plugin
8dc89e7 mint: add color-convertor lib
bd6f1e5 somc: add tapioca blob
2784d42 blue: BT fix
f8c170f mint: alsa config moved to device folder
55fa603 mint: add qc perf lib
a1a9775 sony: update wlan props
6908e7e mint: add missing system_monitor blob
879b3fc mint: more blobs
edbe06c mint: update blob
5f91661 mint: more blob
7db07a6 mint: vendor blobs
9e03d0d fuji: add RPM to common
afbdea1 hikari: fix prop list
8e63685 sony: ant+ props
9b9b15c fuji: update blobs

   * vendor/tmobile/apps/ThemeChooser
100643a ThemeChooser: FI translations
2859724 ThemeChooser: PT-PT translations
972d961 Merge "ThemeChooser: RU translation" into cm-10.1
4737602 ThemeChooser: RU translation
4be1509 ThemeChooser: DA translation
cc159cd Merge "ThemeChooser: Add AF transalations" into cm-10.1
81325e4 ThemeChooser: Add AF transalations
8a8edaa ThemeChooser: Simplified Chinese Translations
69533ab ThemeChooser: Norwegian translation
c0e327f ThemeChooser: CS translations
da01b64 Merge "ThemeChooser: EL translations" into cm-10.1
31c8d1a ThemeChooser: EL translations
a54605c Added missing translations
99fd56a ThemeChooser: fixing translations
9927fbf ThemeChooser: UK translations
0dc8bcc ThemeChooser: Added Polish language
5c7ea47 ThemeChooser: Update Greek translation
25e4d0f ThemeChooser: Add italian translation
1929700 PT-BR: Added missing translations
21d90ab ThemeChooser : Add French missing translation
35b9eaa Merge "ThemeChooser: Update German translation + copyright cleanup" into cm-10.1
9582cf6 ThemeChooser: Update translations [WIP]
8c104b6 ThemeChooser: Update German translation + copyright cleanup
d7ff1c6 Change the app name and icon
c306a9f Underp previews
732818b A bit of jellybeanization to theme engine app
ceb6293 ThemeChooser: Simplified Chinese Translations
d545864 ThemeChooser: romanian translation

   * vendor/tmobile/providers/ThemeManager
d43f8aa ThemeManager: FI translations
c3526db ThemeManager: DA translation
f5c2719 ThemeManager: NB translation
3efb92a ThemeManager: PT-BR update translations
dc70725 Merge "ThemeManager: PT-PT translations" into cm-10.1
0b533ff ThemeManager: EL translations
ac49493 ThemeManager: Af translation update
1407984 ThemeManager: PT-PT translations
a87812d ThemeManager: HU translation update
920a57a ThemeManager: ES translations
6edb4ae ThemeManager: Update italian translation
ef32048 Merge "ThemeManager: CS translation" into cm-10.1
10ffa1a ThemeManager: CS translation
d4369a5 ThemeManager: NL translation
6dc03f1 ThemeManager: Unify translations
c7b3965 ThemeManager: German translation
c584375 ThemeManager: RU translation
ac096b8 ThemeManager: DA translation
0bf6be4 ThemeManager : add french translation
1187df0 ThemeManager:Add AF translations
78d4cc2 ThemeManager: NB translation
83314c6 ThemeManager: HU translations
e085f49 Merge "ThemeManager: ES translations" into cm-10.1
dc84fbb ThemeManager: ES translations
7c210f7 ThemeManager: EL translations
74a2338 PT-BR: Update translation
c1d3c8c ThemeManager: Add italian translation
ca69bad ThemeManager: Indonesian translations
6ab89b8 Czech: added translation
eb5c8f3 Lower the priority of the cache cleanup for uninstalled themes
fa9f5ed Explicitly export providers for 4.2 compatibility
5e4ebc5 ThemeManager: Simplified Chinese Translations
e5d5695 ThemeManager: Dutch translations

   * vendor/widevine
ccf3df3 Merge pull request #17 from nemith/cm-10.1
f2e0516 Merge pull request #19 from burnsra/cm-10.1
ee0d235 Toroplus: Binaries for Android 4.2.2 (JDQ39)
67eb695 Merge pull request #18 from atinm/cm-10.1
10141d2 Updated to Android 4.2.2 (JDQ39) binaries
95ebd79 Update tilapia to 4.2.2 binaries
bec31e0 Merge pull request #15 from mempf/cm-10.1
7b61eab Merge pull request #16 from djMesias/cm-10.1
a13157a Maguro: Update binaries to 4.2.2 (JDQ39)
cc4cb44 Updated binaries to 4.2.2 These files appeared to be too old to function properly on 4.2.1 as they came from 4.1.1
f9cb187 Merge pull request #14 from burnsra/cm-10.1
20a80b6 Toroplus: Binaries for Android 4.2.2 (JDQ39)
eea5f98 toro: Update props to 4.2.2
388082b Merge pull request #13 from whompy/cm-10.1
cf65b92 Fix missing toro binaries
064d202 Merge pull request #12 from blunden/cm-10.1
0962472 Add missing 4.2/4.2.1 DRM blob back
6844939 Merge pull request #11 from TeamRogue/cm-10.1
85e7703 Xoom family: update blobs for JB 4.2
651be63 Merge pull request #10 from burnsra/cm-10.1
d258932 Merge remote-tracking branch 'origin/mr1-staging' into cm-10.1
8ecc0d7 Merge pull request #8 from blunden/jellybean
257b68a Revert "Add maguro 4.2 DRM blob"
980be69 Grouper: Binaries for Android 4.2/4.2.1 (JOP40C/JOP40D)
9802827 Merge pull request #7 from burnsra/mr1-staging
3416dc8 Toroplus: Binaries for Android 4.2 (JOP40C)
5f9bb7e Revert "Galaxy Nexus (Verizon) binaries for Android 4.2 (JOP40C)"
d957a12 Merge pull request #6 from atinm/jellybean
b50ab18 Added manta
22ad544 Merge pull request #5 from blunden/jellybean
3822d88 Add maguro 4.2 DRM blob
7db06e8 Galaxy Nexus (Verizon) binaries for Android 4.2 (JOP40C)
0fc3019 Merge pull request #3 from TeamRogue/jellybean
1183155 Motorola Xoom (everest) binaries for Android 4.1.1
7eb2c04 Motorola Xoom (stingray) binaries for Android 4.1.1
6b8ebf2 Motorola Xoom (wingray) binaries for Android 4.1.1
7f4ecb1 Merge pull request #2 from burnsra/JZO54K
a7e9a26 Binaries for Android 4.1.2 (JZO54K)

