aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: ↵Jean-Michel Trivi2018-10-122-13/+27
|\ | | | | | | | | | | | | | | 5a025c4fea am: 1c4c4a8c97 Change-Id: I547a825e0a48ef9f3c48b29ea2443f9945da52a2
| * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-devJean-Michel Trivi2018-10-122-13/+27
| |\ | | | | | | | | | | | | | | | am: 5a025c4fea Change-Id: I9011199b747a45a4cae8214b2e4b7b1f158ac1bc
| | * Merge "Prevent out of bounds accesses in lppTransposer()" into oc-devTreeHugger Robot2018-10-122-13/+27
| | |\
| | | * Prevent out of bounds accesses in lppTransposer()Jean-Michel Trivi2018-10-112-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check validity of pSettings->noOfPatches to prevent out of bounds access in lppTransposer(), which can also cause memSize to be negative. Bug: 112160868 Test: see poc in bug Change-Id: I789030b116da7f8ea261001b43ef6c677dd58a3d Merged-In: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
* | | | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Jean-Michel Trivi2018-10-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 am: 162f98a177 Change-Id: Ic656bdbc49436976b0edf6193bb02aa2af6b8764
| * | | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Jean-Michel Trivi2018-10-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 Change-Id: Ic0b562d5f0df43d9927f857600eba9ae5930b7c5
| | * | [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-110-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 Change-Id: I53774f0e504aeb7ee31e260753542ba586f97e5d
| | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 Change-Id: Ic0382abb5ad456a976bfa97ba40401593fe0e265
| | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 Change-Id: I26af673d8c8f32947bd041711a67f1e90abd4c5b
| | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 am: 589e1e861f Change-Id: I319554e07343c649f0ba37e719fbc144336b5e3e
| | | | | | * [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() ↵Android Build Merger (Role)2018-10-111-13/+24
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2eaadebcb6 Change-Id: I81009a5c6f58c225692c39e95038dd3b77290130
| | | | | | | * DO NOT MERGE Prevent out of bounds accesses in lppTransposer()Jean-Michel Trivi2018-10-111-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check validity of pSettings->noOfPatches to prevent out of bounds access in lppTransposer(), which can also cause memSize to be negative. Bug: 112160868 Test: see poc in bug Change-Id: I77bd1e1dfab3bac92b4522170bdc3c9eb56fdf82
* | | | | | | | [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid ↵Android Build Merger (Role)2018-02-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | height info skipped: 8b0edf42a0 am: fed4ae1115 am: 45ca1d7199 Change-Id: Ic4a9ac130a9410a7f2bc6a094aba0c0d0085b7b8
| * | | | | | | [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid ↵Android Build Merger (Role)2018-02-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | height info skipped: 8b0edf42a0 am: fed4ae1115 Change-Id: I3bb2c6e954a5d5212c976a1f6e1549a62352423a
| | * | | | | | [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid ↵Android Build Merger (Role)2018-02-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | height info skipped: 8b0edf42a0 Change-Id: Iff1ecd457b2b5dd89eef3d212ba06c52e37475c5
| | | * | | | | DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height infoJean-Michel Trivi2018-02-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CProgramConfig_ReadHeightExt prevent stack overflow from invalid FrontElementHeightInfo array value. Bug: 70637599 Test: see bug Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
* | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec am: 67e9a995ce Change-Id: I43b81c7a7f8e1fbe4143b0262eaad72d3286f8da
| * | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec Change-Id: I86083377cbd5c4c982d5686e22f620ff288abed2
| | * | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d Change-Id: I053bbc39b92045c9be0c935bef8c078a41ce7fe8
| | | * | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: e2fb9f0ac6 am: 4b684c6690 Change-Id: I790115ee7682dad92c72b03ef72711dd81cce45b
| | | | * | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: e2fb9f0ac6 Change-Id: Ib21720682d336b3250cc83699124af5895a12cc3
| | | | | * | | DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height infoJean-Michel Trivi2018-02-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CProgramConfig_ReadHeightExt prevent stack overflow from invalid FrontElementHeightInfo array value. Bug: 70637599 Test: see bug Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
* | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 am: f1a2354a3a Change-Id: I744d3ea898571c5d58329b495f8fc1e9e9cfb730
| * | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 Change-Id: I888519abe97d8fa1cfdd754b0aa7f74d91b07c54
| | * | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b Change-Id: I0a7ee9e92621704af6bdc7294ce375e8462e9065
| | | * | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-011-4/+19
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 Change-Id: Ia27f928400ceed95b6704b7b602968dbc14714e4
| | | | * | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-011-4/+19
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 31447431fe am: fce9663d6f am: 658a02f977 Change-Id: Ia94aa4643972ef0d09045546b4af093153772642
| | | | | * | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-011-4/+19
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 31447431fe am: fce9663d6f Change-Id: Ice80a96b140e09ffe1ac65b36f4441e14a1b7950
| | | | | | * | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-011-4/+19
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 31447431fe Change-Id: I6fe14a13927084b6c3e7386936b17e52dc308755
| | | | | | | * DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height infoJean-Michel Trivi2018-02-011-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CProgramConfig_ReadHeightExt prevent stack overflow from invalid FrontElementHeightInfo array value. Bug: 70637599 Test: see bug Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
* | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 am: b81d554ba6 Change-Id: I580587d87c826a2abbc8284fcb787c1f5ce57e4b
| * | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 Change-Id: Ib40b2afd08360c07103d756536b54e26adbf56d8
| | * | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 Change-Id: I2f20d89b7ef44751a99876ee0d6fb6fbb57df848
| | | * | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d Change-Id: I5997bd762037c34a710a8f208551f25ea792972c
| | | | * | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 Change-Id: I2d04b1aaeb91d3e5d63659d30b07bf5831072da1
| | | | | * | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 Change-Id: Ia8958d29392426f83d946cb3050f738f5182db96
| | | | | | * | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f Change-Id: I8aa7bbac0c2910746f7de8f0949358ae56a4d7dc
| | | | | | | * [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f Change-Id: I982f6f797485143c0a8379f1a904498fa3564e8c
| | | | | | | | * [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 am: 64b670e10a Change-Id: If3b0d271ec214b0ec04f33639f9276d591665e36
| | | | | | | | | * [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: dc880988f0 Change-Id: Id25465c6c5697a53b41ab5ceeb5a4ad68b6ddcb9
| | | | | | | | | | * DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height infoJean-Michel Trivi2018-02-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CProgramConfig_ReadHeightExt prevent stack overflow from invalid FrontElementHeightInfo array value. Bug: 70637599 Test: see bug Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
* | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 am: e12ed0c4fb Change-Id: I0b14be2ff82aa5a67bd43398f96c1bc5699ca376
| * | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 Change-Id: I6faf7e4a0bbb8ed6a11cd77dbe749c8e6bf59ade
| | * | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c Change-Id: I436c96743da8a703d0828ff33e955ea0e0ff3766
| | | * | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad Change-Id: I07f7c08f0864cb673c9c8ebc98a58d3a5414ee62
| | | | * | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 Change-Id: I36f8ec554ac96cdef4669809c8923b4f8b56768b
| | | | | * | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c Change-Id: Ibed017aec202e84aade79f805866c7102bdffa03
| | | | | | * | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 Change-Id: I50bab67ba74e6892895a9ad7aae4dc221f03ad89
| | | | | | | * | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d Change-Id: I06431e0b18182521b2decfac9a890b3f61cd5593
| | | | | | | | * | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height ↵Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 Change-Id: I3ad03691188f287aaea76280aaafc2485fe66a75