OSDN Git Service
Yunlian Jiang [Wed, 16 Nov 2016 04:17:57 +0000 (04:17 +0000)]
Merge "fix Access to field 'targets' results in a dereference of a null pointer"
am:
caea9fc26a
Change-Id: Id38c914a250aab0b4a395739db7e700c821ddaf3
Treehugger Robot [Wed, 16 Nov 2016 04:08:57 +0000 (04:08 +0000)]
Merge "fix Access to field 'targets' results in a dereference of a null pointer"
Yunlian Jiang [Wed, 16 Nov 2016 01:52:15 +0000 (17:52 -0800)]
fix Access to field 'targets' results in a dereference of a null pointer
This fixes Access to field 'targets' results in a dereference of a null
pointer
Test: the warning is gone.
Change-Id: If5d8c1c87c4cf77252bd5d262eefeba30c772fe7
Roger1 Jonsson [Sat, 12 Nov 2016 02:32:41 +0000 (02:32 +0000)]
Merge "Avoid crash for stss sync sample number 0"
am:
11f51b0463
Change-Id: I923fe096f4b9fef2d9b5b3a6e5674a0283b9f65e
Treehugger Robot [Sat, 12 Nov 2016 02:22:29 +0000 (02:22 +0000)]
Merge "Avoid crash for stss sync sample number 0"
Alex Naidis [Fri, 11 Nov 2016 17:39:39 +0000 (17:39 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
am:
da4cb8cb6c
Change-Id: Ia85752fe429a0fbb985ca0ad5425029c0a2811cf
Treehugger Robot [Fri, 11 Nov 2016 17:29:02 +0000 (17:29 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Alex Naidis [Sat, 29 Oct 2016 14:18:15 +0000 (16:18 +0200)]
mediacodec/mediaextractor: allow multiple Seccomp extensions
This is useful if we have multiple device
layers and want to have common extensions while
supporting device specific extensions at the same time.
Change-Id: Iefbff9c1ec680963a7ea4c2db09d8e888dd87703
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Ricardo Garcia [Thu, 10 Nov 2016 15:13:35 +0000 (15:13 +0000)]
Merge "Override Auxiliary audio effect output as stereo"
am:
568085d022
Change-Id: I4f705ee2b47f30731d4f1ac46213fbcd678633a5
Ricardo Garcia [Thu, 10 Nov 2016 15:04:10 +0000 (15:04 +0000)]
Merge "Override Auxiliary audio effect output as stereo"
Yuuki Yokoyama [Tue, 23 Aug 2016 08:11:03 +0000 (17:11 +0900)]
Override Auxiliary audio effect output as stereo
Auxiliary audio effect supports only stereo as output channel.
Override output channel in case of Auxiliary effect.
Bug:
31985321
Change-Id: I308a6281e2ae2b8f814a659aa40dc6220ab7660a
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0
A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.
Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.
Bug:
32423862
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5
Marco Nelissen [Mon, 7 Nov 2016 17:22:54 +0000 (17:22 +0000)]
Merge "Split libmedia into libmedia and libaudioclient"
am:
bad65c51a3
Change-Id: I39343fcc662eee153a9ba3ee511a277827d2f98b
Marco Nelissen [Mon, 7 Nov 2016 17:21:49 +0000 (17:21 +0000)]
Split libmedia into libmedia and libaudioclient
am:
795a2a7554
Change-Id: Ic08eddc5650d3f5d344ebcf93ad98ae5bb236c8c
Marco Nelissen [Mon, 7 Nov 2016 17:14:24 +0000 (17:14 +0000)]
Merge "Split libmedia into libmedia and libaudioclient"
Marco Nelissen [Wed, 2 Nov 2016 20:21:22 +0000 (13:21 -0700)]
Split libmedia into libmedia and libaudioclient
This makes it so audioserver doesn't need to link against the entire libmedia,
which has dependencies on camera, ICU, OpenGL and other things that aren't
needed for audio.
Test: build/boot
Change-Id: I99ba1a3dc3b33ca9b3abd98e7519dbf228ee62af
Marco Nelissen [Sat, 5 Nov 2016 01:21:29 +0000 (01:21 +0000)]
Merge "Remove unused libraries from libstagefright_http_support"
am:
bf26c4eb62
Change-Id: I7238f2705588d21aa3533af314825636232a9b1f
Treehugger Robot [Sat, 5 Nov 2016 01:16:49 +0000 (01:16 +0000)]
Merge "Remove unused libraries from libstagefright_http_support"
Marco Nelissen [Sat, 5 Nov 2016 00:02:25 +0000 (00:02 +0000)]
Merge "Move IMediaLogService to libmedialogservice"
am:
12dc4449ee
Change-Id: I78dd9164b47538205fbed6fe04fafb8bbcc55009
Treehugger Robot [Fri, 4 Nov 2016 23:56:10 +0000 (23:56 +0000)]
Merge "Move IMediaLogService to libmedialogservice"
Marco Nelissen [Fri, 4 Nov 2016 22:52:36 +0000 (22:52 +0000)]
Merge "Remove unused libstagefright_yuv"
am:
a4e77422c9
Change-Id: Ia23b671f54a2f8923e15311e0763fd10c2c469db
Marco Nelissen [Fri, 4 Nov 2016 22:52:20 +0000 (22:52 +0000)]
Merge "Remove unneeded links with dynamic libraries"
am:
46d0a5b493
Change-Id: Ica6dd538c30b9aeccddad229cb24ade4d82d2e4c
Treehugger Robot [Fri, 4 Nov 2016 22:46:14 +0000 (22:46 +0000)]
Merge "Remove unused libstagefright_yuv"
Treehugger Robot [Fri, 4 Nov 2016 22:46:05 +0000 (22:46 +0000)]
Merge "Remove unneeded links with dynamic libraries"
Marco Nelissen [Wed, 2 Nov 2016 22:46:18 +0000 (15:46 -0700)]
Remove unused libraries from libstagefright_http_support
Test: build/boot
Change-Id: I47e79fa0b51e4bb2ae63e10160aea861fabc96ac
Marco Nelissen [Wed, 2 Nov 2016 16:59:52 +0000 (09:59 -0700)]
Move IMediaLogService to libmedialogservice
So audioserver and libmedialogservice don't have to link against libmedia
Test: build/boot
Change-Id: I4040d9f6db59807c3fa56321d45fb6ab50fb5edb
Marco Nelissen [Thu, 27 Oct 2016 17:54:27 +0000 (10:54 -0700)]
Remove unused libstagefright_yuv
Test: built and booted
Change-Id: I3db16c365b36143fee4aa532dc9cdec0bca612a5
Marco Nelissen [Tue, 25 Oct 2016 20:17:47 +0000 (13:17 -0700)]
Remove unneeded links with dynamic libraries
Various media components were linking against dynamic libraries that weren't needed.
Test: built and booted
Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
Nick Kralevich [Wed, 2 Nov 2016 03:17:45 +0000 (03:17 +0000)]
Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions""
am:
712690b374
Change-Id: Ia9c56bdf0fa132ef07508a660c44c4560d20f967
Nick Kralevich [Wed, 2 Nov 2016 03:12:22 +0000 (03:12 +0000)]
Merge "Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions""
Nick Kralevich [Wed, 2 Nov 2016 03:10:52 +0000 (03:10 +0000)]
Revert "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Seeing the following build errors:
$ . ./build/envsetup.sh && lunch aosp_dragon-userdebug
$ m -j 50
...
Starting build with ninja
ninja: Entering directory `.'
ninja: error: 'device/google/dragon/seccomp/mediaextractor-seccomp.policy', needed by 'out/target/product/dragon/obj/ETC/mediaextractor-seccomp.policy_intermediates/mediaextractor-seccomp.policy', missing and no known rule to make it
make: *** [ninja_wrapper] Error 1
make: Leaving directory `/SDD/master'
This reverts commit
87a80ef1e391247beb08854efded9cf9a52b8a09.
Change-Id: I5d039845c69b18f3a7199458c5301314d006f43b
Alex Naidis [Wed, 2 Nov 2016 01:02:30 +0000 (01:02 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
am:
e119cfe384
Change-Id: I3e72b83d44731fa77f7ce7d397e804a9a5c46982
Treehugger Robot [Wed, 2 Nov 2016 00:54:34 +0000 (00:54 +0000)]
Merge "mediacodec/mediaextractor: allow multiple Seccomp extensions"
Alex Naidis [Sat, 29 Oct 2016 14:18:15 +0000 (16:18 +0200)]
mediacodec/mediaextractor: allow multiple Seccomp extensions
This is useful if we have multiple device
layers and want to have common extensions while
supporting device specific extensions at the same time.
Change-Id: Iefbff9c1ec680963a7ea4c2db09d8e888dd87702
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Robert Shih [Tue, 25 Oct 2016 22:35:05 +0000 (22:35 +0000)]
Merge "FLACExtractor: copy protect mWriteBuffer"
am:
f521451f62
Change-Id: Ie46c44142ea7f397529c3149e89b6d0a3ae71cf0
Robert Shih [Tue, 25 Oct 2016 22:27:38 +0000 (22:27 +0000)]
Merge "FLACExtractor: copy protect mWriteBuffer"
Marco Nelissen [Tue, 25 Oct 2016 20:05:55 +0000 (20:05 +0000)]
Merge "Prefer software codec with debug property"
am:
829b2a0bf0
Change-Id: Ib5cc5065540f48efaebeb02ecd1bd8036f0e56d1
Treehugger Robot [Tue, 25 Oct 2016 20:01:10 +0000 (20:01 +0000)]
Merge "Prefer software codec with debug property"
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
FLACExtractor: copy protect mWriteBuffer
Bug:
30895578
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
Harish Mahendrakar [Tue, 25 Oct 2016 17:38:47 +0000 (17:38 +0000)]
Merge "SoftAVCDec: Handle interlaced streams where two fields are sent in one input"
am:
460dcb750d
Change-Id: I8dc483438793d73cbe2b403c085da5310740562f
Treehugger Robot [Tue, 25 Oct 2016 17:30:42 +0000 (17:30 +0000)]
Merge "SoftAVCDec: Handle interlaced streams where two fields are sent in one input"
Marco Nelissen [Tue, 25 Oct 2016 16:56:21 +0000 (09:56 -0700)]
Prefer software codec with debug property
Change-Id: Ifc44a1dee79142d13393eac3c0750b9874b46a8f
Harish Mahendrakar [Thu, 20 Oct 2016 09:26:35 +0000 (14:56 +0530)]
SoftAVCDec: Handle interlaced streams where two fields are sent in one input
When both fields are sent in a single input buffer, only the first field was
being decoded. Fix this by not releasing input buffer when some bytes are still
left unused in the input buffer.
If both fields are sent in a separate call, decoder handles that correctly and
returns an output frame for every two fields
Bug:
32364044
Test: Manually tested by decoding clip attached in the above bug
Change-Id: Idab5acd9cbaefc5d2560a70d375f3a532d9e78eb
Dan Albert [Thu, 20 Oct 2016 22:16:46 +0000 (22:16 +0000)]
Merge "Add license to ndk_headers."
am:
cf39459d1f
Change-Id: Ie3b9f7461e6d1713d72d76bedeb32d1a6f5aa3f3
Treehugger Robot [Thu, 20 Oct 2016 22:12:39 +0000 (22:12 +0000)]
Merge "Add license to ndk_headers."
Dan Albert [Thu, 20 Oct 2016 17:07:28 +0000 (10:07 -0700)]
Add license to ndk_headers.
Test: make ndk
Bug: None
Change-Id: Ic04e648cc74bbd79295e89c07d92b0fdb2fb7978
Andy Hung [Thu, 20 Oct 2016 16:41:09 +0000 (16:41 +0000)]
Merge "Add logging of written frame counts"
am:
8080b95b4b
Change-Id: Ida324d82465e8f5e4bbc02f21e95a1112b17a49b
Treehugger Robot [Thu, 20 Oct 2016 16:28:06 +0000 (16:28 +0000)]
Merge "Add logging of written frame counts"
Andy Hung [Wed, 21 Sep 2016 19:55:15 +0000 (12:55 -0700)]
Add logging of written frame counts
Bug:
31591209
Change-Id: Ife5917aa65b02c3b0791dfe1975c70ccf58f9a75
(cherry picked from commit
2c45393d842a5d2968ef78fa7a08667efdf15f2a)
Andy Hung [Thu, 20 Oct 2016 05:56:16 +0000 (05:56 +0000)]
Merge "AudioFlinger: Account for frames dropped in suspend mode"
am:
290e7ed8d0
Change-Id: Iac45c4a07c7a8f56ecf87ac54d11355c1cdcbe11
Treehugger Robot [Thu, 20 Oct 2016 05:44:33 +0000 (05:44 +0000)]
Merge "AudioFlinger: Account for frames dropped in suspend mode"
Andy Hung [Thu, 28 Jul 2016 17:53:22 +0000 (10:53 -0700)]
AudioFlinger: Account for frames dropped in suspend mode
These frames must be added to the kernel position in timestamps.
Bug:
30025777
Change-Id: I30c14503c9467059c3782e5c96c01ae1cf3709f6
(cherry picked from commit
238fa3deff26d7e4d9e81bd0a88c936f16226c4e)
Caroline Tice [Wed, 19 Oct 2016 17:50:35 +0000 (17:50 +0000)]
Merge "Fix potental memory leak (compiler warning)."
am:
c1184a7991
Change-Id: I78b5d0ed14bfb18108ee43a8d3570cdb6bc65b32
Caroline Tice [Wed, 19 Oct 2016 17:34:28 +0000 (17:34 +0000)]
Merge "Fix potental memory leak (compiler warning)."
Caroline Tice [Tue, 18 Oct 2016 23:32:13 +0000 (16:32 -0700)]
Fix potental memory leak (compiler warning).
This CL fixes the following warning:
EffectProxy.cpp:93:8: warning: Potential leak of memory pointed to by
'pContext'.
BUG=None
Test: WITH_TIDY=1 WITH_STATIC_ANLYZER=1 mm
Change-Id: I7f127042eb50d3d6297473bfd90a5402b182cc85
Viraj Karandikar [Tue, 18 Oct 2016 17:34:36 +0000 (17:34 +0000)]
Merge "WAVExtractor: support ambisonic subformat"
am:
5d7e276b21
Change-Id: Iaae56344a8831e0dac7a724be5ba3f8e5b098e52
Treehugger Robot [Tue, 18 Oct 2016 17:26:47 +0000 (17:26 +0000)]
Merge "WAVExtractor: support ambisonic subformat"
Marco Nelissen [Fri, 14 Oct 2016 15:00:49 +0000 (15:00 +0000)]
Merge "Fix issues with metadata handling when format change happens" am:
92047ec34b am:
d41a64c7ad
am:
2a02f18cf1
Change-Id: Ia945c856b0b805111ebcb5a93908934ddaa78db1
Marco Nelissen [Fri, 14 Oct 2016 14:57:18 +0000 (14:57 +0000)]
Merge "Fix issues with metadata handling when format change happens" am:
92047ec34b
am:
d41a64c7ad
Change-Id: Iadd42f2bf9f6a6863333fae9dc26c17522cc9b28
Marco Nelissen [Fri, 14 Oct 2016 14:53:48 +0000 (14:53 +0000)]
Merge "Fix issues with metadata handling when format change happens"
am:
92047ec34b
Change-Id: Ib9ed5ce0c7c12f99be25aaabef3e53038aa03b7d
Marco Nelissen [Fri, 14 Oct 2016 14:49:24 +0000 (14:49 +0000)]
Merge "Fix issues with metadata handling when format change happens"
Robert Shih [Fri, 14 Oct 2016 01:22:40 +0000 (01:22 +0000)]
Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev am:
0afc0f8f3c
am:
069372b3f0
Change-Id: I94001c933c46425ebf9e134531e438118330c482
Robert Shih [Fri, 14 Oct 2016 01:22:25 +0000 (01:22 +0000)]
HTTPLiveSource: implement getFormatMeta am:
a83eebb78c
am:
7c55dd0c5b
Change-Id: Ifc927603a8c35f27cd58a1f0ce92ee92e99f1025
Robert Shih [Fri, 14 Oct 2016 01:16:26 +0000 (01:16 +0000)]
Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev
am:
0afc0f8f3c
Change-Id: Ia989add104201cd0524525c58ba4fd603564a509
Robert Shih [Fri, 14 Oct 2016 01:16:25 +0000 (01:16 +0000)]
HTTPLiveSource: implement getFormatMeta
am:
a83eebb78c
Change-Id: If4e85e963ae832a9f16c69fd7a5d6bbeb07789bf
Robert Shih [Fri, 14 Oct 2016 01:12:03 +0000 (01:12 +0000)]
Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev
Marco Nelissen [Fri, 14 Oct 2016 00:00:28 +0000 (00:00 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba am:
282551278b am:
5a4695b5cb -s ours am:
45a89389ac am:
953b6b19eb am:
00082e26da
am:
63425d5b7b
Change-Id: If00ddbf6c5686b3ae12661fe5832111b7e46193e
Marco Nelissen [Fri, 14 Oct 2016 00:00:15 +0000 (00:00 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7 am:
eb3c705d8c am:
925924329c -s ours am:
b4f02ca084 am:
8ddc89db0c am:
1f0726d016
am:
3f94a6140d
Change-Id: I2242391d69ff0283175ddc67c81aae31f0203f92
Marco Nelissen [Thu, 13 Oct 2016 23:55:34 +0000 (23:55 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba am:
282551278b am:
5a4695b5cb -s ours am:
45a89389ac am:
953b6b19eb
am:
00082e26da
Change-Id: If970462b10835594d415cda1fb6c93631a41fb45
Marco Nelissen [Thu, 13 Oct 2016 23:55:19 +0000 (23:55 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7 am:
eb3c705d8c am:
925924329c -s ours am:
b4f02ca084 am:
8ddc89db0c
am:
1f0726d016
Change-Id: I95c078cfac26f310f2d9466afecd26b942a83fca
Marco Nelissen [Thu, 13 Oct 2016 23:54:06 +0000 (23:54 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba am:
282551278b am:
5a4695b5cb -s ours am:
45a89389ac
am:
953b6b19eb
Change-Id: I7f24e3f01d2405cfa4178bfd91afa06068a5c6f1
Marco Nelissen [Thu, 13 Oct 2016 23:53:50 +0000 (23:53 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba am:
282551278b am:
5a4695b5cb -s ours am:
45a89389ac
am:
a6e2521999
Change-Id: I2269791e57bbd50553be4217ab936a71034b99c9
Marco Nelissen [Thu, 13 Oct 2016 23:53:50 +0000 (23:53 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7 am:
eb3c705d8c am:
925924329c -s ours am:
b4f02ca084
am:
8ddc89db0c
Change-Id: If8a9fdeb89ff38a09be6c37be516440270f317e4
Marco Nelissen [Thu, 13 Oct 2016 23:53:36 +0000 (23:53 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7 am:
eb3c705d8c am:
925924329c -s ours am:
b4f02ca084
am:
812e3f5b37
Change-Id: Ic1f06f994a27a2abbefeff9da1fa6b5144c088c4
Marco Nelissen [Thu, 13 Oct 2016 23:51:34 +0000 (23:51 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am:
ec206acb99 am:
69db172b16 am:
a99878f636 am:
9c950265b8 -s ours am:
f4cb32f44b am:
bd52585dd1 am:
297bb1a1b7
am:
90c63dbe37
Change-Id: I025cd9acb45eb06159fc6c32baa7e4b47a01818b
Marco Nelissen [Thu, 13 Oct 2016 23:51:20 +0000 (23:51 +0000)]
DO NOT MERGE Fix divide by zero am:
2e211d38a3 am:
52e86acf03 am:
1607de251e am:
c3c3ae039a -s ours am:
f4211ba53a am:
a38f9d17c6 am:
6100f3248f
am:
69a4089f50
Change-Id: I082bda4915c388f899af36db75f6110f535c8cd3
Marco Nelissen [Thu, 13 Oct 2016 23:51:17 +0000 (23:51 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba am:
282551278b am:
5a4695b5cb -s ours
am:
45a89389ac
Change-Id: Icadf38611d30b39c688d7a814d796bb202e49f36
Marco Nelissen [Thu, 13 Oct 2016 23:51:05 +0000 (23:51 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba am:
282551278b am:
5a4695b5cb -s ours
am:
45a89389ac
Change-Id: If12ee4153d64c749288d3e0182a45d9c8e98f347
Marco Nelissen [Thu, 13 Oct 2016 23:51:04 +0000 (23:51 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7 am:
eb3c705d8c am:
925924329c -s ours
am:
b4f02ca084
Change-Id: Ief82a05ed9a71631df4ebd23e8764960887718a7
Marco Nelissen [Thu, 13 Oct 2016 23:50:49 +0000 (23:50 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7 am:
eb3c705d8c am:
925924329c -s ours
am:
b4f02ca084
Change-Id: I5ebd3d544b2c317e49205151eda77e1ad08c6ba6
Marco Nelissen [Thu, 13 Oct 2016 23:49:01 +0000 (23:49 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba am:
282551278b
am:
5a4695b5cb -s ours
Change-Id: Iac7e9dbefba0a92486ed283db550edd1128272e8
Marco Nelissen [Thu, 13 Oct 2016 23:48:48 +0000 (23:48 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7 am:
eb3c705d8c
am:
925924329c -s ours
Change-Id: I945e219fc6324d73b298d626d544d2c6330d4c3b
Marco Nelissen [Thu, 13 Oct 2016 23:46:02 +0000 (23:46 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9 am:
29da5c2eba
am:
282551278b
Change-Id: I7eed1c242283ef08caf023302f2d8d9e6254afa0
Marco Nelissen [Thu, 13 Oct 2016 23:45:49 +0000 (23:45 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9 am:
ade3086ef7
am:
eb3c705d8c
Change-Id: Ib57bedfe59eb84a8a62769893aff1f8b89bbbd97
Marco Nelissen [Thu, 13 Oct 2016 23:44:00 +0000 (23:44 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours am:
2f6c5b05f9
am:
29da5c2eba
Change-Id: Ied7e64a4534ef4c527bad650e550609376cbd611
Marco Nelissen [Thu, 13 Oct 2016 23:43:47 +0000 (23:43 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours am:
a49626e9f9
am:
ade3086ef7
Change-Id: I85af4dad0364d9fa641f94208085e232fb44737b
Marco Nelissen [Thu, 13 Oct 2016 23:42:06 +0000 (23:42 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours
am:
2f6c5b05f9
Change-Id: I8da8b15efed6263ca8afd5acbda500a8fc9c12a6
Marco Nelissen [Thu, 13 Oct 2016 23:42:02 +0000 (23:42 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am:
ec206acb99 am:
69db172b16 am:
a99878f636 am:
9c950265b8 -s ours am:
f4cb32f44b am:
bd52585dd1
am:
297bb1a1b7
Change-Id: Ie4842fbbbea86478f2a6586305c2161a086ab62a
Marco Nelissen [Thu, 13 Oct 2016 23:41:49 +0000 (23:41 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours
am:
a49626e9f9
Change-Id: I02a6038cff8444cefba8c8c35bf132ddbd3a6b9c
Marco Nelissen [Thu, 13 Oct 2016 23:41:48 +0000 (23:41 +0000)]
DO NOT MERGE Fix divide by zero am:
2e211d38a3 am:
52e86acf03 am:
1607de251e am:
c3c3ae039a -s ours am:
f4211ba53a am:
a38f9d17c6
am:
6100f3248f
Change-Id: I1afedcd9fa6b78fc714ea6bb9246ac11c57ae495
Marco Nelissen [Thu, 13 Oct 2016 23:39:15 +0000 (23:39 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am:
ec206acb99 am:
69db172b16 am:
a99878f636 am:
9c950265b8 -s ours am:
f4cb32f44b
am:
b8b862fca0
Change-Id: I2c90de223df7b7fc700b52569e26a5225c69b60b
Marco Nelissen [Thu, 13 Oct 2016 23:39:02 +0000 (23:39 +0000)]
DO NOT MERGE Fix divide by zero am:
2e211d38a3 am:
52e86acf03 am:
1607de251e am:
c3c3ae039a -s ours am:
f4211ba53a
am:
f2004d373a
Change-Id: Ib7064826792398ca1cce37bd8c01924e1a69f185
Marco Nelissen [Thu, 13 Oct 2016 23:38:30 +0000 (23:38 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944
am:
8f8e719106 -s ours
Change-Id: I18196452f6a19fe21fc4cad76c8df2165a044353
Marco Nelissen [Thu, 13 Oct 2016 23:38:29 +0000 (23:38 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am:
ec206acb99 am:
69db172b16 am:
a99878f636 am:
9c950265b8 -s ours am:
f4cb32f44b
am:
bd52585dd1
Change-Id: Iba2ceca6342321cf02bec19ee9c4b79a590d23b5
Marco Nelissen [Thu, 13 Oct 2016 23:38:17 +0000 (23:38 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e
am:
93590752b1 -s ours
Change-Id: I37e4ad9cca606117a774e544f44304ec46d496e3
Marco Nelissen [Thu, 13 Oct 2016 23:38:17 +0000 (23:38 +0000)]
DO NOT MERGE Fix divide by zero am:
2e211d38a3 am:
52e86acf03 am:
1607de251e am:
c3c3ae039a -s ours am:
f4211ba53a
am:
a38f9d17c6
Change-Id: I216f24273722e13cbb485005b8cf604b182f73f1
Marco Nelissen [Thu, 13 Oct 2016 23:36:01 +0000 (23:36 +0000)]
Merge "Fix divide by zero" into nyc-dev am:
8996f41189 am:
1d1fd4a403 am:
e60736c309
am:
c0da68f74a
Change-Id: I3ec98ea08a2ea008acd5e63300cbaaf47fc43263
Marco Nelissen [Thu, 13 Oct 2016 23:35:48 +0000 (23:35 +0000)]
Fix divide by zero am:
0d13824315 am:
3fdf964302 am:
f3e1e8c0b1
am:
727907f7e5
Change-Id: I442734d7b84b9f2e5733f586e5b7e983db02c26b
Marco Nelissen [Thu, 13 Oct 2016 23:35:45 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am:
ec206acb99 am:
69db172b16 am:
a99878f636 am:
9c950265b8 -s ours
am:
f4cb32f44b
Change-Id: If764a993b942b0d675a619c12ce89323e34cbc88
Marco Nelissen [Thu, 13 Oct 2016 23:35:33 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am:
ec206acb99 am:
69db172b16 am:
a99878f636 am:
9c950265b8 -s ours
am:
f4cb32f44b
Change-Id: Id3f12e44b2958664a3bc4e2918d73e77ece3eb2f
OSDN Git Service
