OSDN Git Service
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:12 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev am:
c17b510a15 am:
f56750b169 am:
6c09cf96c6 am:
a97e485cd1 am:
fd198c16d4
Change-Id: Ibcf5800bc90aa679755a7238253a187ffb8394b8
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:06 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev am:
c17b510a15 am:
f56750b169 am:
6c09cf96c6 am:
a97e485cd1
Change-Id: Ib18edeaa8f20b67a743d54cbe9315b3ca222899d
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:00 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev am:
c17b510a15 am:
f56750b169 am:
6c09cf96c6
Change-Id: Idb73013dcee5ce9239e52f1168288db9313ae30d
Android Build Merger (Role) [Tue, 15 Aug 2017 23:54:54 +0000 (23:54 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev am:
c17b510a15 am:
f56750b169
Change-Id: Ia46c42bb15d4dd1159fa0ec4409e3db9c54df19c
Dongwon Kang [Tue, 15 Aug 2017 23:53:34 +0000 (23:53 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev
am:
c17b510a15
Change-Id: I07e52bccb5178319f753f243f41a7522d7535eb7
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into nyc-dr1-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7 am:
94185c1d26 am:
5c04472792
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7 am:
94185c1d26
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into nyc-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7 am:
94185c1d26
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dr1.5-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into cw-e-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dr-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
Lajos Molnar [Tue, 15 Aug 2017 22:21:58 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8 am:
983ab59558 am:
bd7625f2fe am:
2f21aace53 am:
b789b06d45 am:
b433798478
Change-Id: I0eeddcdcc0be7b400df6c8f2108f2255786abe8d
Lajos Molnar [Tue, 15 Aug 2017 22:21:53 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8 am:
983ab59558 am:
bd7625f2fe am:
2f21aace53 am:
b789b06d45
Change-Id: Id4e42f9249c71846858e9163e75d8c141a22c578
Lajos Molnar [Tue, 15 Aug 2017 22:21:49 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8 am:
983ab59558 am:
bd7625f2fe am:
2f21aace53
Change-Id: I24319ac557db491a294742b7076155ebf7d43322
Lajos Molnar [Tue, 15 Aug 2017 22:21:44 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8 am:
983ab59558 am:
bd7625f2fe
Change-Id: I20360316ec2b796eb948bf169bb2e73b0f96a1cd
Lajos Molnar [Tue, 15 Aug 2017 22:21:39 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8 am:
983ab59558
Change-Id: I6ba96d5aeb9268ceac0a7287a650afcf459231ed
Lajos Molnar [Tue, 15 Aug 2017 22:21:33 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8
Change-Id: Ic9a15317becdbb4acf1343ac064f4e2c77b2b114
Lajos Molnar [Tue, 15 Aug 2017 22:21:28 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2
Change-Id: I674a5e8e1587de842352deb41279b6ea32045b60
Lajos Molnar [Tue, 15 Aug 2017 22:21:23 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300
Change-Id: I16d35492c1254579794d4398dee28dd556a1703d
Lajos Molnar [Tue, 15 Aug 2017 22:10:32 +0000 (15:10 -0700)]
Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD
* commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6':
stagefright: avoid buffer overflow in base64 decoder
Bug:
62673128
Change-Id: I2cfd6b4f7e30c111de54d9b42e7bc94a3a5aefba
Dongwon Kang [Tue, 15 Aug 2017 22:06:42 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7 am:
94185c1d26 am:
5c04472792
Change-Id: If5ced0999223757ce235d222fb08218add879305
Dongwon Kang [Tue, 15 Aug 2017 22:06:36 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7 am:
94185c1d26
Change-Id: Ie832a957bfdfb5b06824a96814ddbaf54a6f1ae2
Dongwon Kang [Tue, 15 Aug 2017 22:06:31 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be am:
b22b2126a7
Change-Id: I3c714c3a6d809bb4dcfb8f184b9dcef6725b11b8
Dongwon Kang [Tue, 15 Aug 2017 22:06:25 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93 am:
e408a6f7be
Change-Id: I9d48e3542f6ef811261f29afab91b8f0bcacf090
Dongwon Kang [Tue, 15 Aug 2017 22:06:20 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
Change-Id: Id63b9b26263436ac54269878d15897b6d6e4d41f
Dongwon Kang [Tue, 15 Aug 2017 22:06:15 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
Change-Id: Ic6c8672379bf0e84715d0da49ae4704ac0a2ea02
Dongwon Kang [Tue, 15 Aug 2017 22:06:10 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
Change-Id: I6a29a7a6f8db29380f6adcc0d4ed6b4c3935c309
Dongwon Kang [Tue, 15 Aug 2017 22:06:05 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
Change-Id: Idf513ba06641aacf48f457b3a8ae02721404b7c1
Dongwon Kang [Tue, 15 Aug 2017 22:05:59 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
Change-Id: Ic12354524144a6d1337be0a7c57efb4711cee660
Dongwon Kang [Tue, 15 Aug 2017 22:05:53 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
Change-Id: Ibbbdacd98e6362267e5f7b926a70c133a0a3d9f4
Dongwon Kang [Tue, 15 Aug 2017 22:05:47 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Change-Id: I12e72631c86a3d1cb5fadb89243c1acacc7c20a7
Dongwon Kang [Mon, 24 Jul 2017 20:59:51 +0000 (13:59 -0700)]
Check buffer size in useBuffer in software components
Test: No more crash from oob read/write with running poc.
Bug:
63522430
Change-Id: I232d256eacdfaa9347902fe9b42650999f0d2d85
Lajos Molnar [Tue, 15 Aug 2017 22:02:19 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
b4d9e1b413 am:
8710f4666e
Change-Id: I954737558188868ffe66a844acc4b268dc2918f4
Lajos Molnar [Tue, 15 Aug 2017 22:02:12 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
b4d9e1b413
Change-Id: I9ba3a1d3deffa395ef454da57bfeb4200943f190
Android Build Merger (Role) [Tue, 15 Aug 2017 00:23:18 +0000 (00:23 +0000)]
[automerger] Merge "Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174" into cw-e-dev am:
9c2af82322 am:
9aa958278b am:
6eedc31e79
Change-Id: I378288a653171eb4554e2d8043a9c1a65e532862
Android Build Merger (Role) [Tue, 15 Aug 2017 00:23:08 +0000 (00:23 +0000)]
[automerger] Merge "Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174" into cw-e-dev am:
9c2af82322 am:
9aa958278b
Change-Id: I2c8e1455fadfa76addeb566caa2675af8a0b4928
Lajos Molnar [Tue, 15 Aug 2017 00:22:28 +0000 (00:22 +0000)]
Merge "Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174" into cw-e-dev
am:
9c2af82322
Change-Id: I1c93f3f331b26424b1eb13ef1c1b89b1b0c41f81
Android Build Merger (Role) [Tue, 15 Aug 2017 00:19:53 +0000 (00:19 +0000)]
Merge "Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174" into cw-e-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 00:19:53 +0000 (00:19 +0000)]
Merge changes from topic "am-
66c554504b7b40cba2cd0cea8e47e323" into nyc-dr1-dev
* changes:
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6 am:
d1d43afc2e am:
9d5231812f
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6 am:
d1d43afc2e
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174
Android Build Merger (Role) [Tue, 15 Aug 2017 00:19:53 +0000 (00:19 +0000)]
Merge changes from topic "am-
66c554504b7b40cba2cd0cea8e47e323" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6 am:
d1d43afc2e
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174
Android Build Merger (Role) [Tue, 15 Aug 2017 00:19:53 +0000 (00:19 +0000)]
Merge changes from topic "am-
66c554504b7b40cba2cd0cea8e47e323" into mnc-dr1.5-dev
* changes:
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174
Android Build Merger (Role) [Tue, 15 Aug 2017 00:18:37 +0000 (00:18 +0000)]
Merge changes from topic "am-
898960ce56d249988f3dbbfe459f5344" into nyc-dr1-dev
* changes:
[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 am:
ee58de33d4
[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
[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
[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
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev am:
a0388f92c7
Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:36 +0000 (00:15 +0000)]
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6 am:
d1d43afc2e am:
9d5231812f
Change-Id: I139844f7151d1b809f9642f3388b53b897f7126f
Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:30 +0000 (00:15 +0000)]
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6 am:
d1d43afc2e
Change-Id: I30e44311421c783970d37abe5f21b318941003ad
Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:19 +0000 (00:15 +0000)]
[automerger] Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev am:
8ce83b6174 am:
5644b702e6
Change-Id: I37370ea3ba788a9c115ab51a218c2208d9ecb265
Lajos Molnar [Tue, 15 Aug 2017 00:14:02 +0000 (00:14 +0000)]
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev
am:
8ce83b6174
Change-Id: Iff4f767c0505a9f1ae7b94015a5e7909d02cc505
Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:49 +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 am:
ee58de33d4
Change-Id: I4428bc3b7a981cb2b31c266df7d46f150642bdf4
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
Lajos Molnar [Tue, 15 Aug 2017 00:12:21 +0000 (00:12 +0000)]
Merge changes from topic "am-
a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev
am:
d047df653e
Change-Id: I7a06de14727acb572aaabe16e6807a5a0b8ea3f7
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:08:12 +0000 (00:08 +0000)]
Merge changes from topic "am-
a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-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 am:
6c616ed1be
[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:06:25 +0000 (00:06 +0000)]
Merge changes from topic "am-
ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev
* changes:
[automerger] Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am:
a5c3676d9f am:
1cd6d429d1
Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am:
a5c3676d9f
Android Build Merger (Role) [Tue, 15 Aug 2017 00:04:39 +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 am:
6c616ed1be
Change-Id: Id6f249c83f39de6537e7eff2d3d659533051790b
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
Android Build Merger (Role) [Tue, 15 Aug 2017 00:04:21 +0000 (00:04 +0000)]
[automerger] Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am:
a5c3676d9f am:
1cd6d429d1
Change-Id: I3f4858c0f083b7f0649309524c8f80bf275c28ee
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
Lajos Molnar [Tue, 15 Aug 2017 00:01:56 +0000 (00:01 +0000)]
Merge changes from topic "am-
a0a1f3414b9a4b419037551f894343bc" into nyc-dev
am:
9ba8abb172
Change-Id: I8b790233be9ebcdf4a6e0347a5d84fda69e86f57
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 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 changes from topic "am-
30695673681a430e9c5896e3258d3047" into nyc-dr1-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 am:
ada995222d
[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 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 nyc-dr1-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283 am:
d6636186d1 am:
f1d1bcda9f am:
5ea07b119f am:
6d8a510740
[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:06 +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 am:
ada995222d
Change-Id: Ia9585495c84605afe1acc5248548822555e4d88f
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:33 +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 am:
6d8a510740
Change-Id: Ia0af9f0c57d9e2ee545c49c4152e131b59e5a0f1
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:24 +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 am:
93b2a3f4f8
Change-Id: Ie6d85e2fd0afeaa8d262493f9e18124297eb39f5
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-dr1-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev am:
8c7913271e am:
dd96a6df71 am:
6895bd894f
[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 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:37 +0000 (23:48 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into cw-e-dev am:
8c7913271e am:
dd96a6df71 am:
6895bd894f
Change-Id: I3504c71db568cfa613614fca2704266f5d5a9cb8
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:19 +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 am:
f6dee24b67
Change-Id: I4b3030a17fd266afea9fa88ef509d1523c1ba215
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
OSDN Git Service
