summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-15msm8998: Update to LA.UM.5.7.R1.07.00.00.253.052android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-pixel-releasenougat-mr2-devThierry Strudel
msm8998: from hardware/qcom/media 5259148 Merge AU_LINUX_ANDROID_LA.UM.5.7.R1.07.00.00.253.042 on remote branch a0e855a Promotion of video-userspace.lnx.2.1-00043. edd6850 mm-video-v4l2: vdec: Convert maximum display luminance in cd/m2 75d7325 mm-video-v4l2: vdec: set refresh rate to display fd31f2d Merge "mm-video: Fix bug in input buffer dumping code." into video-userspace.lnx.2.1-dev 458644d mm-video-v4l2: vdec: Support for dither control 5524052 Merge video-userspace.lnx.2.1-rel on remote branch f60c943 mm-video-v4l2: Replace msmcobalt to msm8998 f2d6e08 Rename msmcobalt to msm899 cf6523f Merge "audio: add entry components for amrnb, amrwb and g711" 215e1c1 mm-core: Add entry components for alac,ape and flac decoders 824d0cd mm-video: Fix bug in input buffer dumping code. a508382 audio: add entry components for amrnb, amrwb and g711 Bug: 33556391 Change-Id: I84f4483cff6048ea98a0e9bf28d00240689d60ae Signed-off-by: Thierry Strudel <tstrudel@google.com>
2016-12-15msm8998: rename msmcobalt to msm8998Thierry Strudel
Bug: 33556391 Change-Id: I608cbf071aa5862c5c9caf540b9a8597e4363c0d
2016-12-07msmcobalt: Update to LA.UM.5.7_RB1.07.00.00.251.006Thierry Strudel
msmcobalt: from hardware/qcom/media 3682218 Merge AU_LINUX_ANDROID_LA.UM.5.7.R1.07.00.00.253.042 on remote branch ea14023 Promotion of video-userspace.lnx.2.1-00040. d9d0b66 Merge "mm-video-v4l2: vidc: add traces for performance debugging" 0586ff2 Merge "mm-video-v4l2: vidc: venc: Reinit PQ only when supported and needed" 3edac02 Merge "mm-video-v4l2: venc: Add a utility to modify/access HAL1 meta-buffer" 9d3189e Promotion of video-userspace.lnx.2.1-00039. 9838bdd mm-video-v4l2: vidc: add traces for performance debugging 4c0d8f2 mm-video: Set the new format in ETB only if opaque color format. a7af917 mm-video-v4l2: venc: Add a utility to modify/access HAL1 meta-buffer 0576016 mm-video-v4l2: vidc: venc: Reinit PQ only when supported and needed 884a9b2 Merge "mm-video-v4l2: Add openmax interface to disable PQ" 0b1158e Merge "mm-core: Add msm8996 in auto tools compilation" 8180826 Merge "mm-video-v4l2: vdec: Support for TP10 output color format." ad893fb mm-video-v4l2: Add openmax interface to disable PQ 5d05082 Merge "mm-video-v4l2: vidc: venc: Use cached ION buffers" c10154e mm-video-v4l2: vdec: Support for TP10 output color format. 667b16f mm-core: Add msm8996 in auto tools compilation 04d5e40 mm-video-v4l2: Enable auto tools for video components compilation d91c604 mm-video-v4l2: vidc: venc: Use cached ION buffers Bug: 33405777 Change-Id: I5c9eacc4d4cb07c3700522b20fcb126ffb607760 Signed-off-by: Thierry Strudel <tstrudel@google.com>
2016-11-17msmcobalt: Update to 07.00.00.253.042Thierry Strudel
msmcobalt: from hardware/qcom/media ee5da8d mm-video-v4l2: Add openmax interface to disable PQ df7914e Promotion of video-userspace.lnx.2.1-00036. 95addbc Merge "mm-video-v4l2: vdec: Avoid resetting extra data variables" 9f1efaa Merge "mm-video-v4l2: vidc: vdec: Handle crop rectangle correctly" a8f6add Merge "mm-video-v4l2: vdec: Support for HDR Info extension" 57dc226 Merge "mm-video-v4l2: vdec: refine refresh_rate handling" 5aa2ab9 Promotion of video-userspace.lnx.2.1-00035. e5b37cb Promotion of video-userspace.lnx.2.1-00034. ea41e49 mm-video : check input before allocating memory to filename eca0960 Merge "mm-video-v4l2: vidc: venc: Enable PQ for higher fps" into video-userspace.lnx.2.1-dev 040eb3e Merge "mm-video-v4l2: vidc: venc: Allow setting dynamic Bframe" into video-userspace.lnx.2.1-dev 034bc86 mm-video-v4l2: vidc: venc: Enable PQ for higher fps 424a161 Merge "mm-video-v4l2: vidc: venc: Add 5.2 level for H.264 in profile table" into video-userspace.lnx.2.1-dev 53b07e3 mm-video-v4l2: vdec: Support for HDR Info extension b32f9c8 mm-video-v4l2: vidc: vdec: Handle crop rectangle correctly 60635b8 mm-video-v4l2: vidc: venc: Add 5.2 level for H.264 in profile table 2873036 mm-video-v4l2: vdec: Avoid resetting extra data variables 1bbcb81 mm-video-v4l2: vidc: venc: Allow setting dynamic Bframe 3e72b5b mm-video-v4l2: vdec: refine refresh_rate handling 7402dc9 mm-video-v4l2: vide: vdec: modify refresh rate calculation Change-Id: I4b8d12a078cf63803c71ccedced9a9444a1e66f6 Signed-off-by: Thierry Strudel <tstrudel@google.com>
2016-11-05msmcobalt: Update to 07.00.00.253.039 am: 69b5668297Thierry Strudel
am: 275266864c Change-Id: I1c4cd4723cc16108afea9a635e3c9511150c74f1
2016-11-05msmcobalt: Update to 07.00.00.253.039Thierry Strudel
am: 69b5668297 Change-Id: I1078b39b14c08ca0c1696d6f95ccaa07fa70a8e9
2016-11-03msmcobalt: Update to 07.00.00.253.039Thierry Strudel
msmcobalt: from hardware/qcom/media 463929d Promotion of video-userspace.lnx.2.1-00032. 3c0477c Merge "mm-video: swvenc: Set color format properly for different buffer types." into video-userspace.lnx.2.1-dev 35e2557 mm-video-v4l2: vidc: venc: Handle setting of profile level max. c326ab2 Merge "mm-video : corrects dumping logic" into video-userspace.lnx.2.1-dev d078f1f Promotion of video-userspace.lnx.2.1-00031. 37d2a71 Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into video-userspace.lnx.2.1-dev afb6c07 mm-video-v4l2: vidc: venc: Remove sys prop for low power mode e316941 mm-video-v4l2: vdec: Disallow input usebuffer for secure case 38af1bf Merge "swvenc : Sanitize buffer to native colorformat" into video-userspace.lnx.2.1-dev 2c5a0ef Promotion of video-userspace.lnx.2.1-00028. 00b184a mm-video : corrects dumping logic 4c478c2 mm-video-v4l2: venc: Avoid swapping width/height during roation set config a9321d9 Merge "mm-video-v4l2: vidc: venc: Optimize PQ init" into video-userspace.lnx.2.1-dev 7e5bab4 Merge "mm-video-v4l2: vidc: venc: Remove legacy encoder device file" into video-userspace.lnx.2.1-dev bcb63f8 Merge "mm-video-v4l2: vidc: Populate buffer requirements in C2D" into video-userspace.lnx.2.1-dev f53db53 mm-video: swvenc: Set color format properly for different buffer types. 6e0c2bc swvenc : Sanitize buffer to native colorformat 9a43aac mm-video-v4l2: vidc: venc: Remove legacy encoder device file c7911b3 mm-video-v4l2: vidc: venc: Optimize PQ init 6023e9b mm-video-v4l2: vidc: Populate buffer requirements in C2D Change-Id: I70f7c86b74eb3229f3052d96f142f9dd04a2989f Signed-off-by: Thierry Strudel <tstrudel@google.com>
2016-10-21msmcobalt: update to 07.00.00.253.035Thierry Strudel
am: 42adfa335e Change-Id: I46d84fc010102c230ea312fb1221d1a3b81e78a5
2016-10-20msmcobalt: update to 07.00.00.253.035nougat-mr1-devThierry Strudel
Change-Id: I3bdc9cc53f662ba60851be20d69f78c427877040
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 am: 59bc24bb55 am: 3e57f7a8c5 am: 2a4c981656 am: f42a057792 am: 56c7e0ae48 am: 8d7bd2d9a3 am: 86b3cbd7a3 Change-Id: Iae601322881cbf861ea3d192ec921f7e0021aec7
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901caca ↵Mahesh Lanka
am: 6d9442bc07 am: 0b77d9ac44 am: ef3b26c6bc am: 6fb087b6c7 am: 0ecafb9c28 am: c95889f10e am: f56c71744c am: fa4c9c0b41 Change-Id: I429c8b43f09946f6c8afe3303393a0e60b3a6ba0
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 am: 59bc24bb55 am: 3e57f7a8c5 am: 2a4c981656 am: f42a057792 am: 56c7e0ae48 am: 8d7bd2d9a3 Change-Id: I50c1ccedcedb764ec98d377bac4ca8329c388a11
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901caca ↵Mahesh Lanka
am: 6d9442bc07 am: 0b77d9ac44 am: ef3b26c6bc am: 6fb087b6c7 am: 0ecafb9c28 am: c95889f10e am: f56c71744c Change-Id: I2a268d430621c2938bd104e791cfca069dd1d694
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 am: 59bc24bb55 am: 3e57f7a8c5 am: 2a4c981656 am: f42a057792 am: 56c7e0ae48 Change-Id: I15cb23db5bb2a03c466f89b43b94e44e636d8dcf
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901caca ↵Mahesh Lanka
am: 6d9442bc07 am: 0b77d9ac44 am: ef3b26c6bc am: 6fb087b6c7 am: 0ecafb9c28 am: c95889f10e Change-Id: I6f701e58d516f2e90edc24c559a5ef573df346c9
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 am: 59bc24bb55 am: 3e57f7a8c5 am: 2a4c981656 am: f42a057792 Change-Id: I362e1bf35b2c5a146825d5296cab06debb52d51e
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901caca ↵Mahesh Lanka
am: 6d9442bc07 am: 0b77d9ac44 am: ef3b26c6bc am: 6fb087b6c7 am: 0ecafb9c28 Change-Id: Ia1733933fe6cea112629bcb75fa11f0f3b909a43
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 am: 59bc24bb55 am: 3e57f7a8c5 am: 2a4c981656 Change-Id: I8461b2499e92ece3b2f8f730c29f825b261464dc
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901caca ↵Mahesh Lanka
am: 6d9442bc07 am: 0b77d9ac44 am: ef3b26c6bc am: 6fb087b6c7 Change-Id: I8f2e240772f1619ed75d9215b37738f47d4974df
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 am: 59bc24bb55 am: 3e57f7a8c5 Change-Id: I1d4fb83009023004b03abbfca872735df8230226
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901caca ↵Mahesh Lanka
am: 6d9442bc07 am: 0b77d9ac44 am: ef3b26c6bc Change-Id: I2e990ee09f4074f75f90496cc7ceea6657bb4807
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 am: 59bc24bb55 Change-Id: I57c9c046cb4624b03af87da866737297e1990b8f
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901caca ↵Mahesh Lanka
am: 6d9442bc07 am: 0b77d9ac44 Change-Id: I66b11814579950994eab0974585929e68dfdadf3
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 am: 2879d78a40 Change-Id: Ie8d15dbb5c2ea767a151e891bd058cedb4834f2a
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 435901cacaMahesh Lanka
am: 6d9442bc07 Change-Id: I4a0dc6edad0dcb4ed934f227250429714389496c
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Mahesh Lanka
lmp-mr1-dev am: 771e0eae99 Change-Id: I08884156d73b7678f02c7f0d1edd113bac2b3db4
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure caseMahesh Lanka
am: 435901caca Change-Id: I06301558fa2bef6aebd49f3c800feb9a368fe565
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵TreeHugger Robot
lmp-mr1-dev
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
klp-dev am: 2863f9c165 am: 93b7fded39 am: e0e2c14448 am: 64cf9ed280 am: 31c2b13323 am: c75149d2d2 am: 7d0f2de1c5 am: 4233adfcca am: 7512a6506a am: 1c6a87a96f am: c4a6fcfc92 am: 04eb65f24e am: 4485eaed27 Change-Id: I9fa70af1215a659470b9ceb016b239e2ae7d69da
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: d51985695d ↵Mahesh Lanka
am: ee318ecf0b am: f169d05c8b am: b9e65e3fe7 am: 1fe944e60b am: d51520a151 am: 4a9febeb85 am: a9cee601f5 am: 1553a27fd5 am: 6adc251386 am: e3b9ae99d6 am: eafba188f6 am: b89aad236a Change-Id: I3589aa5ddc46fb2f1999dbf7137b34616a4f6f45
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
klp-dev am: 2863f9c165 am: 93b7fded39 am: e0e2c14448 am: 64cf9ed280 am: 31c2b13323 am: c75149d2d2 am: 7d0f2de1c5 am: 4233adfcca am: 7512a6506a am: 1c6a87a96f am: c4a6fcfc92 am: 04eb65f24e Change-Id: I6660cc84074c93f13cf4fcc012ce0f49a776fdda
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: d51985695d ↵Mahesh Lanka
am: ee318ecf0b am: f169d05c8b am: b9e65e3fe7 am: 1fe944e60b am: d51520a151 am: 4a9febeb85 am: a9cee601f5 am: 1553a27fd5 am: 6adc251386 am: e3b9ae99d6 am: eafba188f6 Change-Id: Iedcea5129ee241c267868932a528d2fde4c35f62
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 414a06df33 ↵Mahesh Lanka
-s ours am: 515ad928ba am: 1d452915b6 am: 8ac1fd53d0 am: 6d121585b4 am: a279b39a50 am: 887d5d0c94 am: 7a2953c1fa am: a8c79394f0 am: 3119007b52 Change-Id: I0c7f6ab8b156f5fb51186c8e56552e5a3b04660c
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
klp-dev am: 2863f9c165 am: 93b7fded39 am: e0e2c14448 am: 64cf9ed280 am: 31c2b13323 am: c75149d2d2 am: 7d0f2de1c5 am: 4233adfcca am: 7512a6506a am: 1c6a87a96f am: c4a6fcfc92 Change-Id: I0d5f394ada2d8d59cfbac4f6d4fba79ee5035105
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: d51985695d ↵Mahesh Lanka
am: ee318ecf0b am: f169d05c8b am: b9e65e3fe7 am: 1fe944e60b am: d51520a151 am: 4a9febeb85 am: a9cee601f5 am: 1553a27fd5 am: 6adc251386 am: e3b9ae99d6 Change-Id: Iad9dccb091443caf024a28f066c4a81100544e82
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 414a06df33 ↵Mahesh Lanka
-s ours am: 515ad928ba am: 1d452915b6 am: 8ac1fd53d0 am: 6d121585b4 am: a279b39a50 am: 887d5d0c94 am: 7a2953c1fa am: a8c79394f0 Change-Id: I090cf9fcd1f600e947a63b178def89a1821206c7
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
klp-dev am: 2863f9c165 am: 93b7fded39 am: e0e2c14448 am: 64cf9ed280 am: 31c2b13323 am: c75149d2d2 am: 7d0f2de1c5 am: 4233adfcca am: 7512a6506a am: 1c6a87a96f Change-Id: Ic1f490e720bf92d411fcdf69dd2117e8decaf0c8
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: d51985695d ↵Mahesh Lanka
am: ee318ecf0b am: f169d05c8b am: b9e65e3fe7 am: 1fe944e60b am: d51520a151 am: 4a9febeb85 am: a9cee601f5 am: 1553a27fd5 am: 6adc251386 Change-Id: I786fe5e2649a9bcf98c20668f7d6cddf9a3db4a3
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 414a06df33 ↵Mahesh Lanka
-s ours am: 515ad928ba am: 1d452915b6 am: 8ac1fd53d0 am: 6d121585b4 am: a279b39a50 am: 887d5d0c94 am: 7a2953c1fa Change-Id: If087b1e16512931c52b89e0232fe80c8a7219e42
2016-10-19Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
klp-dev am: 2863f9c165 am: 93b7fded39 am: e0e2c14448 am: 64cf9ed280 am: 31c2b13323 am: c75149d2d2 am: 7d0f2de1c5 am: 4233adfcca am: 7512a6506a Change-Id: Ief9852854a045898b86c3c234818c117688ed63a
2016-10-19mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: d51985695d ↵Mahesh Lanka
am: ee318ecf0b am: f169d05c8b am: b9e65e3fe7 am: 1fe944e60b am: d51520a151 am: 4a9febeb85 am: a9cee601f5 am: 1553a27fd5 Change-Id: Ib3006ba047e2d93fcf311fa506cc4e5a44cf63d8
2016-10-18mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 414a06df33 ↵Mahesh Lanka
-s ours am: 515ad928ba am: 1d452915b6 am: 8ac1fd53d0 am: 6d121585b4 am: a279b39a50 am: 887d5d0c94 Change-Id: I0a3af6dfb6122a86cde8a5ace684f95d99a8d450
2016-10-18Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
klp-dev am: 2863f9c165 am: 93b7fded39 am: e0e2c14448 am: 64cf9ed280 am: 31c2b13323 am: c75149d2d2 am: 7d0f2de1c5 am: 4233adfcca Change-Id: I0d6c9444543f135b221b031f7017d8e4e49a11c6
2016-10-18mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: d51985695d ↵Mahesh Lanka
am: ee318ecf0b am: f169d05c8b am: b9e65e3fe7 am: 1fe944e60b am: d51520a151 am: 4a9febeb85 am: a9cee601f5 Change-Id: I5706dec56d23003b0e3de4a07f889d400221f8ec
2016-10-18mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 414a06df33 ↵Mahesh Lanka
-s ours am: 515ad928ba am: 1d452915b6 am: 8ac1fd53d0 am: 6d121585b4 am: a279b39a50 Change-Id: I4b5ed88ac141f1745a97bf9b633208c6553279ea
2016-10-18Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
klp-dev am: 2863f9c165 am: 93b7fded39 am: e0e2c14448 am: 64cf9ed280 am: 31c2b13323 am: c75149d2d2 am: 7d0f2de1c5 Change-Id: I4bc79d548180c90a553ad8fe0aaf01ff4ca7d1d4
2016-10-18Merge "mm-video-v4l2: vdec: Disallow input usebuffer for secure case" into ↵Marco Nelissen
mnc-dev am: bb49b220d8 am: 5aa77c5e96 am: fb815991a1 am: 33cb504b2a am: c3e25a74c9 am: c612ccc8e7 am: bed1c4d850 Change-Id: I2794c1ca8598fbfe70a5fe26a489ca1cf01cfbc7
2016-10-18mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: d51985695d ↵Mahesh Lanka
am: ee318ecf0b am: f169d05c8b am: b9e65e3fe7 am: 1fe944e60b am: d51520a151 am: 4a9febeb85 Change-Id: I609cd6763defe6b00b4ec75824230e08a89c802f
2016-10-18mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: fd304685bb ↵Mahesh Lanka
am: 0328fc6c6d am: 11ae9a5b58 am: 7613ab6400 am: 4a63313eee am: ed70beaaa3 am: 9cc9a6440f Change-Id: I711c25bd14d64ca07e0c45e9f91c8448c5e431ef
2016-10-18mm-video-v4l2: vdec: Disallow input usebuffer for secure case am: 414a06df33 ↵Mahesh Lanka
-s ours am: 515ad928ba am: 1d452915b6 am: 8ac1fd53d0 am: 6d121585b4 Change-Id: Ie4258b9c2e855f0619571d53e7f5589f8987e7d7