aospでLollipop MR1のソースが公開されました(10)


続きです。

/external/以外の残りです。

## project hardware/broadcom/libbt/
d3257ed Add configuration for bass
9450480 IKXCLOCK-3802: Add vnd_smelt.txt
f6b50be Anthias: Disable btwrite timer.

## project hardware/broadcom/wlan/
69ffc0b bcm4343: Update firmware to 7.10.226.54.1
a80afc5 Firmware update for bcm4354/bcm4356 v(7.35.79.57)
120a01d Firmware update for bcm4354/bcm4356 v(7.35.79.54)
65a7163 Firmware update for bcm4354/bcm4356 v(7.35.79.52)
04c3897 Firmware update for bcm4354/bcm4356 v(7.35.79.49)
75e9174 Firmware update for bcm4354/bcm4356 v(7.35.79.49)
e416409 bcmdhd: Update bcm4354/56 FW (7.35.79.45)
29a26f7 dhdutil: Fix issue with dhd_upload which causes kernel panic
43af39b bcm4343: Add firmware 7.10.226.54
275dfeb bcmdhd: Update bcm4354/56 FW (7.35.79.45)
1a98081 dhdutil: Fix issue with dhd_upload which causes kernel panic
b75054d Add BCM43341 wlan firmware.
7e51d96 net: wireless: bcmdhd: new FW (7.35.79.44)
3b75778 bcmdhd: Update bcm4354/56 FW (7.35.79.38)

## project hardware/intel/common/libmix/
ced6938 Revert "libmix: Reject MDRM multi-slice decode to avoid VED FW hang."
a6ebfeb enable OMX extension OMX_IndexExtVppBufferNum for ISV
c75124d [libmix] Work around to handle wrong packed buffer
7a80fb5 remove useless link against some framework libs
5eee2b3 libmix: Reject MDRM multi-slice decode to avoid VED FW hang.
e5d3d03 libmix: Handle failure gracefully in parseClassicSliceHeader & parseModularSliceHeader.
4ed41ba libmix: use DPB from parser

## project hardware/intel/common/libstagefrighthw/
7714658 remove link against libui
490aba9 Enable ISV OMX core.

## project hardware/intel/common/libva/
72865c1 libva: update slice header parsing data structure to fix wrong POC from FW
d6df468 va: use system headers instead of framework ones

## project hardware/intel/common/libwsbm/
995a232 Revert "ION support in libwsbm."
ba8f734 ION support in libwsbm.

## project hardware/intel/common/omx-components/
2dc257b Fix defect when native buffer mode fallbacks to byte-buffer mode (raw data mode). The color format needs to be set to default as non-Intel format.
d1e38d9 VP8 OMX component - Add flushing the decode pipeline at the beginning, and make VP8 surface height uneccessary force to 32 bit align - keep it as same as original height.
237fe15 AVC secure OMX component - Change the level to 4.2 to pass new CTS cases.
d7a2495 vp9 hybrid omx
77e0e77 pass buffer width to libDecoderVp9Hybrid
3b7c847 vp9 hybrid omx: if it's eos frame and encounter resolution change, retain the input buffer's len
d5673be To support standard omx api for passing GTS test
4f61fb9 OMXVideoDecoderVP9Hybrid: set usage flag as GRALLOC_USAGE_SW_READ_OFTEN + GRALLOC_USAGE_SW_WRITE_OFTEN
3fcd3fa enable OMX extension OMX_IndexExtVppBufferNum for ISV
6c6d546 adjust vp9 hybrid output buffer count to avoid play freeze caused by no available buffer
9e1ba4b DecoderVP9Hybrid: add adaptive playback support
c45012b adjust vp9 hybrid output buffer count to avoid play freeze caused by no available buffer
c51d539 DecoderVP9Hybrid: add adaptive playback support
9cfd42b use system headers rather than framework ones
5246619 vp9hybrid: add adaptive playback support for vp9 hybrid plugin(legacy mode)
13c7df7 vp9hybrid: add raw data mode support for vp9 hybrid plugin to pass cts test
6725411 vp9hybrid: drain the last frame to fix output frame number not matching issue
aa97fcc vp9HWR: fix free issue in multi-thread

## project hardware/intel/common/utils/
e5aad73 Fix FRC distortion issue.
c9dcd35 Reduce memory footprint of ituxd
4c0269a [Workaround] Disable ISV for YV12 input
3d148c2 Workaround AVC low resolution playback
c214ebe Support YV12 input format addendum
d6acef0 Add ISV support to fugu
25b2a4f Add ISV support to fugu

## project hardware/intel/common/wrs_omxil_core/
c8580ee wrs_core: enable meta data mode on L
7c51a53 enable OMX extension OMX_IndexExtVppBufferNum for ISV

## project hardware/intel/img/hwcomposer/
338356d reduce the log spam attributed to HDCP status
3dd3c7b Revert "hwc: Enabling ION - HWC"
979bcaa hwc: workaround for video distortion issue
49c4b56 hwc: Enabling ION - HWC
06e1408 use system headers rather than framework ones
0127c89 enable hw overlay for video for HDMI 576p/480p mode
93123be Duplicate gralloc handle to avoid access it out of lifetime

## project hardware/intel/img/psb_video/
da9cacb psb-video: Change the surface type to be uncached. to fix potential CTS issue such as: android.media.cts.EncodeDecodeTest#testVP8EncodeDecodeVideoFromBufferToSurfaceQVGA
d640886 Fix share info initialization issue when enabling VPP/FRC
fe436fe Fix VP8 encoder realted CTS issue .
5f7a214 clear video buffer that from gralloc to be black.
2c6fb3e Revert "ION support in psb_video"
02f3955 Support YV12 format for ISV functions
3b69182 VED: Serialize cmd submission for VED when using H264 slice header parsing
fce2754 Decrease isv log
7f1c4d0 ION support in psb_video
f84b5e9 use system headers rather than framework ones
d50cf45 Enable VSP driver
426fbf4 psb_video: Handle failure from psb_context_flush_cmdbuf gracefully.
ea8f314 psb_video: improve DBP order consitency
b54bdf0 Driver to keep consistent dpb order This is needed to decode skiped MBs

## project hardware/invensense/
dda0105 sensors: mpu6515: dont reference count SMD events
e7bd258 sensors: mpu6515: grab wakelock on significant motion event
199449a sensors: mpu6515: fix memory corruption bug

## project hardware/libhardware/
d5f7dbe audio: Add audio parameter key for device connect
811677e gralloc: clarify lock_ycbcr in light of multimedia codec usage
b2bc0e5 camera3: update ZSL spec
8b7eca8 CEC: Add a new flag for set_option
83b47a6 usb audio: Fix incorrect bytes returned for recording
781bb3f DO NOT MERGE - fix: memory leak
4b280b0 CEC: Add a parameter port ID to set_audio_return_channel
2cbdfa9 usbaudio: reset profile on device disconnect
257fde6 Reroute submix HAL: fix race condition on output state
285fed0 Add server-side callback for change in MTU (1/4)
b73bc86 Support multiple pipes for rerouting
8df990b Camera2/3 HAL test: cleanup deprecated keys
32ef0ca Add a BufferItem parameter to onFrameAvailable
a90cf19 Fix typo and add more detailed comments on what we expect from GPS HAL. b/16727892
d091713 power: Adds setFeature functionality for the power module
fbb4412 tv_input: more documentation to events
bc19a3d audio: new parameter key for HW A/V sync ID allocation
e914d69 Report multihal is SENSORS_DEVICE_API_VERSION_1_3 compliant
2cfd81b Support MONO and STERO USB inputs. Allow "dynamic" flag in audio_policy.conf.

