OSDN Git Service
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
IOMX: work against metadata buffer spoofing
am:
f8a4cb4101
Change-Id: I3aeec794c96fe3b0000546700e010b5ddc6e4f0f
Jeff Tinker [Wed, 7 Sep 2016 19:01:22 +0000 (19:01 +0000)]
Fix stack content leak vulnerability in mediaserver
am:
9a6861cbd3
Change-Id: I3c8d56b18678f68ff4617620312c4c32d4e0baf7
Jeff Tinker [Fri, 2 Sep 2016 18:36:46 +0000 (11:36 -0700)]
Fix stack content leak vulnerability in mediaserver
bug:
30875060
Change-Id: I03f4d08b7b31ac5b507cfc9e65e5607c73972d95
Wei Jia [Wed, 31 Aug 2016 00:22:57 +0000 (00:22 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce am:
c6fdb3d696 am:
629e78c10f
am:
50b9d889e6
Change-Id: I86b58e0cb64d668021a649627e34a0386dcc619a
Wei Jia [Wed, 31 Aug 2016 00:19:57 +0000 (00:19 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce am:
c6fdb3d696
am:
629e78c10f
Change-Id: I14c17d063743ca79f43f674c2d4cbcb57f90451e
Wei Jia [Wed, 31 Aug 2016 00:16:56 +0000 (00:16 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662 am:
a7549d3dce
am:
c6fdb3d696
Change-Id: I6e1cb16e9c281bda0375f552aab01b2ee069c14b
Wei Jia [Wed, 31 Aug 2016 00:13:56 +0000 (00:13 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662
am:
a7549d3dce
Change-Id: I56c379ef39b1fd80493798de79a61db140646c50
Wei Jia [Wed, 31 Aug 2016 00:10:56 +0000 (00:10 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408
am:
de97dbd662
Change-Id: I758cf33ec36858a612efe6c412af3df9653f9229
Wei Jia [Wed, 31 Aug 2016 00:08:25 +0000 (00:08 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a
am:
0dd714e408
Change-Id: Ib620e8573ff6da861c101311143d266fd5086d7b
Wei Jia [Wed, 31 Aug 2016 00:05:25 +0000 (00:05 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787
am:
f4e00a7c5a
Change-Id: I4b72afd20bbca69423d1be6ebf963ed41ded1a4e
Wei Jia [Wed, 31 Aug 2016 00:02:55 +0000 (00:02 +0000)]
MediaPlayerService: allow next player to be NULL
am:
2828412787
Change-Id: I54fad659721dde258259a503c5514d6327e521f7
Wei Jia [Tue, 30 Aug 2016 20:49:06 +0000 (13:49 -0700)]
MediaPlayerService: allow next player to be NULL
Bug:
31155917
Bug:
30204103
Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c
Robert Shih [Mon, 22 Aug 2016 18:56:52 +0000 (18:56 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89 am:
82bc8c4511 am:
6f8e939c58 -s ours
am:
f49ac6ef61
Change-Id: Ia5850378f26dc69b9114ddff2f342d0b3cebfce6
Robert Shih [Mon, 22 Aug 2016 18:56:52 +0000 (18:56 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875 am:
d6e7dcbb64 am:
47932efd3d -s ours
am:
b83d53d49a
Change-Id: I104f430d0bf1897e59bffdfe2bc3e13a9b058a1c
Robert Shih [Mon, 22 Aug 2016 18:48:21 +0000 (18:48 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89 am:
82bc8c4511
am:
6f8e939c58 -s ours
Change-Id: I5373a4e935db09eb7a98f55cb5266f475b3dcd01
Robert Shih [Mon, 22 Aug 2016 18:48:20 +0000 (18:48 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875 am:
d6e7dcbb64
am:
47932efd3d -s ours
Change-Id: Ibe7817e304f96d5f0e6fd00632c3d41833d65c14
Robert Shih [Mon, 22 Aug 2016 18:45:13 +0000 (18:45 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours am:
a9c1e43d89
am:
82bc8c4511
Change-Id: I3765b00a451793307c9d23431f8b354bbe71b7df
Robert Shih [Mon, 22 Aug 2016 18:45:12 +0000 (18:45 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours am:
081388d875
am:
d6e7dcbb64
Change-Id: Id774e978b50314baf0511ea3271ae98039f6ad7f
Robert Shih [Mon, 22 Aug 2016 18:36:26 +0000 (18:36 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours am:
91ec9a6fd3 -s ours
am:
a9c1e43d89
Change-Id: I4d35b92457c636f413ae03a992f71844028dfa90
Robert Shih [Mon, 22 Aug 2016 18:36:25 +0000 (18:36 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours
am:
081388d875
Change-Id: I685261698d0ecb4e77b5e78aab83b2b38b6a91fb
Robert Shih [Mon, 22 Aug 2016 18:32:20 +0000 (18:32 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452 am:
7fa7052231 -s ours
am:
91ec9a6fd3 -s ours
Change-Id: I075a2bf350184ade7a96cb1e4846d9459695a630
Robert Shih [Mon, 22 Aug 2016 18:32:20 +0000 (18:32 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4 am:
e13b8f2d61 am:
730c25e0dc
am:
6a93a9e982
Change-Id: I5f0a4039ff49ef3e5afabfce151a04fb58a45ae7
Robert Shih [Mon, 22 Aug 2016 18:32:19 +0000 (18:32 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours
am:
08eab78209 -s ours
Change-Id: I82a67d2a77c6cfa2e903e3ff8080ba4ed734f248
Robert Shih [Mon, 22 Aug 2016 18:32:19 +0000 (18:32 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c am:
b07255f603 am:
d560830823
am:
51efd24460
Change-Id: I77f1705ddb125b7eb1c1f6b6e8cb61fb0596d2e2
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262 am:
24b2dba452
am:
7fa7052231 -s ours
Change-Id: I5dddb4aeffa111dfda64e335d7baf7758a1740ee
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4 am:
e13b8f2d61
am:
730c25e0dc
Change-Id: I37b4d338807a9a04393345b859ee9d2d5aff89f6
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9
am:
48b3aca54b -s ours
Change-Id: I1f9d2549a454da70e62cf2cc997c045965ecea9a
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c am:
b07255f603
am:
d560830823
Change-Id: I77a7c93a2ae554532accb3be47bdee687b99f271
Robert Shih [Mon, 22 Aug 2016 18:23:43 +0000 (18:23 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d am:
21cc1102b4
am:
e13b8f2d61
Change-Id: I0087c63b5968ab0bb28eee528d9d0564d3fc225e
Robert Shih [Mon, 22 Aug 2016 18:23:42 +0000 (18:23 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262
am:
24b2dba452
Change-Id: Ia3933416f651d737beaae34cab4efd35e9e6156d
Robert Shih [Mon, 22 Aug 2016 18:23:41 +0000 (18:23 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac am:
7b6a85546c
am:
b07255f603
Change-Id: I9e2b7d8166c629fdbc3457d152e2947f16ba7ae3
Robert Shih [Mon, 22 Aug 2016 18:23:40 +0000 (18:23 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12
am:
2cee1deec9
Change-Id: I0cde33c6f069de9eac4e954e9c6ed6f6968546be
Robert Shih [Mon, 22 Aug 2016 18:17:19 +0000 (18:17 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d
am:
21cc1102b4
Change-Id: Ifb645a0070300d95e4091969c25ff27d4615b56f
Robert Shih [Mon, 22 Aug 2016 18:17:18 +0000 (18:17 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac
am:
7b6a85546c
Change-Id: Idacdce87d96ca64f0bfb06b41c65b5a870515b69
Robert Shih [Mon, 22 Aug 2016 18:12:49 +0000 (18:12 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev
am:
e35213de2d
Change-Id: I8d1446a8927952b6e8a561089764f6b662a2f0e4
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
am:
4fb531e262
Change-Id: I3cb099c3fdf0c476a92392b185d782e980a463de
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast
am:
c159a5ae12
Change-Id: I3e349cb44073359b9c009100c341864468187f68
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
MediaPlayerService: avoid invalid static cast
am:
ee0a0e39ac
Change-Id: I2e857a57fe87c5050b1042d27c8e3034df2a462c
Robert Shih [Mon, 22 Aug 2016 17:53:09 +0000 (17:53 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
Robert Shih [Mon, 22 Aug 2016 17:53:05 +0000 (17:53 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev
Andy Hung [Fri, 19 Aug 2016 21:56:28 +0000 (21:56 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23 am:
d959102420 am:
c3476feccd am:
6b1403777e
am:
be78a1c73f
Change-Id: I3bd43c2b12d9d393878d411869cfc90d0a4694c2
Eric Laurent [Fri, 19 Aug 2016 21:56:27 +0000 (21:56 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184 am:
82477c0929 am:
6aa5165f7c am:
c4d991b2ae
am:
4f1a678f8c
Change-Id: I901589896d3464b9355d8d5efdc07addb23f7e0a
Andy Hung [Fri, 19 Aug 2016 21:52:27 +0000 (21:52 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23 am:
d959102420 am:
c3476feccd
am:
6b1403777e
Change-Id: Id56c2493fe3e4b99e2e0333f8eff6fba53f0b24c
Eric Laurent [Fri, 19 Aug 2016 21:52:26 +0000 (21:52 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184 am:
82477c0929 am:
6aa5165f7c
am:
c4d991b2ae
Change-Id: I3aa665734e6aae7ae4e7f8f32578d8d5bd4937d5
Andy Hung [Fri, 19 Aug 2016 21:48:15 +0000 (21:48 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23 am:
d959102420
am:
c3476feccd
Change-Id: I9bddefae054582c4d6da1ad48cbfe37daf7853f4
Eric Laurent [Fri, 19 Aug 2016 21:48:12 +0000 (21:48 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184 am:
82477c0929
am:
6aa5165f7c
Change-Id: I24c5a9cf190033a0042ce8edda2d52ba0105ed7a
Andy Hung [Fri, 19 Aug 2016 21:39:07 +0000 (21:39 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23
am:
d959102420
Change-Id: I0ee357acf175c17d5b7d98860a422135d097ba9a
Eric Laurent [Fri, 19 Aug 2016 21:39:04 +0000 (21:39 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184
am:
82477c0929
Change-Id: I7b62641fefce7c3ee2c8c4a55363c1799d066349
Andy Hung [Fri, 19 Aug 2016 21:33:26 +0000 (21:33 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev
am:
36e11a4c23
Change-Id: I64b8c4cc80e895dbe62b2f5ce91e6a3764a913da
Eric Laurent [Fri, 19 Aug 2016 21:33:25 +0000 (21:33 +0000)]
soundtrigger: add size check on sound model and recogntion data
am:
ef0c915184
Change-Id: I5453811eb579dddd599be15108bb114095e07a58
Andy Hung [Fri, 19 Aug 2016 21:27:39 +0000 (21:27 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev
Andy Hung [Fri, 19 Aug 2016 19:28:48 +0000 (19:28 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42 am:
19294437ac am:
53657baf41 am:
6cc3c2dc98 am:
34334a97ed am:
2e16ed2fba am:
2596457b6f
am:
8665ad8cb9
Change-Id: Ic73e95a33d66de87871e82b2fb4142596cd9eac0
Andy Hung [Fri, 19 Aug 2016 19:28:47 +0000 (19:28 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501 am:
19d8a61324 am:
ebd9f1029e am:
d37cf46848 am:
ced0dd635e am:
00acbf03be am:
1ab50af9c1
am:
18e5ce6891
Change-Id: Ib4f1c1efb6680febadb2766843e57f0734a00052
Andy Hung [Fri, 19 Aug 2016 19:24:46 +0000 (19:24 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42 am:
19294437ac am:
53657baf41 am:
6cc3c2dc98 am:
34334a97ed am:
2e16ed2fba
am:
2596457b6f
Change-Id: I71cea6cd36dd8f63e967d2f4db4152a7209c5947
Andy Hung [Fri, 19 Aug 2016 19:24:45 +0000 (19:24 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501 am:
19d8a61324 am:
ebd9f1029e am:
d37cf46848 am:
ced0dd635e am:
00acbf03be
am:
1ab50af9c1
Change-Id: I5be11eba820ccb3f6c3bb97b3fa417504306bb3f
Andy Hung [Fri, 19 Aug 2016 19:21:27 +0000 (19:21 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42 am:
19294437ac am:
53657baf41 am:
6cc3c2dc98 am:
34334a97ed
am:
2e16ed2fba
Change-Id: If7a83b722d8e7aa954cb67ccd995578655e0711a
Andy Hung [Fri, 19 Aug 2016 19:21:26 +0000 (19:21 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501 am:
19d8a61324 am:
ebd9f1029e am:
d37cf46848 am:
ced0dd635e
am:
00acbf03be
Change-Id: I34a722f8440d79dd539a170ea28344d79df6e8c9
Andy Hung [Fri, 19 Aug 2016 19:14:15 +0000 (19:14 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42 am:
19294437ac am:
53657baf41 am:
6cc3c2dc98
am:
34334a97ed
Change-Id: Ia58dc8c5d784945c201e95bb3e3d5a03fed040c7
Andy Hung [Fri, 19 Aug 2016 19:14:15 +0000 (19:14 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501 am:
19d8a61324 am:
ebd9f1029e am:
d37cf46848
am:
ced0dd635e
Change-Id: Ib7b99e6cf6a15050e956df86b52720ad0b04dfdc
Andy Hung [Fri, 19 Aug 2016 19:07:46 +0000 (19:07 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42 am:
19294437ac am:
53657baf41
am:
6cc3c2dc98
Change-Id: I673b3942f3f5005de91e768676df30271d49dfee
Andy Hung [Fri, 19 Aug 2016 19:07:45 +0000 (19:07 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501 am:
19d8a61324 am:
ebd9f1029e
am:
d37cf46848
Change-Id: Ibe08f642742e6db44b16d9827dceeb984e6419f3
Andy Hung [Fri, 19 Aug 2016 19:04:15 +0000 (19:04 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42 am:
19294437ac
am:
53657baf41
Change-Id: I8576f997100e7cc55eb7d96a2af01eb88b4b1ba5
Andy Hung [Fri, 19 Aug 2016 19:04:15 +0000 (19:04 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501 am:
19d8a61324
am:
ebd9f1029e
Change-Id: Ic2fa5bba22d9ffc7b69ea97e2e4bc44d8a0fa42d
Andy Hung [Fri, 19 Aug 2016 18:59:07 +0000 (18:59 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42
am:
19294437ac
Change-Id: I926b0e3df89ff3c648c7b6896c359808300896b6
Andy Hung [Fri, 19 Aug 2016 18:59:06 +0000 (18:59 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501
am:
19d8a61324
Change-Id: I002990dc446d8a713f41b77671d17dbb11a914f9
Andy Hung [Fri, 19 Aug 2016 18:54:13 +0000 (18:54 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
am:
9665548a42
Change-Id: I784a0df389663da64dfa9a3eadb8b4dd6af545c7
Andy Hung [Fri, 19 Aug 2016 18:54:12 +0000 (18:54 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking
am:
e4a1d91501
Change-Id: I0b45b8c0fdccc9016717ce21de6771e9e6b6f11f
Andy Hung [Fri, 19 Aug 2016 18:49:14 +0000 (18:49 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
Pawin Vongmasa [Fri, 19 Aug 2016 17:54:47 +0000 (17:54 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743 am:
453ba68c65 am:
2a21f09fff -s ours am:
83cf293b73 -s ours am:
45cd2f896b am:
52f7319fc0 am:
ab5c805aec -s ours
am:
1dd4973234
Change-Id: I723ac6216066ec3df3af8e8caad2c6b6361727f4
Pawin Vongmasa [Fri, 19 Aug 2016 17:50:40 +0000 (17:50 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743 am:
453ba68c65 am:
2a21f09fff -s ours am:
83cf293b73 -s ours am:
45cd2f896b am:
52f7319fc0
am:
ab5c805aec -s ours
Change-Id: I46dd8facbac82da0651a5fb9e8c5c22e168d29c6
Pawin Vongmasa [Fri, 19 Aug 2016 17:45:49 +0000 (17:45 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743 am:
453ba68c65 am:
2a21f09fff -s ours am:
83cf293b73 -s ours am:
45cd2f896b
am:
52f7319fc0
Change-Id: I87bb8284037b01da2de982a3602339741ed6f4f8
Pawin Vongmasa [Fri, 19 Aug 2016 17:14:09 +0000 (17:14 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am:
7a66bd2404 am:
c776d9b42f am:
06985c1dbc am:
a25f2f5359
am:
1f84a02d15
Change-Id: Ib395d9fee37f51fd735dca8ba67fd37ab3f7606b
Pawin Vongmasa [Fri, 19 Aug 2016 17:14:07 +0000 (17:14 +0000)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
baa9146401 am:
0aaa2c606c am:
784c8ac91a am:
b65f47d30a
am:
1cdd3c4262
Change-Id: I9c6e65b795a5181ba152ffd4e358b0a25311b22e
Pawin Vongmasa [Fri, 19 Aug 2016 17:11:29 +0000 (17:11 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743 am:
453ba68c65 am:
2a21f09fff -s ours am:
83cf293b73 -s ours
am:
45cd2f896b
Change-Id: If0d77fc4311666cff881c371167fd19a534d0fb2
Pawin Vongmasa [Fri, 19 Aug 2016 17:10:39 +0000 (17:10 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am:
7a66bd2404 am:
c776d9b42f am:
06985c1dbc
am:
a25f2f5359
Change-Id: I41c1d70146910fc39926c7fcd1951863f8e967e1
Pawin Vongmasa [Fri, 19 Aug 2016 17:10:38 +0000 (17:10 +0000)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
baa9146401 am:
0aaa2c606c am:
784c8ac91a
am:
b65f47d30a
Change-Id: I18c74610c4fbbedf047e64c3bd01e5704422234c
Pawin Vongmasa [Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743 am:
453ba68c65 am:
2a21f09fff -s ours
am:
83cf293b73 -s ours
Change-Id: I92bb3e0101da80205105f1d047eea56f5c5d85a0
Pawin Vongmasa [Fri, 19 Aug 2016 17:05:11 +0000 (17:05 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am:
7a66bd2404 am:
c776d9b42f
am:
06985c1dbc
Change-Id: I3265aee42b89b18cdc3be5d374e25897f15be208
Pawin Vongmasa [Fri, 19 Aug 2016 17:05:05 +0000 (17:05 +0000)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
baa9146401 am:
0aaa2c606c
am:
784c8ac91a
Change-Id: I1dd6a8c51d485de7af539339f7c6199935ee9fa8
Pawin Vongmasa [Fri, 19 Aug 2016 17:04:02 +0000 (17:04 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743 am:
453ba68c65
am:
2a21f09fff -s ours
Change-Id: I540ae20fea8366c44796e104662b505192926270
Pawin Vongmasa [Fri, 19 Aug 2016 17:00:34 +0000 (17:00 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am:
7a66bd2404
am:
c776d9b42f
Change-Id: I202194b9bf1167ab437eb18edd548512e6713bff
Pawin Vongmasa [Fri, 19 Aug 2016 17:00:33 +0000 (17:00 +0000)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
baa9146401
am:
0aaa2c606c
Change-Id: I9b705a7105e5e6abb0370837f4927e33ab504e3e
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:05 +0000 (16:57 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
am:
7a66bd2404
Change-Id: Ia6fabe0d3bcedf9834f3a7dfb8b2a6c19e4f0d80
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:04 +0000 (16:57 +0000)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.
am:
baa9146401
Change-Id: I3c8f4edbc3b75f50bc6393271314a71f681ac43d
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:03 +0000 (16:57 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743
am:
453ba68c65
Change-Id: I833cb55b51e554e6b2ef3227f2923def6643c9e4
Ray Essick [Fri, 19 Aug 2016 16:54:09 +0000 (16:54 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev am:
ae12b68ba2 am:
5bc68fd641 am:
fb7cfdbe9b am:
234f929659
am:
f91b860374
Change-Id: Iee46723d68ed2d648766230fe334763ff2f2e98b
Ray Essick [Fri, 19 Aug 2016 16:54:08 +0000 (16:54 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c am:
e3fad118bb am:
019973a8d4 am:
d936eadf31
am:
94875f51ca
Change-Id: Id6b1ba9255ca4d3f298ee408231648511e6a0fed
Pawin Vongmasa [Fri, 19 Aug 2016 16:54:03 +0000 (16:54 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.
am:
ad929db743
Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0
Pawin Vongmasa [Fri, 19 Aug 2016 16:53:17 +0000 (16:53 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
Ray Essick [Fri, 19 Aug 2016 16:50:36 +0000 (16:50 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev am:
ae12b68ba2 am:
5bc68fd641 am:
fb7cfdbe9b
am:
234f929659
Change-Id: I5e6e092d1175e54560f4a4c3ffc8f666b239a442
Ray Essick [Fri, 19 Aug 2016 16:50:35 +0000 (16:50 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c am:
e3fad118bb am:
019973a8d4
am:
d936eadf31
Change-Id: Ic91989dc86a789e282c3b20f253d8591d7bd78a7
Ray Essick [Fri, 19 Aug 2016 16:48:25 +0000 (16:48 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev am:
ae12b68ba2 am:
5bc68fd641
am:
fb7cfdbe9b
Change-Id: Ic0fb16e1db8d024643ce1738466ad12daf89ff11
Ray Essick [Fri, 19 Aug 2016 16:48:24 +0000 (16:48 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c am:
e3fad118bb
am:
019973a8d4
Change-Id: I19865bbbc4037de800c2a1670de070c5ecc2dbf6
Ray Essick [Fri, 19 Aug 2016 16:41:01 +0000 (16:41 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev am:
ae12b68ba2
am:
5bc68fd641
Change-Id: I3d52b464d1ebced3381dc3813ac29fbe91b15d9e
Ray Essick [Fri, 19 Aug 2016 16:41:01 +0000 (16:41 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c
am:
e3fad118bb
Change-Id: I14bb5fbc1d7f97cf178b56699fd61131745b1a0e
Ray Essick [Fri, 19 Aug 2016 16:37:31 +0000 (16:37 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev
am:
ae12b68ba2
Change-Id: I839c9ba9a8d2b5e366745ea137ba4f35979e2494
Ray Essick [Fri, 19 Aug 2016 16:37:31 +0000 (16:37 +0000)]
better validation lengths of strings in ID3 tags
am:
d23c01546c
Change-Id: Idb8da8a0557349964f862ec1ab9f81542b81c492
Ray Essick [Fri, 19 Aug 2016 16:33:48 +0000 (16:33 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev
Pawin Vongmasa [Fri, 19 Aug 2016 08:45:39 +0000 (01:45 -0700)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.
Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d
Pawin Vongmasa [Fri, 19 Aug 2016 09:07:33 +0000 (02:07 -0700)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.
Change-Id: I4776db4a26fb3c31bb994d48788373fe569c812a
OSDN Git Service
