OSDN Git Service
Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:44 +0000 (00:13 +0000)]
[automerger] Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev am:
a0388f92c7 am:
97a6eb0645 am:
89130ee5c3 am:
db14575a0e
Change-Id: I3bd8645b3cae6945ca9bffe8c5466cbd8c61303a
Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:39 +0000 (00:13 +0000)]
[automerger] Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev am:
a0388f92c7 am:
97a6eb0645 am:
89130ee5c3
Change-Id: Ia0032ca9a9ae740b88a01f2bd5610a783fa9877a
Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:33 +0000 (00:13 +0000)]
[automerger] Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev am:
a0388f92c7 am:
97a6eb0645
Change-Id: Id2cdb321b7a4e40f9a1deb8b3c5216cb74c461fa
Lajos Molnar [Tue, 15 Aug 2017 00:13:07 +0000 (00:13 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev
am:
a0388f92c7
Change-Id: I92c20c87114bce30d61f3505187a9aa5782370c5
Android Build Merger (Role) [Tue, 15 Aug 2017 00:08:12 +0000 (00:08 +0000)]
Merge changes from topic "am-
a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev am:
0ae144f238 am:
a0e49db002 am:
df3fb4006f
[automerger] Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev am:
0ae144f238 am:
a0e49db002
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev am:
0ae144f238
Android Build Merger (Role) [Tue, 15 Aug 2017 00:04:33 +0000 (00:04 +0000)]
[automerger] Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev am:
0ae144f238 am:
a0e49db002 am:
df3fb4006f
Change-Id: Ibc09ca6247ccd6f22db12aeb2d547ec8098497f5
Android Build Merger (Role) [Tue, 15 Aug 2017 00:04:27 +0000 (00:04 +0000)]
[automerger] Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev am:
0ae144f238 am:
a0e49db002
Change-Id: I2e91e24d12d71552013b3dc2fe26b2155b246c46
Lajos Molnar [Tue, 15 Aug 2017 00:03:53 +0000 (00:03 +0000)]
Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev
am:
a5c3676d9f
Change-Id: Iacc37b5a3bc7ddfabfad0b9aa7f9214ce3cf1b72
Lajos Molnar [Tue, 15 Aug 2017 00:03:30 +0000 (00:03 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev
am:
0ae144f238
Change-Id: I84441edb8a52c7b9ee14cd504520cfb020ebf9dc
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96 am:
4f6a7b45ec am:
d324672375
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96 am:
4f6a7b45ec
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr1.5-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96 am:
4f6a7b45ec
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into cw-e-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]
Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1 am:
f1d1bcda9f
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]
Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1 am:
f1d1bcda9f am:
5ea07b119f
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1 am:
f1d1bcda9f
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]
Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into cw-e-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283
Android Build Merger (Role) [Mon, 14 Aug 2017 23:53:01 +0000 (23:53 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96 am:
4f6a7b45ec am:
d324672375
Change-Id: I7c90b6481ac1ecd2af713c251b6e9b0c44e67284
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:57 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96 am:
4f6a7b45ec
Change-Id: I3d488c13f3c63b15972ed932bd91f255700d733c
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:52 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485 am:
2f35f02f96
Change-Id: I5e9113aeece0966a286ce3189f644158f035e206
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:47 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485
Change-Id: I9537087f5a039e122f3a91d7d9191b8771bad602
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:27 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1 am:
f1d1bcda9f am:
5ea07b119f
Change-Id: Ic4b0276e25997294bc66069b5612b34a7be71870
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:22 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1 am:
f1d1bcda9f
Change-Id: I9a6c0128c2e85fab2f40dde49e43c77b385d2eb9
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:19 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b am:
c42e782644 am:
5c9fc68825 am:
bc0b041f30 am:
21c75b8f69
Change-Id: I7f97aca01b8e234251392f9cc7a0666526874289
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:17 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1
Change-Id: Id21f431331483f18ceb6b7c4661005064592b93c
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:14 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b am:
c42e782644 am:
5c9fc68825 am:
bc0b041f30
Change-Id: Ic3b7d5d198b785ee4c4e3247786f943f26580474
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:09 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b am:
c42e782644 am:
5c9fc68825
Change-Id: Ic6383879abe802dacbf667ba6b16add00f8fe7a9
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:05 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b am:
c42e782644
Change-Id: Ia50926f618e0c9045196fbf8413901c28ccd1f73
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:00 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b
Change-Id: I068312923b05f1fb82d47331272515d294809317
Android Build Merger (Role) [Mon, 14 Aug 2017 23:51:56 +0000 (23:51 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad
Change-Id: Ic6f76fbc3f7c128d8a6bad06bdf596e37701090f
Lajos Molnar [Mon, 14 Aug 2017 23:51:53 +0000 (23:51 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev
am:
5293df6bb6
Change-Id: I54288e3fe8017dc920fead91513ea7ab6d22b849
Lajos Molnar [Mon, 14 Aug 2017 23:51:52 +0000 (23:51 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev
am:
371e4fc283
Change-Id: I1e9abee95a7361acb06a447f0838a79c49b03d4e
Lajos Molnar [Mon, 14 Aug 2017 23:51:34 +0000 (23:51 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
am:
cddbfe5496
Change-Id: Ic03f8dbd9b54cd9a4899b10cb554e294155dcc6d
Android Build Merger (Role) [Mon, 14 Aug 2017 23:51:24 +0000 (23:51 +0000)]
Merge changes from topic "am-
b52f5848421245739953acc2ee449dc5" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev am:
8c7913271e am:
dd96a6df71
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev am:
8c7913271e
Android Build Merger (Role) [Mon, 14 Aug 2017 23:51:24 +0000 (23:51 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev am:
8c7913271e" into mnc-dr1.5-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:48:14 +0000 (23:48 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev am:
8c7913271e am:
dd96a6df71
Change-Id: I5e6a2ea1e0ee0b4f7e7336cc24cbc68d8f768ee3
Android Build Merger (Role) [Mon, 14 Aug 2017 23:46:13 +0000 (23:46 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dr-dev am:
4773895ad6 am:
346ec93169 am:
6c9ef24bba
Change-Id: Ic002ab5908c4c5ee0d2b573feef5641514148261
Android Build Merger (Role) [Mon, 14 Aug 2017 23:46:07 +0000 (23:46 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dr-dev am:
4773895ad6 am:
346ec93169
Change-Id: If9320fdc1203205eb711dfb765a9d6059f33963e
Lajos Molnar [Mon, 14 Aug 2017 23:45:29 +0000 (23:45 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev
am:
8c7913271e
Change-Id: I309db43f32858239c8ac66281479b28f8c4941da
Lajos Molnar [Mon, 14 Aug 2017 23:45:21 +0000 (23:45 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dr-dev
am:
4773895ad6
Change-Id: I77c5d70f06f1a1d9297232eda7e885ba727f5a4c
Lajos Molnar [Mon, 14 Aug 2017 23:39:56 +0000 (23:39 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dr1.5-dev
am:
1e314546c8
Change-Id: Idd5a40230bbfc2a30a920a1a9b8b58632cdc33fd
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dr-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dr1.5-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861 am:
61c116adff
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into nyc-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861 am:
61c116adff am:
9064a5c7c0
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861 am:
61c116adff
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Wei Jia [Mon, 14 Aug 2017 22:23:00 +0000 (22:23 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6 am:
fb86876c62 am:
6810ac8bcd am:
1338d42a52 am:
c8effca29b
Change-Id: I472c1399c3e2ed863ddd2dba07f4db4d400366ad
Wei Jia [Mon, 14 Aug 2017 22:22:55 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6 am:
fb86876c62 am:
6810ac8bcd am:
1338d42a52
Change-Id: I0ff7a6ea3a6b981028f07e86067aa071bc99f80a
Wei Jia [Mon, 14 Aug 2017 22:22:50 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6 am:
fb86876c62 am:
6810ac8bcd
Change-Id: I5ddb4c86be53e4d975c4eb5abfeece0874a3a0fa
Wei Jia [Mon, 14 Aug 2017 22:22:44 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6 am:
fb86876c62
Change-Id: I2c156d1e0f52aa28448448eb403478ed7759c512
Wei Jia [Mon, 14 Aug 2017 22:22:39 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6
Change-Id: Ieb9ea8613b8f4ce3848344380cc79bbf252cb996
Wei Jia [Mon, 14 Aug 2017 22:22:33 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918
Change-Id: I56303a18ee48e2032d1d937899bd73035f507eba
Wei Jia [Mon, 14 Aug 2017 22:22:28 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3
Change-Id: I3f836425d32d5e5cd53162c5dcbb0150a6947a95
Wei Jia [Mon, 14 Aug 2017 22:22:23 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1
Change-Id: I33ebb671bd8f8b036bd585b70fff42f3d61c078f
Wei Jia [Mon, 14 Aug 2017 22:22:17 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400
Change-Id: I63d3ee56db210794a06b97f1283bebf978284f42
Wei Jia [Mon, 14 Aug 2017 22:22:12 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4
Change-Id: If51ef2fb8858fa23a4503f031e9a9127c975ef36
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.
Test: passed CTS test DecoderTest#testDecodeFragmented
Bug:
64314728
Bug:
36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit
ba9af7792dfed6e9b1b216aab91a97e713eec891)
(cherry picked from commit
6b401a337674f2f22b7589534700a33187899869)
Mikhail Naganov [Mon, 14 Aug 2017 19:37:39 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556 am:
e52a6ab853 am:
c6905d1c9c
Change-Id: I88ef8effb22c7e01ae8d2668e3c832fe0febc90c
Mikhail Naganov [Mon, 14 Aug 2017 19:37:35 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556 am:
e52a6ab853
Change-Id: I62cb512c152a15b8ea82da277f0e4e93acc66a8a
Mikhail Naganov [Mon, 14 Aug 2017 19:37:30 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36 am:
698581c556
Change-Id: I4f5a7068fb53ffacecbd5707771d57488ea307cf
Mikhail Naganov [Mon, 14 Aug 2017 19:37:24 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36
Change-Id: Ib9efffefd4952e675a13f51951a4d02f00c6abe6
Mikhail Naganov [Mon, 14 Aug 2017 19:37:19 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1
Change-Id: Ia0244b37df369a27b4bad024eef06cc56b5e64a2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:13 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104
Change-Id: I9127fb8696af5ef68ca122545ef6da09bba360c2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:08 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e
Change-Id: I13d92901d6f54840bb2ff8a9802cdf94b690b8e2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:03 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe
Change-Id: Iaaaead614bb1a1dbc62f0443e7e3e0d7d4fb9012
Mikhail Naganov [Mon, 14 Aug 2017 19:36:57 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9
Change-Id: I8dfe1cdebec08b9ad5d3c7b19b8891158ac51132
Mikhail Naganov [Mon, 14 Aug 2017 19:36:51 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd
Change-Id: Ie44dd9c0d77ebcbc1b33603f06bb3fd3d86c6174
Lajos Molnar [Fri, 11 Aug 2017 21:06:40 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861 am:
61c116adff am:
9064a5c7c0
Change-Id: I79051371930fb4dc367c656810b6633d0b307cdb
Lajos Molnar [Fri, 11 Aug 2017 21:06:35 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861 am:
61c116adff
Change-Id: Iad628779215b7f75529cc3ed7914e9fdc9e3ee86
Lajos Molnar [Fri, 11 Aug 2017 21:06:30 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525 am:
5e5bb2a861
Change-Id: Ib9c53dabc61f654791e92a7939eaed1e19f89df6
Lajos Molnar [Fri, 11 Aug 2017 21:06:25 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525
Change-Id: Ifd01cbe03ab9bea87ccbc6fa8ff1c119cfca57d8
Lajos Molnar [Fri, 11 Aug 2017 21:06:20 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
Change-Id: I3ca735e893a638f412656f64bb3e857b6c863790
Lajos Molnar [Fri, 11 Aug 2017 21:06:14 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
Change-Id: Iddb5c897937a3acd8ee404a0d1f71ec5da22738e
Lajos Molnar [Fri, 11 Aug 2017 21:06:09 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
Change-Id: I5cd909195abd8ba442120aee597774f96c9db32d
Lajos Molnar [Tue, 27 Jun 2017 20:58:07 +0000 (13:58 -0700)]
stagefright: avoid buffer overflow in base64 decoder
Bug:
62673128
Change-Id: Id5f04b772aaca3184879bd5bca453ad9e82c7f94
Mikhail Naganov [Tue, 25 Jul 2017 00:25:47 +0000 (17:25 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb
Bug:
63662938
Bug:
63526567
Test: Added CTS tests
Change-Id: I8ed398cd62a9f461b0590e37f593daa3d8e4dbc4
Marco Nelissen [Fri, 4 Aug 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours am:
0a78268055 -s ours am:
8d68455f69 -s ours
am:
369ad623bc -s ours
Change-Id: If89325cfb1e4ab00a3c87901d1d6c44d0e6c321c
Marco Nelissen [Fri, 4 Aug 2017 23:21:45 +0000 (23:21 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours am:
0a78268055 -s ours
am:
8d68455f69 -s ours
Change-Id: I0d67f4871aea0df136ef7e26bfb7e7b9d0eadfc1
Marco Nelissen [Fri, 4 Aug 2017 23:15:46 +0000 (23:15 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours am:
84b2e0717c -s ours
am:
0a78268055 -s ours
Change-Id: Ifedba1a55e58651c9f4f93864ad52b8bf1f78461
Marco Nelissen [Fri, 4 Aug 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours
am:
84b2e0717c -s ours
Change-Id: Ib5f483ddb67d18c95c720088f9b0ed1c64b65979
Marco Nelissen [Fri, 4 Aug 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303
am:
6d050827c3 -s ours
Change-Id: I192b34239fc52c5532a0ea4ce71fc110639d462f
Marco Nelissen [Fri, 4 Aug 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e
am:
ff9e1b0303
Change-Id: I57d1b50eea3a31fae57bd20f856a0ebc53e73357
Marco Nelissen [Fri, 4 Aug 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d
am:
222dca470e
Change-Id: Icd722065f9256e7afec3e3d7f53c2aa5340856d8
Marco Nelissen [Fri, 4 Aug 2017 22:45:10 +0000 (22:45 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199
am:
87f1a3041d
Change-Id: I8fc2acbf9bbddbc4a401f51595752351c06acc79
Marco Nelissen [Fri, 4 Aug 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef
am:
f233415199
Change-Id: I93a9b7b1f48953ec52d6c0f23e3141ddf6dc30f3
Marco Nelissen [Fri, 4 Aug 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Skip track if verification fails" into klp-dev
am:
ab2c5046ef
Change-Id: Ica76922fc399fe0e5b6af23d613a2f6e5bc7820b
TreeHugger Robot [Fri, 4 Aug 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Skip track if verification fails" into klp-dev
Marco Nelissen [Tue, 18 Jul 2017 21:57:11 +0000 (14:57 -0700)]
Skip track if verification fails
Bug:
62187433
Test: ran poc, CTS
Merged-In: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
Change-Id: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
Dongwon Kang [Thu, 3 Aug 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70 am:
20ff47b39c
am:
8dd4d58d28
Change-Id: Ie7d200d4c74a91ce8f4a7c8d4e91ff71d0d1d12e
Dongwon Kang [Thu, 3 Aug 2017 21:03:21 +0000 (21:03 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56 am:
73c41f9d70
am:
20ff47b39c
Change-Id: I75981256fe8a29ff53e6018064d705ec6d1be71e
Wei Jia [Thu, 3 Aug 2017 20:57:24 +0000 (20:57 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f am:
fa7be9da95
am:
b31373e62c
Change-Id: I4266df6693d6f6e261e5959f8006f658be57d656
Dongwon Kang [Thu, 3 Aug 2017 20:57:21 +0000 (20:57 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am:
a7a43d9b56
am:
73c41f9d70
Change-Id: I12556bc1f16c13abfe7018a9c21258c73e46c7a0
Dongwon Kang [Thu, 3 Aug 2017 20:51:21 +0000 (20:51 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
am:
a7a43d9b56
Change-Id: If7a317b2a9de1daaafb83aeb466c52ef494b972d
Wei Jia [Thu, 3 Aug 2017 20:51:20 +0000 (20:51 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e am:
218692ec4f
am:
fa7be9da95
Change-Id: Icc90b2c750e5d75697579cb98532d0667280dced
Wei Jia [Thu, 3 Aug 2017 20:45:52 +0000 (20:45 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d am:
bbc5c8fc60 am:
067ab2f74e
am:
218692ec4f
Change-Id: I5abf7e89e0476f46492ca3166ff2245d70e87068
TreeHugger Robot [Thu, 3 Aug 2017 20:44:43 +0000 (20:44 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
OSDN Git Service