## project hardware/libhardware_legacy/
e714af9 audio policy: use legacy stream type definitions
2d2ea50 legacy audio policy: check string parameters before use
69f48b8 [AU]Buganizer ID: 17182487, sprout audio HAL should mute all audio output with property ro.audio.silent set to true
6774161 wifi: Sync with wpa_supplicant 9ead16e (d5fe4e6)
9dd37a6 wifi: Sync with wpa_supplicant commit 661b4f7 (a313d17)
8ddf81e [AU] Update volume setting and Audio Device API 3.0

## project hardware/qcom/audio/
e406d08 fix ACDB ID for headset mic with AEC
1c7637e add line out to device sharing codec backend
cc4f6bf hal: Fix progress bar issue during compress offload playback
8652b46 visualizer: do not apply calibration on audio routed to afe proxy
f282901 hal: Fix EC not working in VoIP calls
d230528 audio: use pcm_ioctl() from tinyalsa
1ccf397 compress offload: use new sample rate representation.

## project hardware/qcom/display/
cbb846a overlay: Call MSMFB_SECURE on alloc/free of secure rotator buffer
e33bae6 gralloc: 8960: Add allocation support for standard NV12
d535e59 gralloc: 8084/8226: align cstride for YV12 buffers in gralloc_lock_ycbcr
41b4b6a gralloc: 8960: handle YCbCr 420SP format in lock_ycbcr
3a738be gralloc: msm8974: implement lock_ycbcr for YUV420_SP_VENUS
adc3f59 hwc: msm8226: Bump up version to 1.4
66528d1 copybit: Minor fix in opening copybit device
2130dc3 copybit: Use proper type casts and pointers
6071208 Revert "Set priority among various display devices"
7249973 hwc: Avoid partial frame update on secure display
afb0630 qdutils: Parse rotator downscale feature
cbf0d5f liblight: turn off the LED when fail to set it blink
000cb84 display: Dynamic debug logging via binder
52c40f7 qdutils: Add getter for 8994
c5628e5 hwc/overlay: Get rot dest dimensions instead of manipulating source
4a84a77 overlay: Remove obsolete code from pipe config path
8c05a30 overlay: Trace all MDP ioctls
88de95b display: initialize viewFrame info for external displays
5470587 hwc: initialize viewFrame for primary display
db007e9 liblight: add support for battery light
392015f hwc: Extend PTOR feature for two layers
32be815 libmemtrack: Use correct format specifier
94059b1 hwc : Enable ABC only for non intersecting layers.
8636d6e hwc: Close release fence fd on buf sync ioctl failure
cfb9688 display: remove compiler warnings
74e109a hwc/overlay: Fix decimation / bwc bugs
4a7fde2 hwc: Rotate RGB layer using MDP Rotator
370a4b1 hwc: On downscale check swap on 90 transform
c5223a2 hwc: 8084: Split videos with width > 2048 if source split absent
33f1ae8 hwc: Define binder interface to set view frame of a display
e095244 hwc: Source Split layers always if indicated by driver
63cdccf hwc: vds: Add support to dump layers, FB and WB output buffer
4a00e75 hwc: Calculate DPI values according to changed resolution
3b66cc8 hwc: Set GPU Hint from idlefallback state to GPU
44d388c hwc: Avoid MDP draw if prepare is not successful.
bc602eb hwc: modifying logic in adjust FB Z-order for 4k2kYUVSplit
dd8c04c display: Add VENUS_COLOR_FORMAT for msm8994
ba67e6a overlay: Change max rotator sessions to 4 and log level
1cf3c09 hwc: Consider FLIP flags for partial update.
c17e175 hwc: Map dirtyRect to layer destination for single DSI panels.
ec42793 libgralloc: Set Alignment to 1M only for Secured buffers.
dfbb5a2 hwc: Invalidate at the end of VDS pause
f005bba copybit: Enable RB Swap for RGB_888
80cd536 hwc: Full MDP Composition mode with overlap region removal
92e5d1f display: Fix binder parcel position
e30efa4 gralloc: Align NV21 to 32 pixels
4965c25 gralloc: Fix NV12 and NV21 stride
24538a5 hwc: Allow WB to be active during VDS pause state.
f4be19a rename heap_mask -> heap_id_mask
463feeb hwc: Add display ROI in HWC dumpsys
c5936f3 hwc : Add support for ABC in MDP3
bd51df0 hwc : Add support for single layer Bypass in MDP3
92e456f gralloc: Remove opaque types
ab05b00 overlay: Request specific pipe type
484b141 hwc: Simulate composition strategy
34a0e26 hwc: Fix compiler warning
800270d hwc: source split: Enable BWC for video with width <= mixer width
e69b1d7 hwc: Call blank IOCTL on virtual as well if it is connected.
1def24e hwc: Fix klockwork errors
f9d1b7d copybit: Enable HAL_PIXEL_FORMAT_RGB_888 support in c2d
5bbc98f hwc: Map dirtyRect to layer destination before using.
514cb6b hwc: Support single ROI for split panels.
6f76346 hwc: Extend partial frame update for split displays
591cee0 display: Change LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
dcda9b9 libmemtrack: Use kgsl memory flag to determine usermapped buffers
3f38b62 overlay: Remove usage of scale header
b82663b hwc: Handle validateAndSet failures in AD prepare call
3fdd186 overlay : Rely on 8x16 pipe strategy for 8x39.
26ca824 qdutils : Add mdp revision for 8x39.
9caaa41 hqd: Fix Klocwork errors in liblight
e157971 overlay: Fix BWC buffer size
f2cd42c hwc: Fix tearing with RGB layer rotation
4db7765 hwc: Use layerIndex while populating hw layers
c9e3824 hwc: Enable source split for targets with single dsi
3099482 gralloc: Fix incorrect handle validation check
53b0b5f Revert "hwc: Do not re-program H/W, if the frame geometry has not changed"
ef3b6dd hwc: Don't validate dropped layers for MDP support
0a4d3ac gralloc: Report YUV plane info
2c4de32 HWC: Update DisplayFrame of all layers properly in Dynamic FB
4418482 hwc: Add target specific checks in hwcomposer
c5ee4bd hwc: Use layer dirty rect to calculate frame's updating ROI
8266309 hwc: Conditionally compile dirtyRect under QCOM_BSP for copybit
8dd3d06 overlay: Pipe preference for 8x16.
ba33c33 hwc: [8x26]Never allow primary get DMA pipe when external connect
7c8e00a hwc: Clear overlay and layer-rot map from caller
e5fd024 hwc: Do not re-program H/W, if the frame geometry has not changed
3194416 hwc : Enable partial update if panel supports it.
b126ad6 hwc: Set DMA state at the start of composition
f2ecc8f HWC/Copybit :: Add swap rect feature in HAL for MDP3
ffb2f15 hwc: Skip dropped layers in video only composition
29e3491 h/q/d: Read minimum width and height values of the panel ROI
f1a4748 hwc/overlay: Correct pipe priority comparison
64e9290 hwc: Set MDSS_MDP_DUAL_PIPE on both pipes
a2b25af Display and wfd synchronization during teardown
a83d776 overlay: Support for returning pipe based on capability
8985796 overlay: Remove defines of log2f
3c3c248 mdp_version: Check define for each version
56eeb5e gralloc: Fix heap_id_mask
d0e20d1 display: Makefile changes for AOSP builds
eff8db6 qdutils: correct error checking of MetaData's handle mapping
e36c30f hwc: Display view frame needs to be set before using it.
803d90e libhwcomposer: Support for targets where libskia is not present
db307bb hwc: featurize using QCOM_BSP
255529b gralloc: Fix RGB888 marked as VIDEO
c2039d4 h/q/d: Dump ovinfo only on pipe config errors.
1a37e63 libvirtual: Fix logic to detect DRC use case
658fcef Revert "libvirtual: Fix logic to detect DRC use case"
0bc6186 hwc/overlay: Add support for pipe priorities, 1 pipe config for FB.
ca525f1 gralloc: Perform func to return stride and height.
a37e190 gralloc: Add support for lock_ycbcr.
9b1d1ba HWC: Minor fix in 4k2kYUVsplit feature.
ebf925e hwc: Add rotator obj to layer-rot-map if acquired.
38848c2 gralloc: Set colorspace in the metadata.
15c7eb9 libgralloc: use proper types and type casts.
4217cbf hwc: Use proper typecasts.
cfe4d17 Revert "remove dependency of HWC HAL on libskia"
b1ea812 overlay: Align width to 4 multiple in case of 90 degree rotation
1986451 libvirtual: Fix logic to detect DRC use case.
5fc9bd2 hwc: Fix for HDMI video playback out of boundary in portrait
a5a4ed3 hwc: set mModeOn flag for fbupdate properly.
4272a31 hwc: Extend pause/resume functionality to VDS displays.
2d4d00a h/q/d: Invoke padding when DMA is not availble for ext rotator.
0f763b1 Fix broken build
641955a hwc: Add a padding round on virtual display connect
0771ec6 libgralloc: Align secure video and rotator buffers to 2M
94b51da hwc: Fix src split bugs

