summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bd014b81: am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-123-50/+3
|\ | | | | | | | | * commit 'bd014b81ef227752150bdbd1bb6a235db09f3616': Clean up test makefiles.
| * am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-123-50/+3
| |\ | | | | | | | | | | | | * commit 'fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf': Clean up test makefiles.
| | * am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-123-50/+3
| | |\ | | | | | | | | | | | | | | | | * commit '6bf7c5cfc981ce4ecbd671d73a9eab8398dc8dd4': Clean up test makefiles.
| | | * Merge "Clean up test makefiles."Dan Albert2014-09-113-50/+3
| | | |\
| | | | * Clean up test makefiles.Dan Albert2014-09-113-50/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system takes care of linking the correct STL and gtest libraries for you, and specifying them manually confuses the build system when using libc++. Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
* | | | | am e21b7cd8: am 2f875dc8: Merge "AudioPolicyManager: Use "safe" speaker for ↵Eric Laurent2014-09-121-0/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | notifications if available" into lmp-dev * commit 'e21b7cd8feb7e9468c932609c53a114b1680a012': AudioPolicyManager: Use "safe" speaker for notifications if available
| * | | | am 2f875dc8: Merge "AudioPolicyManager: Use "safe" speaker for notifications ↵Eric Laurent2014-09-111-0/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if available" into lmp-dev * commit '2f875dc8aa3f419daec9089909bb7b540141e783': AudioPolicyManager: Use "safe" speaker for notifications if available
| | * \ \ \ Merge "AudioPolicyManager: Use "safe" speaker for notifications if ↵Eric Laurent2014-09-111-0/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | available" into lmp-dev
| | | * | | | AudioPolicyManager: Use "safe" speaker for notifications if availableJon Eklund2014-09-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On particularly loud devices, unexpected audio bursts can be harmful. For longer audio events, the conventional mitigation strategy is to somehow soft-start (ramp) the loudspeaker volume, but this strategy can severely impact the audibility of short audio events. Use of the "safe" speaker path hints to AudioHAL to immediately output at best allowable level for transient audio events. SPEAKER_SAFE is aliased to SPEAKER for purposes of volume control. Bug: 17319721 Change-Id: I75187c23f3d1f18e9f638c5d14e7b0bf805a67bc
* | | | | | | am 236688e8: am 97187317: Merge "stagefright: add adaptive playback support ↵Ronghua Wu2014-09-125-107/+130
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to SoftAVC decoder." into lmp-dev * commit '236688e800455c3a9d2a31a437f635dd7ff91fc7': stagefright: add adaptive playback support to SoftAVC decoder.
| * | | | | | am 97187317: Merge "stagefright: add adaptive playback support to SoftAVC ↵Ronghua Wu2014-09-115-107/+130
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder." into lmp-dev * commit '971873179cf202ad8aa1ddc4ec737795f1e03ce3': stagefright: add adaptive playback support to SoftAVC decoder.
| | * | | | | Merge "stagefright: add adaptive playback support to SoftAVC decoder." into ↵Ronghua Wu2014-09-115-107/+130
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | | * | | | | stagefright: add adaptive playback support to SoftAVC decoder.Ronghua Wu2014-09-105-107/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change SoftVPX decoder to use common handlePortSettingsChanged and copyYV12FrameToOutputBuffer method. Bug: 17326758 Change-Id: I6fb2ee8fb9291f69c70493b8558af341adc1f4b2
* | | | | | | | am 75a39a7e: am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-122-0/+170
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '75a39a7eda320e958ea9919f4867f8581117639e': Add test for AMR-NB decoder
| * | | | | | | am 951c2197: am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '951c2197cc0cf1d7a91388299b74eb12ee04a3e6': Add test for AMR-NB decoder
| | * | | | | | am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '2b16391d066d20f38f3556d65bce827a8d134e4d': Add test for AMR-NB decoder
| | | * | | | | Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| | | |\ \ \ \ \
| | | | * | | | | Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test accepts a .amr file as input and dumps output PCM in a wav file. To run the test, use following command libstagefright_amrnbdec_test <input amr> <output wav> Change-Id: I2492c2ed4e670c9fd8cb4213201ccbd0cb9bf8fe Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | am e79eb0a4: am 7a006aea: am a9151741: Merge "Fix inline assembly for clang"Glenn Kasten2014-09-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e79eb0a4b0251e74754da44e2e6a2cc9ccc48ea3': Fix inline assembly for clang
| * | | | | | | | am 7a006aea: am a9151741: Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a006aea535c052ed77e6f1c34081b599835a8c8': Fix inline assembly for clang
| | * | | | | | | am a9151741: Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a91517412e577e0f6128aa91a75460b313f0f4fe': Fix inline assembly for clang
| | | * | | | | | Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | Fix inline assembly for clangBernhard Rosenkränzer2013-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add r8, r0, asl #2 and add r8, r8, r0, asl #2 are identical in gcc inline assembly, but clang accepts only the latter variant. Change-Id: I922367984b6ae2f7268ce99facaf8da425c39d7e Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | | | Merge "stagefright test: MediaFilter native test"David Smith2014-09-115-0/+927
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stagefright test: MediaFilter native testDavid Smith2014-09-115-0/+927
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17203044 Change-Id: I16e30e04a5a1b6ed483b2d43de7c24cc0695485a
* | | | | | | | | | Merge "stagefright: finish implementing MediaFilter flush"David Smith2014-09-111-3/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stagefright: finish implementing MediaFilter flushDavid Smith2014-09-091-3/+20
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17203044 Change-Id: I6a967ead4dd9588caafe0041f2f4a39637368a62
* | | | | | | | | | am 94b687a8: am 4953f92b: am 0568cd5b: am e6b5d4c2: am 6fd1cf0c: am ↵Robert Shih2014-09-110-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '94b687a874772bb01d821902a6299e798929d4b6': SampleTable: check integer overflow during table alloc
| * | | | | | | | | am 4953f92b: am 0568cd5b: am e6b5d4c2: am 6fd1cf0c: am 86543654: am ↵Robert Shih2014-09-110-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '4953f92be5c45d7b79448e8964ecbdc39eacb782': SampleTable: check integer overflow during table alloc
| | * | | | | | | | am 0568cd5b: am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am ↵Robert Shih2014-09-110-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '0568cd5bf0a93c54a5bca47b48f7cbe799ccafcf': SampleTable: check integer overflow during table alloc
| | | * \ \ \ \ \ \ \ am e6b5d4c2: am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ↵Robert Shih2014-09-111-0/+14
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit 'e6b5d4c2d58a02184dd97815b5f76980025379bc': SampleTable: check integer overflow during table alloc
| | | | * \ \ \ \ \ \ \ am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am ↵Robert Shih2014-09-111-0/+14
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '6fd1cf0c00ee76802cfff0035011691aac8a1724': SampleTable: check integer overflow during table alloc
| | | | | * \ \ \ \ \ \ \ am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am ↵Robert Shih2014-09-111-0/+14
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '8654365499f8e9956c490e98184abe33978d4e67': SampleTable: check integer overflow during table alloc
| | | | | | * \ \ \ \ \ \ \ am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am ↵Robert Shih2014-09-101-0/+14
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '0d83cf22991c48f4bb5f2afe3d16ae076861f394': SampleTable: check integer overflow during table alloc
| | | | | | | * \ \ \ \ \ \ \ am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am ↵Robert Shih2014-09-101-0/+14
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '97d917bc1ccc958d8f1051de6a888de9a25dc6bd': SampleTable: check integer overflow during table alloc
| | | | | | | | * \ \ \ \ \ \ \ am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am ↵Robert Shih2014-09-101-0/+14
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f106b199: SampleTable: check integer overflow during table alloc * commit 'ab0b3212e0c15132f2dab2beeb39c47d31bb1dab': SampleTable: check integer overflow during table alloc
| | | | | | | | | * \ \ \ \ \ \ \ am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: ↵Robert Shih2014-09-101-0/+14
| | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SampleTable: check integer overflow during table alloc * commit '9b51a37fa8ad9d28be791213ceba4fcbec52b14d': SampleTable: check integer overflow during table alloc
| | | | | | | | | | * \ \ \ \ \ \ \ am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check ↵Robert Shih2014-09-101-0/+14
| | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow during table alloc * commit 'cb5dc219b78e6eeacb7ee2f5c93e6763db677122': SampleTable: check integer overflow during table alloc
| | | | | | | | | | | * \ \ \ \ \ \ \ am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow ↵Robert Shih2014-09-101-0/+14
| | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during table alloc * commit '74abb1ae32fbd3fa4112cc8b8d53882777feb191': SampleTable: check integer overflow during table alloc
| | | | | | | | | | | | * \ \ \ \ \ \ \ am 482b18bb: am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '482b18bbfd6c9214157bfab47feae86df48a7178': SampleTable: check integer overflow during table alloc
| | | | | | | | | | | | | * \ \ \ \ \ \ \ am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f106b1993143df44282777253244ce67974c9d4a': SampleTable: check integer overflow during table alloc
| | | | | | | | | | | | | | * | | | | | | | SampleTable: check integer overflow during table allocRobert Shih2014-08-201-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15328708 Bug: 15342615 Bug: 15342751 Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053 (cherry picked from commit edd4a76eb4747bd19ed122df46fa46b452c12a0d)
* | | | | | | | | | | | | | | | | | | | | | am 87088150: am fd732779: Merge "stagefright: don\'t use AAtomizer in ↵Lajos Molnar2014-09-112-31/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMessage" into lmp-dev * commit '87088150423676a8a0d6a0094e6b6e77e11fb3b5': stagefright: don't use AAtomizer in AMessage
| * | | | | | | | | | | | | | | | | | | | | am fd732779: Merge "stagefright: don\'t use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-112-31/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd7327797fe1d21cb225cae34616b8f7b67ad29d': stagefright: don't use AAtomizer in AMessage
| | * | | | | | | | | | | | | | | | | | | | Merge "stagefright: don't use AAtomizer in AMessage" into lmp-devLajos Molnar2014-09-112-31/+98
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-102-31/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15094301 Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
* | | | | | | | | | | | | | | | | | | | | | | am ebea445f: am b9b87fe9: mediaplayer: release MediaBuffer in stale input ↵Lajos Molnar2014-09-111-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers * commit 'ebea445f9344dbbe2ad560e340fb0ee3b9151650': mediaplayer: release MediaBuffer in stale input buffers
| * | | | | | | | | | | | | | | | | | | | | | am b9b87fe9: mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-111-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9b87fe9d9f3d91c05300a22920d7227a3f8eb83': mediaplayer: release MediaBuffer in stale input buffers
| | * | | | | | | | | | | | | | | | | | | | | mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
* | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 42db212e to masterWei Jia2014-09-111-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d8fe79a591b0e2a9e279f6c2c70d9e13c72924b