## project hardware/qcom/gps/
2d76a0a carrier configured GPS_LOCK value missed out
8aac9d3 Revert "Revert "GNSS measurement""
be96ebd Revert "GNSS measurement"
a8f9a02 Revert "GNSS measurement"
af0c0cc GNSS measurement

## project hardware/qcom/media/
15fb17b mm-video-legacy: vdec: force uncached gralloc buffers
d3e4bca mm-video-legacy: vdec: add YUV420SP support in surface-mode
8dac2f1 mm-video-legacy: vdec: allocate color-conversion buffers as uncached
709179c mm-video-v4l2: vdec: Add support for describing color format
5edf3e6 mm-video-v4l2: vdec: Disable switching to surface-mode-format
15e16d9 mm-video-legacy: vdec: disable frame parsing in component
65fd197 mm-video-legacy: vdec: disable frame parsing in component
dd51ac5 mm-video-legacy: venc: do not send duplicate EBDs in case of an error
27e9056 mm-video-legacy: venc: do not send duplicate EBDs in case of an error
9262c4f mm-video-v4l2: venc: update color format in port-def
81e3261 mm-video-v4l2: vdec: Use standard HEVC coding type
5aa0323 mm-core: synchronize OpenMax headers with AOSP counterparts
3072d26 mm-video-legacy: vdec: add YUV420SP output format support
5eec611 mm-video-legacy: vdec: synchronize color-conversion calls

## project hardware/qcom/msm8x26/
da35900 Kernel headers for LNX.LW.2.0-00300-8x26.0

## project hardware/qcom/msm8x84/
b0ca779 msm8x84: Update MDP headers for secure buffer ioctl
d5781d2 camera: Add cur_frame_id in request_frame struct
6780bd3 msm8x84: update compress offload header files

## project hardware/ril/
b44dda3 Modify RIL_Data_Call_Response to include MTU
54563d3 Revert "Revert "STK Call Control feature implementation.""
7f96c50 Turn off RILC REQUEST logging
6bfaf64 Revert "STK Call Control feature implementation."
61bedcf STK Call Control feature implementation.
8caf06f [DS] Radio Capability Support. New design of capability switch for L.
8d67962 Update the profile id and the comments to handle RIL_REQUEST_SET_DATA_PROFILE
8b4e4f7 Radio Capability Support.

## project hardware/samsung_slsi/exynos5/
bd42692 exynos: vdec: report width/height as stride/slice-height for BUFFER_COPY
e76d5aa exynos: vdec: support disabling metadata and native buffer modes
3ece9df Revert "exynos: gralloc: implement gralloc_lock_ycbcr"
25ffbfe exynos: gralloc: implement gralloc_lock_ycbcr
5a1fc68 manta: libcamera2: fix copy-and-paste regression
f2eb959 manta: libcamera2: fix copy-and-paste regression
29a60df exynos_omx: check pointer before use to workaround potential crash.
d6d9447 manta: libcamera2: if captured shot drained, record current shot data
2883b8d manta: libcamera2: drain requests on empty request queue
492a250 manta: libcamera2: drain requests on empty request queue
d1fb36a libgscaler: fix a mutex leak

## project libcore/
656a2e4 Work around issues for MR1 release associated with timezone issue.
ebfb8f8 Fixes associated with the tzdata 2015a update
571815d Assert finite default timeout for TLS/SSL sessions.
8596076 Increase ThreadTest tolerance
0311cd2 Increase ThreadTest tolerance
3a1658c Fix and clean up FileDescriptor.isSocket.
4a1c4b2 SSLSocketTest: test close alert during handshake
0f32b9d SSLEngineTest: position should be same as produced/consumed
e0fae4b Only allow one requestGC at a time
4173978 Only allow one requestGC at a time
bfeba0c Fix for TLS HTTP connections with GMS sockets
f3b61ea Update ByteBuffer positions in Posix.* functions.
038c712 Fix TimeZoneTest#testPreHistoricOffsets CTS failures.
065ee84 Fix libcore.java.net.OldCookieHandlerTest#test_get_put()
db12621 StrictJarFile: Fix CheckJNI crashes due to invalid UTF-8 bytes.
6d65c2c CA certificates update
a951e74 Fix failing socket tests.
72c6ce7 Delete ContentHandlerFactoryTest.
003933a Use a MockWebServer instead of hitting the network.
03365a8 Add tests for issue 18554122.
dea9544 Fix obsolete javadoc.
40122b3 Fix failing connection tests.
467a680 Changes associated with an OkHttp bad proxy response fix
36d3eb1 Add test case for issue 18428603
1791f6b Fix crash in selector.wakeup() with closed selector
b9a5206 Move dexCacheStrings from ArtMethod to ArtClass
939e6a1 Fix URLConnectionTest for devices without full internet access.
8edeef2 Create GregorianCalendar via a delegate.
82055a8 Revert "Suppress zip & spdy tests that are OOMing with a 48MB max heap."
944632a Do not run the multicast tests if the device doesn’t support multicast.
15e8534 Suppress zip & spdy tests that are OOMing with a 48MB max heap.
4275765 Remove prohibition on stripping classes.dex from core-libart for Dalvik/ART dual-boot
12d62ae Add a unit test for a NumberFormat.setCurrency regression.
cd74e09 Fix DecimalFormatSymbols.setCurrency.
a553773 Improve backward compatibility of plurals formatting.
77a7e48 Fix a bug in DefaultHostnameVerifier wildcard handling.
eecc5b7 Fix a bug in DefaultHostnameVerifier wildcard handling.
e9795c2 SSLSocketTest: add error message test for fallback_scsv
9a9c59a Prefer "jpg" over "jpeg" as the extension for "image/jpeg".
13e57c9 Delete pointer sized fields
f9362ee Add benchmark for reflection performance on large classes.
8d471d8 Binary search through ArtFields to match by name.
ef7f5a1 JarUtils: stop trying to build chain past candidates length
258e3d1 TestKeyStore: more possibilities for KeyStore creation
702f9bf Preserve original encoded certificate bytes.
00bf89d Switch order of digest and digest encryption algorithm
c46775d Delete unused imtable field
65d0f0b Suppress okhttp's ResponseCacheAdapterTest.
dcf0e01 Track change to bouncycastle
0c990ab Preserve original encoded certificate bytes.
773c665 Use equals for comparing percent strings.
9ed62cd Allow 1 ulp difference in test_cbrt_D and test_sinh_D.
b7c19f8 Allow "_" in URIs.
b0edf66 Disable tzdata in $ANDROID_DATA.
3f8d941 Improve DexFile debugging
8afb381 Allow 1 ulp difference in test_cbrt_D and test_sinh_D.
25f2023 Update tests for HttpURLConnection.disconnect() changes
eb796a6 Regression test for sl date format consistency.
a88669a Fix javadoc links for property related methods.
13ee952 Only allow once GC request at a time.
0836eb6 Wire up frameworks notifications of 12/24 hour preferences.
71891f9 Only allow once GC request at a time.
936306d autoclose all <a name> tags so they don't disappear on web site
3f1a5eb Improve support for non-BMP characters in XML.
206773d Make unchecked getDeclaredFields/Methods methods public-hidden
fa1ab1d Support DecimalFormatSymbols' percent symbol being a string.
b8bd469 Unit test for bug 13234532.
9649aa3 Fix missing word in Timer docs.
bf164d9 Applying skipped merges

## project libnativehelper/
a75fb2a NativeHelper: Avoid returning local stack string





## project packages/experimental/
70bed82 Update notification listener after API change
2d27115 Script for SELinux CTS avc rules test.

## project packages/inputmethods/LatinIME/
994944a Import translations. DO NOT MERGE
ed42727 Import translations. DO NOT MERGE
79f4572 Import translations. DO NOT MERGE
8d0b0e6 Import translations. DO NOT MERGE
b150f5e Import translations. DO NOT MERGE
38b2ac8 Import translations. DO NOT MERGE
31d085f Import translations. DO NOT MERGE
943db31 (DO NOT MERGE) Fix Greek accented upper case letters
e551539 Fix restore from keyboard

## project packages/providers/CalendarProvider/
96d6780 Before the first call to clearCallingIdentity, cache the calling package.

## project packages/providers/ContactsProvider/
2a7fdc4 Don't use queryContentProviders to avoid "transaction too large" exception
ec22e21 Additional change to IS_SUPER_PRIMARY
abaa423 Fix cross profile caller id to use manager profiles userid.
085a747 Skip aggregation if candidate contact contains too many raw contacts
eb10c52 Fix package manager TransactionTooLargeException
0982155 Modify the contact split logic to avoid over-split issue.
df1e589 Make the email comparison case-insensitive for contact aggregation.
77e675b Fix broken test in ContactsProvider2Test.java
3a219cc Sync call log entries to secondary user on background thread
240d10d synchronize photo storage creation for race conditions.
84e66f5 DO NOT MERGE Remove default settings during contacts aggregation.

## project packages/providers/DownloadProvider/
f3679d0     Can not continue to download after powering on the phone
1bb7a08 Use FileUtils to validate FAT filenames.
8026ba6 Connection: close is enough to know length.
0032d17 Connection: close is enough to know length.
83cf6d5 Defeat connection reuse to really cancel.
da9d77a Ensure that downloads stop quickly.
d9492e1 Fix compilation after update to MockWebServer
d22d556 Import translations. DO NOT MERGE
98be4b7 Import translations. DO NOT MERGE
250a1eb Fix internationalization of percentage formatting in DownloadProvider.

## project packages/providers/MediaProvider/
d1f3744 Check mCurrentThumbRequest.mPath to prevent crash.
d1b7c58     Fix SQLiteDiskIOException in stability test
407c6dd Reset album and artist tables due to change in how collation keys are calculated.

## project packages/providers/TelephonyProvider/
b16a120 [DS] Load APN from System or Oem image
eaa93e6 Unify "app_parts" path obtaining in MmsProvider
391da4a Fix long lines associated with INVALID_SUBSCRIPTION_ID.
a42e417 Fix long lines associated with INVALID_SUBSCRIPTION_ID.
72b1473 Additional changes to SubscriptionManager API as per API council.
3fdec6f Revert "Additional changes to SubscriptionManager API as per API council."
e07acb9 Make CREATOR columns read-only and auto set them in provider
4879328 Additional changes to SubscriptionManager API as per API council.
887288c Make TelephonyProvider a singleton across users
7e633bd API changes to add carrier name to subinforecord
f5b56e3 Clean up public API of SubInfoRecord.
1ad5f91 The sub_id column in the carriers should be an INTEGER instead of a LONG
830a40f Change subId to int from long
a58acf3 Use INVALID_SUB_ID as default value for sub_id columns
7ed9c33 Unhide android.provider.Telephony.Sms.SUB_ID

## project packages/providers/TvProvider/
344b2d4 Throw FileNotFoundException when openLogoFile() fails
c2327ef Remove the UNIQUE constraint on channels table to reflect the real broadcast data
eb0c198 Add genre for Brazil
1b77bff Delete the channel logo when deletion is requested for logo URI
2bc4d93 Improve the channel deletion performance of TvProvider
86c6896 Improve the query performance of programs table
323e13d Enhance the performance of bulkInsert()
e6f7403 Revert "Enhance the performance of bulkInsert()"
de479fb Enhance the performance of bulkInsert()

## project packages/services/Mms/
92db751 Rename reg/unreg OnSubscriptionsChangedListener.
9094b94 Check airplane mode and mobile data before sending
b1bfa20 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
0d9a2e2 Don't send charset with Content-Type header by default
857fb76 Do not add charset to Content-Type header for some carriers
d16e241 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
cdf1e7d Secondary user support - Broadcast intent after MMS is downloaded
bfc3861 Look up MMS APN using the active MMS APN name
068f201 Look up MMS APN using the active MMS APN name
51010ae Move force 7 bit encoding for Vodafone Spain to correct location.
1b2066c Use AIDL based API's to comunicate with the carrier app for MMS sending and downloading.
f3debb1 MmsService fixes
79ab3ac Additional changes to SubscriptionManager API as per API council.
8690f9e Revert "Additional changes to SubscriptionManager API as per API council."
e05c0f2 Additional changes to SubscriptionManager API as per API council.
a813bdf PduParser MSIM support (1/4)
22519cf Stop persisting MMS into OUTBOX before sending
81b722b Add APN logging when doing MMS request
ed6f8f8 Update SubscriptionManager API as per API council.
3cf9a94 Support multi-sim in mms service
bdb6fe1 Use okhttp lib for MMS service HTTP request
a124668 Clean up public API of SubInfoRecord.
a6b72c4 Change subId to int from long
fb2a1f5 Disable Content-Disposition header for 53005
848307f Send HTTP status code back in case of MMS HTTP failure (3/3)
142340c Sprint: MMS proxy authorization does not include NAI

## project packages/services/Telecomm/
47da905 Fix possible deadlock in BluetoothPhoneService
646fa3d Add timeout for emergency calls
bf9cd0e Fixing conference managment regression.
ba30475 PhoneAccount -> SubId for use in TelephonyManager#line1Number
79d646f Remove line to allow hiding SMS response from InCallUI in multiSIM.
2808bb0 Import translations. DO NOT MERGE
32d4117 Unplugging headset shouldn't stop Bluetooth.
cca07e2 Import translations. DO NOT MERGE
d92e737 Fix for call timer resetting when starting IMS conference call. 4/4
a290b2a Remove overflow menu for quick responses.
e94a8f1 Disconnect held call when answering third call.
e44adb4 Fixing unhold in CallsManager so it does not hold child calls.
0b4e8a2 Add support to clean up calls that are alive
4ba27e9 Set Quick Response pref as MULTI_PROCESS.
cd425a1 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
4768986 Fixing Telecom state dumping.
c88574c IMS: Add phoneaccount to ims conference call.
a469f76 Play DTMF tones when sending DTMF tones during post dial wait.
581ec4a Make telecom a non-persistent process.
fe36334 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
398893b Remove android:debuggable from manifest
a3d522e (Telecom-system part 4) Move telecom to the system server process.
55c613b (Telecom-system part 2) Move telecom intialization from application to service.
c363213 (Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals.
e6a33f2 (Telecom-system part 4) Move telecom to the system server process.
f987d1a (Telecom-system part 2) Move telecom intialization from application to service.
0b5cb4d (Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals.
359bd96 Import translations. DO NOT MERGE
105d977 Track (and use) UserHandle to make connections
ae11a97 Update missed calls in background
1fdab8a Use TelecomManager to call TelephonyManager#getVoicemailNumber (2/2)
2767926 Fix fallback for emergency calls
9b71ea8 Improve outgoing call UI responsiveness
69677f8 Import translations. DO NOT MERGE
dda6919 Use AudioManager.MODE_NORMAL when selecting account from dialog.
61e6f35 Maintain Full Wake Lock while an incoming call is ringing.
a5267a1 Removing STOPSHIP comment that is not needed (per bug).
113ad62 Don't show add if there is an outgoing call.
a21edb8 Properly convert GENERIC_CONFERENCE capabilities.
d5c2fcf Fix connection <=> call capability conversion.
d04de9d Turn off SYSTRACE_DEBUG
5997951 Disconnect all calls that are not reused when placing new call
c314fcc Fixing issue where VoLTE conference calls have incorrect call time.
15a7155 Rename VoLTE capability to HIGH_DEF_AUDIO.
07bc5ee Telecom API updates (4/6)
ebdb780 Import translations. DO NOT MERGE
1522691 Ringer: Use internal ringer mode when determining vibration.
bc95db9 When adding a new call, use same phone account for call.
0d725fb Import translations. DO NOT MERGE
33c05d3 Additional changes to SubscriptionManager API as per API council.
4bc0245 Remove Guava references from Telecom.
d5725fa Set number presentation in call log correctly
ac23e53 Fix bad merge in Telecom
d45da14 Revert "Additional changes to SubscriptionManager API as per API council."
dcf7b1f Fix NPE if phone ringtone is set to None
fe1ce0a Allow calling of voicemail using CALL_PRIVILEGED
668dee0 Hide "respond via SMS" option for non-default SMS SIM.
fe08155 Additional changes to SubscriptionManager API as per API council.
8d0b4c3 Add Systrace logging to Telecom
b686c84 Create default InCallService with Context.BIND_IMPORTANT
045b6c9 Create IMSConference to represent IMS conference calls.
40f9b17 Fix call duration for unanswered/missed calls.
e4a9c41 Add Systrace logging to Telecom
8efc032 Create default InCallService with Context.BIND_IMPORTANT
fd053f4 Style quick responses to Dialer Material.
addfada Import translations. DO NOT MERGE
156ae5b Fix PhoneAccount parceling (2/2)
2af16b6 Cleanup and remove call if ConnectionService crashes
7e2c7f3 Update PhoneAccount icon API (5/6)
d9d9e64 String resource edits for Telecomm
a01b656 Set appropriate capabilities to TestConference
52da703 Revert "Telecom, Telephony share a process."
91bd74c Make add-call a global property of telecom. (2/4)
752cacb Continue processing calls that don't connect
6ae4c99 Add a subId extra to the respond via SMS intent.
32a4eb7 Add SIP support to TestCallActivity
2be04fc Telecom, Telephony share a process.
eee6fa5 TestConnectionService needs more permissions!
10a5831 Checking that the connection service can be resolved when setting new connection manager.
96e662d Don't set voicemail handle to null
cf5b291 Reuse calls canceled through NEW_OUTGOING_CALL broadcast.
ecaaeac Don't show quick response messages for private numbers.
bafadce Add connection manager fallback
c28f260 Adn queries for multi-SIM. (3/3)
6be5e8c Use new telecom PhoneAccount registration permissions.
6e2b94e Creating connections for conference event package participants.
3ab204c Handle MMI for multi-SIM (2/3)
9b8badb Import translations. DO NOT MERGE
b664954 Clear account using TelecomManager not CallsManager.
d9f5438 PhoneAccounts include literal icon bitmap (3/4)
7ce6e78 Fix a long subId.
b1fb2ae Import translations. DO NOT MERGE
5a36b6e Propagate "call with" account to Telephony layer.
116549b Use the public API permissions
0ceb5a1 Add permission to CONNECTION_MANAGER PhoneAccount registration.
720bcbe Filter various callbacks in BluetoothPhoneService
3585060 Change subId to int from long
4550623 Don't start video call if already in a video call.
ac19f3d Rejected calls should be logged as "incoming" not "missed"
06ce062 Revert "Revert "Add color to PhoneAccount objects (2/3)""
0c345e9 Create handle with correct scheme in MissedCallNotifier
f5e5d3c Add an option to set the selected phone account as the default. (2/3)
235a52f Remove ADD_CALL if not only top-level call.
c0ca76e Send BTPhoneService update when active/background calls switch.
99c8520 Once responded to a call, remove it from list of ringing calls
a29b046 Enforce permissions for isVoiceMailNumber.
8d92f45 Enable account selection for MMI codes that involve "dialing".
cfd8f56 Disable add call/upgrade to video during dialing.
cce72fc Add more logging to proximity sensor
140004a Use Telecom API for checking if a number is voicemail (2/2)
178b3c4 Revert "Add API method to extract subscription ID from phone account (2/3)"
e6c7587 Add API method to extract subscription ID from phone account (2/3)
0c1e4f6 Fix incorrect reported time for missed calls upon reboot
3d0ef1d Fix typo in TestCallActivity
e732ef4 Send incoming call directly to CallReceiver
9787e0e Adding more Telecom state dumping.
5f8eaae Revert "Add color to PhoneAccount objects (2/3)"
615fcd6 Add color to PhoneAccount objects (2/3)
0511d26 Import translations. DO NOT MERGE
9671759 Import translations. DO NOT MERGE
45e99ec Import translations. DO NOT MERGE
c5b51ca Import translations. DO NOT MERGE
dd1607c Import translations. DO NOT MERGE

## project packages/services/Telephony/
740e31b Fix Cdma conference cleanup bug.
0918d94 Handle unknown connection from technology swap
2f25c1f Fixing conference merge where only one party is added to conference.
b3ee4dc Restyle USSD AlertDialog.
fa3de75 Use default URI instead of string name.
708cf31 Fixing UI issue to display preferred network type.
bc3677a Perform network search using the default sub id
a60be87 Change to append subId to network selection related sharedPreferences.
299e4a7 Skip call forwarding lookup for CDMA voicemail.
f2a0a31     [DS] TTY should be enabled.
584921c PhoneInterfaceManager should use subId value in requests.
2140925 PhoneInterfaceManager: pass phoneId to UiccController.getUiccCard()
c0215ed Fixed issue related apn not getting displayed with sim in slot 2.
7310cc7 Add getDeviceId to PhoneInterfaceManager to give id independent of SubInfo.
f67832f Rename reg/unreg OnSubscriptionsChangedListener.
fba8553 Fix for call timer resetting when starting IMS conference call. 3/4
35dbf54 Use provisioning status to decide whether to display Enhanced 4G option.
31a0c71 Use provisioning status to decide whether to display Enhanced 4G option.
413a2df Choose active SIM on MSIM devices when making emergency calls.
ddf4825 Add back pressed behavior for EditFdn Screen.
a564e9b Fixes Cell network setting items grayed out.
a6fc2a8 Fix to use subId instead of slotId when calling getPhone()
9443cdc Fix displaying of Data Roaming information.
b126b82 Import translations. DO NOT MERGE
e31492a In MobileNetworkSettings handle no sims in first or only slot.
afe8264 IMS: add an api to get IMS registration information.
a51d4ef Disable some settings if TTY over VoLTE not supported
5bca832 Fixed an APN grey out issue
785ca2a Update SubscriptionInfo and mPhone for new intents.
9674ff2 Adding subId in CdmaOptions to retrieve it in ApnSettings
ddb5d20 Initialize mPhone to the phone in slot 0.
a350849 Style disabled Preferences text to grey.
02539fd IMS: Set phone account in IMS Conference object.
d32a861 Import translations. DO NOT MERGE
515be40 Update PostDialListener instance for onPostDialChar.
67a62a2 Fix build break
f8ad78f Add logging for MWI visible/hidden.
103e83a Check both voice & data registration state for MO Call
1635769 Fixed a bug where APN did not always show.
15dd349 Import translations. DO NOT MERGE
a9142d7 Check both voice & data registration state for MO Call
48f6fea Fixed a bug where APN did not always show.
82256c0 IMS: Notify about change of TTY mode of other call participants
6fee2cb Move TtyMode into its own ListPreference class.
0fd40fb IMS: SRVCC related fixes.
dd4f6df Don't set settings titles for single SIM devices.
2c01cdf [DS] Location does not work with only Cellular data
c0fae3a Fixed an APN grey out issue
9ef689a Import translations. DO NOT MERGE
dcf40a9 Set radio power of all phones and multi phone changes.
43b6d3a Migrate voicemail ringtone before initing settings dialog.
483feb5 Replace exception on unknown DisconnectCause with UNKNOWN cause and message
5aefb0c Enable text-to-speech in dialer edit field (2/2)
621a47c Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
9c1071f When voicemail number is unknown, show voicemail setup on notification click.
f7c1a5a Add text-to-speech annotations to emergency dialer edit field
d5165b0 Tidy up visuals/behaviors for MSIM notifications.
375e27d Added Multi-SIM capability to Access Point Names
26970ad Revert call settings switch style UI
9dd07d0 Display "Can't switch calls." on "RESUME" supp service failure.
85190e6 Derive "merged" subscribers based on line numbers.
1dacd19 Import translations. DO NOT MERGE
2fcb6c3 Handle MSIM behavior for VM notifications and CFI.
7b2c6e2 Start the configure intent with the right user
e7353bb Add subId as parameter for get/setDataEnabled.
aeb465a Fixed a UI issue with Cellular networks
5efb112 Pass subId on intent back to call settings.
2592332 Fix order of voicemail ringtone initialization.
462cff8 IMS: Fix phone app crash
64e5c9d Create VoicemailProviderListPreference.
00bce13 IMS: Fix phone app crash
696bff5 Disable up button for Voicemail > Setup.
1ec7c7e Make voicemail vibrate/ringtone MSIM-aware.
d4abfd4 Make sure the exception is a CommandException before casting it to one.
6950c6c Change VmProviderSettingsUtil methods to static.
a82b820 Listen to subscription info changes to update MWI.
725657d Change the message for when there is no SIM to be more descriptive.
ac1bdfd Use SubscriptionController instead of SubscriptionManager.
5236f3a Enabled APNs option for Verizon SIMs
0717b30 MSIM IMS: convert to phone ID based selection.
a8b6050 Rename VoLTE capability to HD Audio.
495d7e1 TelephonyManager.setLine1NumberForDisplay should return a boolean.
2013d89 Import translations. DO NOT MERGE
3cc8121 Telecom API updates (5/6)
1f52dcb Import translations. DO NOT MERGE
c46700b Handle invalid subscription id
8d66d81 Move Voicemail notification settings into util.
385019f Add method for getting all active phones.
6944b0f Fix Telephony build
bb9b54c Hide "Make calls with" item for 1 account
be890cf Hide call assistant configure item if necessary
3eb40fc Simplify call assistant setting
1d49da6 Import translations. DO NOT MERGE
df9707e Adds the BIND_CARRIER_MESSAGING_SERVICE permission to the phone process, so that platform telephony components can communicate with the carrier app.
3ab207e Additional changes to SubscriptionManager API as per API council.
475951f Check both TETHER_DUN_APN and TETHER_DUN_REQUIRED to decide DUN APN behavior.
0ea038b Use activity as context.
ad99fb7 IMS SRVCC handling and call log cleanup.
e9fe49d Revert "Additional changes to SubscriptionManager API as per API council."
3346459 Fixing issue where DTMF tones were not issued through to the IMS framework once a conference is established.
88fd66a Additional changes to SubscriptionManager API as per API council.
dc54843 Set GENERIC_CONFERENCE capability on CDMA conferences.
8ea782a Change to not allow user to enable/disable LTE if LTE service forced is true.
2c248f3 Create IMSConference to represent IMS conference calls.
43330e0 Fixing a comment (changing phoneId to subId)
5e5becd Carrierprivileges: Addressing API council suggestions.
fbca990 Use correct back icon for xxxhdpi
e946853 Add code to show a message when a conference merge fails.
c34bf31 Restored 4G LTE setting for Shamu.
36c450a Restored 4G LTE setting for Shamu.
24c7ea6 Disable 'Enhanced 4G LTE Mode' setting entry when in a call.
a09d696 Hide carrier related settings if HIDE_CARRIER_NETWORK_SETTINGS is set.
e3c2f8f Restored 4G LTE setting for Shamu.
c268473 Don't create if not primary user
2c6ce2c Add missing xxxhdpi icon, remove redundant icons.
6a2bfed Update DisconnectCause conversion for IMS merges.
83904e1 Handle exceptions other than CommandException
d83e4e8 Get info from SubInfoRecord for color and icon.
2333fc1 Handle exceptions other than CommandException
3c6ce5e Created tabs for Multi-SIM Cellular Networks.
76d5da9 PhoneInterfaceManager: Adding a call to set voicemail number.
be2fb26 Fix NPE in onCreate
0f3b5fc Update SubscriptionManager API as per API council.
0354bb0 Update CDMA conference capabilities on recalculate.
a5a61e3 String resource edits for Telephony
ad5b1c0 Update PhoneAccount icon API (6/6)
5b177a6 Calculate conferenceable after conference.
84d4efc Make add-call a global property of telecom. (3/4)
dfa0410 Gsm Cdma options handling for Verizon
f85c95a Use the correct check to choose between CDMA and GSM network options.
d5b6b10 Hide carrier network settings if HIDE_CARRIER_NETWORK_SETTINGS is 1.
defacc8 Set package name before starting call assistant activity
ad6f3dc Conference event package performance improvement.
8402434 Add utility for voicemail dialogs.
1479dd1 Get Phone object using subscription id in Call settings.
1aa87b9 Delete some unused references.
0348766 Fire callback immediately if original connection already exists.
09bb16f Disable MANAGE_CONFERENCE in TelephonyConference.
1734de2 Add connections to conference controllers when original connection is valid
cb101f6 Implement performConference() in TelephonyConnection.
4d2db1c Avoid cancelling the data disconnected notification unnecessarily
2b36ba2 Add MSIM support for Call Forwarding.
3faa594 Don't send various Telephony notifications for managed users
af65e4f Change to treat preferred network type LTE as GLOBAL for non CDMA networks.
4ddb9bb Cleanup debug log statements in call settings.
2d5d1a4 Write clearer code to set voicemail number.
1af6cf7 Add utility for manipulating CallForwardInfo.
5ed870c Add MSIM support for FDN.
f1776d8 Rewrite voicemail initialization code.
9f73bda SubId are Integers.
ab08227 Remove unneeded abstraction in displaying dialogs.
f8c4cb3 Use CharSequence for DisplayName
bfc5d01 Various conference event package changes.
6214e2b Remove makeKeyForActivity().
253c8f9 Set default color of single-SIM PhoneAccount to NO_COLOR.
4877971 Clean up public API of SubInfoRecord.
78daba8 Delete unused EnableFdnScreen.
e438b31 Clean up some voicemail methods to be more clear.
83383e4 Move FDN-specific classes into own package.
854ec18 Verizon Network Modes
3a4447b Verizon Network Modes
80749b8 Use new telecom permissions.
b4edaf1 Creating connections for conference event package participants.
787a8cb Add voicemail settings activity and fragment.
4a4974e Overlay swap capability after merge
88b51e2 Create util for VoicemailProviderSetting operations.
15e40be Temporarily use hardcoded values for sim color display.
2c02789 Delete superfluous call feature settings code.
a107919 Communicating participant changes to conference controller.
78ee0b2 Add VoicemailRingtonePreference to contain lookup logic.
7e08364 PhoneAccounts include literal icon bitmap (4/4)
e3c1521 Add list of accounts in Phone Account Settings.
312e817 Improve video calling setting visiblity behavior.
4afb0a6 Separate VoLTE and VT configurations.
93c345f Hide account settings in call settings if multiple SIMs.
b490d73 Extract VoicemailProviderSettings from CallFeaturesSetting.
8bfc847 Use public API permission, not the internal permission
ddaefdd Temporary: set first slot color to NO_COLOR.
34dbcac Add android.permission.DUMP to manifest.
59a1f81 Move CHANGE_PHONE_ACCOUNTS filter to Phone Account Settings.
9131166 Fix for 0 showing up when longpressed in emergency dialer
047b1f9 Don't send voicemail notification for managed profile
16e0ff2 Prevent crash when activity is no longer running
b564aae Change subId to int from long
7522698 Fix broken build.
7c8f52b Rename VOLTE_VT constant to more accurately reflect function.
a4f952c Fix phone account settings translations
a7a917a Revert "Revert "Add color to PhoneAccount objects (3/3)""
df4fcee Add connection before resetting state of sibling connections
da11247 Revert "enforce dump permission on dump()"
77527ac Hide/show Telephony video setting according to if IMS is enabled.
0ef9516 Revert "enforce dump permission on dump()"
8e4dae5 enforce dump permission on dump()
c4194d3 Set ADD_CALL capabilities on TelephonyConnections.
d592f5e Fix compile error on ConferenceController.
e659bf4 Remove manage conference option for IMS.
df14ead "Add" enable video call setting to call settings.
e0579cd Convert GsmConference into more generic TelephonyConference.
5d475dd Radio Capability Support.
e2e409e Exit SipEditor when home affordance pressed
9b34151 Don't exit emergency dialer when dialing emergency call
9b4e65f Disable disconnect/separate for connections which were ever IMS.
135aa93 Revert "Add API method to extract subscription ID from phone account (3/3)"
64a7d79 Cleanup Call Settings initialization code.
e0f2b79 Set correct theme for MMI-related dialogs
ac00bb2 IMS:change enhanced 4g setting to store in setting db.
3c96d1a Enable HOLD capability for IMS-based CDMA connections.
9edc01d Initial removal of some dead code in Telephony
588083d Revert "Add color to PhoneAccount objects (3/3)"
ae8840c Add color to PhoneAccount objects (3/3)
a31a04b Add API method to extract subscription ID from phone account (3/3)
ee1f87d Error Dialog Dismissal for Call Waiting
c717bf3 Ims: Send user selected TTY mode to lower layers.
9ed62ca IMS:fix DTMF tone is not sent during volte call for CdmaConnection. During VOLTE call, DTMF tone should not be sent as burst DTMF.
96e4745 Fix actionbar style in SimContacts activity
c35836d Allow importing contacts from mulitple sims
419d506 Progress dialog dismissal when remote call to network search fails, single reg.
f8733b4     [DS] Mutilple SIM support on ITelephony interface
b30c9a2 fix build.
10aa2e9 Fix call get getActivatedSubInfoList.
0887461 ksd to lmp-sprout-dev

## project packages/wallpapers/Basic/
ffd7a6f Import translations. DO NOT MERGE
7feaf40 Import translations. DO NOT MERGE

## project pdk/
4a542d9 camera2: Remove ITS from pdk apps.

## project prebuilts/clang/darwin-x86/host/3.5/
7a28ce5 Update darwin clang prebuilts for Cortex-A57 crash fixes.

## project prebuilts/clang/linux-x86/host/3.5/
95068e0 Update clang for Cortex-A57 crash fixes.
eb4b572 update clang prebuilts

## project prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9/
fee61fe Update mips64 toolchain mips64el-linux-android-4.9 (darwin-x86_64)

## project prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9/
1bcdba4 Update mips64 toolchain mips64el-linux-android-4.9

## project prebuilts/maven_repo/android/
a11e1b2 Prebuilts of support 21.0.3
a4121ba Add Multi-Dex 1.0.1 to support repo.
16c84f4 Prebuilts for support lib 21.0.2
517edf9 Publicly released version 1.0.0 of multidex.

## project prebuilts/misc/
7440315 Add espresso prebuilt
25f53b2 Update icu4j to 53.1
13d7d3a Update tradefed prebuilt for cts-tradefed
bc87938 Update ub-uiautomator prebuilt for null root node workaround
9685165 Update tradefed prebuilt for cts-tradefed
2a6f2f8 Revert "Only enable build modules for platform branches"
41a78ee Only enable build modules for platform branches
6a571cb Add prebuilt Android Test Support and UI Automator helper libs
24fd5bd Update sdk-common.jar prebuilt to v24.0.2
1c12078 Update layoutlib_api-prebuilt to v13
e29b398 Helper class for developing power tests
b5c3208 Update UiAutomator prebuilt with API change to remove TimeoutException.

## project prebuilts/ndk/
28f83b2 Cherry-pick: Only use <atomic> for C++11 and newer
b8a3ce7 Add real android-21 32-bit headers/libs
b8b71b6 Remove symlinks android-21/arch-{arm,mips,x86}
e00eb88 Move 64-bit headers/libs to android-21
473dde0 Add back for 64-bit: arc4random, arc4random_buf and arc4random_uniform
0a5be1e Fixed the 3rd arg of functions strtoll_l, strtoull_l, wcstoll_l and wcstoull_l
36bac3e Update GNU STL 4.9 in prebuilts/ndk
3805fef rebuild mips64 gabi++, stlport and llvm-libc++ in r6

## project prebuilts/sdk/
8663a58 DO NOT MERGE ANYWHERE. Update prebuilt SDK to LMY44
7efff69 Add DENSITY_280
fee7c3a DO NOT MERGE ANYWHERE. Update prebuilt SDK to LMY42
fbfe09c Import translations. DO NOT MERGE - Update prebuilt SDK to LMY33
8077d68 Hopefully final API 22.
4146e80 Import translations. DO NOT MERGE - Update prebuilt SDK to LMY22
deb6463 Import translations. DO NOT MERGE - Update prebuilt SDK to LMY21
9acc861 Check in System API file level 22.
6c349a1 Import translations. DO NOT MERGE - Update prebuilt SDK to LMY15
cb6f265 Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
66a311a Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
6ada329 update 22.txt for renaming to setPreferredNetworkTypeToGlobal
a72f6f9 Import translations. DO NOT MERGE - Update prebuilt SDK to LMY13
700390c Hide some functions in SubscriptionInfo.
4905119 Rename reg/unreg OnSubscriptionsChangedListener.
4af6d85 Update prebuilt signapk.jar as of LMY08E  #1674527 lmp-mr1-release.
d9d7052 Import translations. DO NOT MERGE. update Mac aapt. lmp-mr1-release build id 1672261.
9dca96a Import translations. DO NOT MERGE - Update prebuilt SDK to LMY07
5345563 Import Jack and Jill Arzon 1.0-mr2
660cfef remove actions and calls for the old sms/mms api BUG: 18005911
6a0553d "final" API 22.
44fa23d Import translations. DO NOT MERGE - Update prebuilt SDK to LMX72
a56fdf5 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX71
8be0bc8 Import translations. DO NOT MERGE. update support library
f6df06f Import translations. DO NOT MERGE - Update prebuilt SDK to LMX65
150d372 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX63
0d3d24a Import translations. DO NOT MERGE - Update prebuilt SDK to LMX63
9885c8a Import Jack and Jill Arzon 1.0-mr1
40b9b32 Updated for s/futimens/futimes to remove GLIBC_2.6 dependency.
680a285 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX55
4a61fbd Import translations. DO NOT MERGE - Update prebuilt SDK to LMX51
9172187 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX50
4b9f5e7 Import translations. DO NOT MERGE. update support library to 21.0.2 from lmp-sdk-release, build id 1585793
c51e999 Update system_current SDK to fix ub-webview-m39 breakage.
c26509e Import translations. DO NOT MERGE - Update prebuilt SDK to LMX44
326dc08 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX44
5ab314b Import translations. DO NOT MERGE - Update prebuilt SDK to LMX43
2300475 Import translations. DO NOT MERGE Update support library to LSX30C  #1581297
233703a Import translations. DO NOT MERGE - Update prebuilt SDK to LMX42
6238b55 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX41
d3a7457 Import translations. DO NOT MERGE - Update prebuilt SDK to 1571463
b9690c7 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX37
534ebc2 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX36
62947d3 Import translations. DO NOT MERGE - Update prebuilt SDK to LMX35
e1cdad8 Drop prebuilt sdk from lmp-sprout-dev #1561962 DO NOT MERGE
1209904 Track removal of deprecated DateFormat APIs.
b4d1e43 Roll 22.txt back to match 21.txt.
a7e0fd2 Start tracking user-visible permissions on each platform version.
c38a27f Import Jack and Jill from UJX30A
9cacae2 Import Jack and Jill from UJX28B
246fa63 Update 22.txt with generics to field types.
c776915 Update prebuilt SDK to 1540531
38d5bad Update 21.txt with generics to field types.
2362d95 Import translations. DO NOT MERGE - Update prebuilt SDK to LRX16G
31b7805 Update 21 SDK to LRX14
dc3207a On to API 22.
0ac8cff DO NOT MERGE - Update prebuilt SDK to LAX13
b578fba DO NOT MERGE - Update prebuilt SDK to LAX13
0440553 DO NOT MERGE - Update prebuilt current SDK to 1469430
6aef769 DO NOT MERGE - Update prebuilt current SDK to 1466287
a8ef834 Import translations. DO NOT MERGE - Update prebuilt SDK to LAW81 Conflicts: 	current/android.jar 	current/support/annotations/android-support-annotations.jar 	current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar 	current/support/multidex/library/libs/android-support-multidex.jar 	current/support/v13/android-support-v13.jar 	current/support/v17/leanback/libs/android-support-v17-leanback.jar 	current/support/v4/android-support-v4.jar 	current/support/v7/appcompat/libs/android-support-v7-appcompat.jar 	current/support/v7/cardview/libs/android-support-v7-cardview.jar 	current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar 	current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar 	current/support/v7/palette/libs/android-support-v7-palette.jar 	current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar 	current/uiautomator.jar

## project prebuilts/tools/
4c57206 Add guava and guava-parent 17.0.

## project sdk/
7859e2e Autocomplete disable-verity

## project system/core/
317b402 Revert "Make encryption configurable"
bda6272 Make encryption configurable
c5a4b31 android_filesystem: Remove setuid bits from tcpdump
33e4f4d android_filesystem: Remove setuid bits from tcpdump
5f2ff6a Add timed versions of stack dumping functions.
77262e7 Remove explict use of ASCII encoding
d5b4176 Return path including executable instead of without
017c97a Fix building on modern versions of Xcode and OS X.
faa0935 sdcard : inode numbers must be fully representable as uint32_t.
ba95be5 init: Fix memory corruption when sanitizing platform paths
703b87d Provide a way to select force encryption from vendor partition
4fca591 audio: add usage "virtual source" to audio attributes.
47f52f2 audio: new stream types
a5a4e9e sdcard: mount sdcard with the noexec option
83d8556 logd: throttle SELinux denials to 20/sec
86c9e5f Introduce "adb keygen"
db44538 Convert futex to cond wait.
72f0d92 DO NOT MERGE: Do not mount devices with invalid verity metadata
9573a13 DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1
4cf5297 property_service: Added vendor build properties to load_all_props
eb6036a fs_mgr: let fsck.f2fs actually attempt a fix
0eabf64 Fix adb/fastboot windows compilations.
6672300 Ensure /data/adb exists
2b8852d Fix native_handle_create to check if malloc fails
3e05314 Fix mac build
84ddb34 Fix debuggerd issues.
4cafe2f Fix verity on system partitions larger than 2G
9ef4fa4 Add code cache tests to libnativebridge.
5b244cd toolbox: add prlimit command
f643bec adb warns on remount when verity is enabled
1402fbb Handle code_cache dir creation in libnativebridge
7770252 rootdir: Make trusty version readable by dumpstate
976e1b6 Remove libsigchain from LD_PRELOADs
97e4873 Fix Nick's nits
bbb3631 Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
152d2d4 Revert "Enable verity on userdebug, and add disable-verity to adb"
d4cea0b Enable verity on userdebug, and add disable-verity to adb
260f3be logd: kill(0,0) issue
1e1d71e logd: LogStatistics leak
a0e5354 logd: Add control statistics enable/disable.
987f1e0 logd: cleanup
823a4c7 logd: auditd: report facility LOG_AUTH
327cac6 logd: auditd: kmsg priority
2c05b4f Fix top for very large VSS.
522d72b Make the default cgroup, the foreground cgroup.
4c4cf46     modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
8386725 Add -std=gnu++11 to test cflags
bdf11c7 healthd: Add callback for screen_on to the healthdHAL
fcbb23a [AU] Update volume setting and Audio Device API 3.0
ebeb0c0 healthd: use warning level for info logs

## project system/extras/
ac342b9 Add a reference C implementation for verifying signatures
8f85f69 Support [-j <journal_size>] in mkuserimg.sh
1ec61e7 Support [-j <journal_size>] in mkuserimg.sh
241f964 Add signature verification to keystore and verity signers
40193d9 Fix comments in BootSignature.java.
3380f2f DO NOT MERGE: Implement boot signature verification
f0f33ad DO NOT MERGE: Update keystore and verity metadata signers
8d7e924 DO NOT MERGE: Support converting X.509 cert into a verity public key
578a347 DO NOT MERGE: Add a tool for verifying verity signatures in images
29131b9 Reinstate "Update boot image signature format to version 1"
7377e00 Revert "Update boot image signature format to version 1"
b62eabd Update boot image signature format to version 1
d66cefd Fix issues with appended boot signature.

## project system/media/
cad6619 camera-metadata: clarify the AE precapture trigger API spec
fa73c08 camera_metadata: relax the EV compensation requirements
aed8cea Camera2: update color aberration spec
14cd098 Camera: Make HDR scene mode public.
9d1b452 Camera2: update antibanding spec
12aeef1 Camera2: Doc updates for aeExposureCompensation.
4095457 Camera: Add one more requirement to BURST_CAPTURE
0f0d795 Camera: Add BURST_CAPTURE capability flag
fe521b1 [audio][eac3] Support EAC3 with small frames
a43690a camera2: Add READ_SETTINGS capability.
668e43c Camera: doc update for independent 3A

## project system/netd/
2e5fa93 exit instead of returning when execv()ing clatd fails.
59273ed Re-add netd support for enabling IPv6 optimistic mode.
1e23c70 Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
9ccaa16 Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
dadc5f8 Add a command to clear a network's DNS servers.
584dbee Don't use framework permission strings for netd permissions.
347f693 Write pid file so we can tell when netd bounces.
64166e7 Don't fail when trying to add routes that already exist.
0ea8ff8 Add a netd interface command to disable ND offload.
ac7fefc Support more than one clatd at a time.
36b4a0d Add netd support for configuring IPv6 optimistic mode.
6fa06b7 softap: Ensure entropy file creation

## project system/security/
9976480 Indicate that softkeymaster key blobs are standalone, meaning they don't require a functional file system or any other support infrastructure.

## project system/vold/
223fd1c Revert "Make encryption configurable"
6a69cfc Make encryption configurable
b25302e Do not log passwords returned through vdc
ef2b5be Fix error in clocks leading to devices staying unlocked
b1eb7a0 Fix encrypt-and-wipe
b660360 fall back to dm-crypt if device already encrypted
4ac0c62 Adding support of dm-req-crypt
bb7d9af fall back to dm-crypt if device already encrypted
87701e2 Adding support of dm-req-crypt
7c49ab0 Modify vold to check for hardware keymaster.
85c01f9 Make persistent field in cryptofs support longer values.
7fc1de8 cryptfs: [HACK] reboot if the crypto block dev failed to open
3334c6a cryptfs: extra debugging around crypto blockdev dm-... errors.