git.osdn.net Git - android-x86/frameworks-av.git/log

(root) / android-x86 / frameworks-av.git / log

Lajos Molnar [Tue, 15 Aug 2017 23:11:00 +0000 (23:11 +0000)]

[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8 am: 983ab59558 am: bd7625f2fe am: 2f21aace53 am: b789b06d45 am: b433798478 am: dd40ebdfc8 am: 27a03fc3d9
am: dbccb4fba9

Change-Id: I2fb13f75ace99549375bea0ceecfb116b1d701b5

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 22:22:08 +0000 (22:22 +0000)]

[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8 am: 983ab59558 am: bd7625f2fe am: 2f21aace53 am: b789b06d45 am: b433798478 am: dd40ebdfc8 am: 27a03fc3d9

Change-Id: I07bd0753dc58ca2e6d9ee0693e169b390569f305

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 22:22:03 +0000 (22:22 +0000)]

[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300 am: dba49298e2 am: b9348d12a8 am: 983ab59558 am: bd7625f2fe am: 2f21aace53 am: b789b06d45 am: b433798478 am: dd40ebdfc8

Change-Id: I566c4bda21ddeca428abf34b83dc9a93fb69ec18

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 22:21:23 +0000 (22:21 +0000)]

[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300

Change-Id: I16d35492c1254579794d4398dee28dd556a1703d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 01:11:12 +0000 (01:11 +0000)]

Merge changes from topic "am-bd1413084f4640bba036065ef250a98f" into cw-f-dev
am: 90407ddbeb

Change-Id: Ia4bf4f98023dddc18b3137642afd36bc65c34f53

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 01:09:01 +0000 (01:09 +0000)]

Merge changes from topic "am-66c554504b7b40cba2cd0cea8e47e323" into nyc-mr1-dev am: 2265f3afd4
am: 6f44287a99

Change-Id: I84d6eef76c74e0733c9f2b7f0e5e562564528664

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 01:07:07 +0000 (01:07 +0000)]

Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into nyc-mr1-dev am: 7591071f2c
am: f60910e208

Change-Id: I46259f7f3547c0f001391a093a4794cc836bb072

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 01:04:56 +0000 (01:04 +0000)]

Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851" into nyc-mr1-dev am: 31b0a30e74
am: 8d75987767

Change-Id: I92a2a510a97342a903f4272966b9ab444c519873

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 01:02:49 +0000 (01:02 +0000)]

Merge "Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb" into nyc-mr1-dev am: 045c85532d
am: 26451d0e39

Change-Id: Ibdac46fd4c04c8ea7326082bd423888b7fa34a7e

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 01:00:13 +0000 (01:00 +0000)]

Merge changes from topic "am-66c554504b7b40cba2cd0cea8e47e323" into cw-f-dev
am: 9ef8c8449a

Change-Id: If2843584de8bfc8f73ccc45c97ccd62289611c2c

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:58:08 +0000 (00:58 +0000)]

Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev
am: d82f105ee4

Change-Id: Ibdaf2181549e6ee0a3a192e0c0ae527fd6258d91

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:55:05 +0000 (00:55 +0000)]

[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851 am: 2a6dfd0c2d
am: 8edd82630f

Change-Id: Ie13c411b64260efb27485a694bb50a38b748b0aa

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:52:46 +0000 (00:52 +0000)]

[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb am: 4a2da16607
am: e0729dd03e

Change-Id: I65f5a024da29d86188f83d14243fbc6811cc80a3

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:50:42 +0000 (00:50 +0000)]

Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev am: b0a2af2643" into cw-f-dev
am: f793a45b64

Change-Id: Ia362ed72c81e4c7db2c68f2b3647e8bc8a7dd112

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:48:28 +0000 (00:48 +0000)]

[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4
am: e4aea51b88

Change-Id: I0ec5194fe29f2b057acbdd69dd9c361db34258d7

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:42:07 +0000 (00:42 +0000)]

Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev am: af875ddae7
am: 55014a7720

Change-Id: Ic7431d01b1d0d86a5a32826683dcfc0b9c1f5106

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:39:58 +0000 (00:39 +0000)]

Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev am: 195e72300f
am: cb0c0252b2

Change-Id: I56c10ac95fac750396af0d2e60a94639cb90571b

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:35:20 +0000 (00:35 +0000)]

Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev
am: 4afbd35abe

Change-Id: I3de349f93c854b0cc5d1b41d29acc35ef67ec16f

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:33:12 +0000 (00:33 +0000)]

Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev
am: 7508147a56

Change-Id: I49b254a913f3f8b43ee0de6a67c589e1cf7e7ca2

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:30:46 +0000 (00:30 +0000)]

Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev
am: 95f27c865f

Change-Id: Ibea82e4167cca75126e3428b5836af9095d65d08

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:28:24 +0000 (00:28 +0000)]

[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd am: 3b8128941a
am: 614d9e491a

Change-Id: I6c567b8c5c4a613edd60879d0c84bcd9a07ba53f

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:26:19 +0000 (00:26 +0000)]

Merge changes from topic "am-bd1413084f4640bba036065ef250a98f" into cw-f-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174" into cw-e-dev am: 9c2af82322 am: 9aa958278b am: 6eedc31e79 am: fe77499a3c am: 9662711c70
  [automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174" into cw-e-dev am: 9c2af82322 am: 9aa958278b am: 6eedc31e79 am: fe77499a3c
  [automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174" into cw-e-dev am: 9c2af82322 am: 9aa958278b am: 6eedc31e79
  [automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174" into cw-e-dev am: 9c2af82322 am: 9aa958278b
  Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174" into cw-e-dev am: 9c2af82322

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:25:33 +0000 (00:25 +0000)]

[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev am: 391c549642 am: e82fe7a4e7
am: 925dba7faa

Change-Id: If0082dd7ab11cfebce12f17bbf8b99b63ddb43f8

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:25:22 +0000 (00:25 +0000)]

Merge changes from topic "am-66c554504b7b40cba2cd0cea8e47e323" into nyc-mr1-dev
am: 2265f3afd4

Change-Id: Ia5dc10aa6944897e49d54d7e96235f8bfd771464

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:24:32 +0000 (00:24 +0000)]

Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into nyc-mr1-dev
am: 7591071f2c

Change-Id: I245f9d476ec531c1aa064bf9bd2c72c2888ea625

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:23:30 +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 am: fe77499a3c am: 9662711c70

Change-Id: Ie6c6cca37d0a040467e967c804c4f766696db364

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:23:29 +0000 (00:23 +0000)]

Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851" into nyc-mr1-dev
am: 31b0a30e74

Change-Id: If286b457ae19b7afd69e5b01ae99cddfa0b05268

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:23:24 +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 am: fe77499a3c

Change-Id: I591aa315cd564764baef82eaeaf1ebe1852c42c5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:22:51 +0000 (00:22 +0000)]

Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1-dev am: 6adf95f76b" into cw-f-dev
am: ba9116b245

Change-Id: I55f238dcaf97b01395e1f2372c450daf6219174f

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:22:29 +0000 (00:22 +0000)]

Merge "Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb" into nyc-mr1-dev
am: 045c85532d

Change-Id: Ia4cecacbc240c74502b19778b4f87fced38aab67

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:20:23 +0000 (00:20 +0000)]

Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-f-dev
am: 71b6110bb4

Change-Id: Ic06c1bc22d4324b2bb757716eda8f04896f71c6c

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:19:53 +0000 (00:19 +0000)]

Merge changes from topic "am-66c554504b7b40cba2cd0cea8e47e323" into cw-f-dev

* changes:
  [automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174 am: 5644b702e6 am: d1d43afc2e am: 9d5231812f am: d30bc0653b am: 758fb06416
  [automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174 am: 5644b702e6 am: d1d43afc2e am: 9d5231812f am: d30bc0653b
  [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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:19:53 +0000 (00:19 +0000)]

Merge changes from topic "am-66c554504b7b40cba2cd0cea8e47e323" into nyc-mr1-dev

* changes:
  [automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174 am: 5644b702e6 am: d1d43afc2e am: 9d5231812f am: d30bc0653b
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:18:37 +0000 (00:18 +0000)]

Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-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 am: 5f6e425f18 am: bee553bbe1
  [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 am: 5f6e425f18
  [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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:18:37 +0000 (00:18 +0000)]

Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into nyc-mr1-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 am: 5f6e425f18
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:18:11 +0000 (00:18 +0000)]

Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851" into nyc-mr1-dev

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:16:55 +0000 (00:16 +0000)]

Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-f-dev
am: 5de5d129f3

Change-Id: I5217ec9a81584b59067207ac8e42d46e93657d47

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:16:48 +0000 (00:16 +0000)]

[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851 am: 2a6dfd0c2d

Change-Id: I6da3f0335375869d0690e2e83f52ed37083cf35f

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:16:11 +0000 (00:16 +0000)]

Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev
am: 7aa1ca5851

Change-Id: I5f14de69e62b1053e33e6ab03c11b6dd9b87f27f

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:53 +0000 (00:15 +0000)]

Merge "Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:48 +0000 (00:15 +0000)]

[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174 am: 5644b702e6 am: d1d43afc2e am: 9d5231812f am: d30bc0653b am: 758fb06416

Change-Id: I61304c58bd1569245c1f196a549a3ad8623f8915

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:42 +0000 (00:15 +0000)]

[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174 am: 5644b702e6 am: d1d43afc2e am: 9d5231812f am: d30bc0653b

Change-Id: Id3cb9da263f45797938cc305f7d05511071bf622

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:05 +0000 (00:15 +0000)]

[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb am: 4a2da16607

Change-Id: I3eb7ff1432b8bf2213a76bef6a6f270e28277ddc

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:14:54 +0000 (00:14 +0000)]

Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev am: b0a2af2643" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:14:01 +0000 (00:14 +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 am: 5f6e425f18 am: bee553bbe1

Change-Id: Iab5def7f8a325a9548df3c804d7517701d884bcd

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:14:01 +0000 (00:14 +0000)]

Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev
am: b0a2af2643

Change-Id: I5396934ca314921521f384df5bf7aa5a5eb6458b

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:13:59 +0000 (00:13 +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 am: 88fd67f2b3 am: fb1443d485
am: 321c8cf574

Change-Id: Ia020b6c661317a098bb7fdea910b09568bd7d267

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:13:59 +0000 (00:13 +0000)]

Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev
am: 7ba7f0edbb

Change-Id: Iacb373edc5d77064b59ac7f91121beba140a43ce

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:55 +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 am: 5f6e425f18

Change-Id: I1c75f7bf2212c9394c6f5d1cea87dc4500ababf1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:13 +0000 (00:13 +0000)]

[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4

Change-Id: I49b2910c86bc6c42979893c18c81dea7af4bc5ff

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:06 +0000 (00:13 +0000)]

[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83

Change-Id: I03b30e6a3ed501c6ce27d2c5e231867175543c90

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:10:40 +0000 (00:10 +0000)]

Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev
am: af875ddae7

Change-Id: I171af9cf282d5213c7ce45cb6e43d1a15906ef52

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:10:32 +0000 (00:10 +0000)]

Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into cw-f-dev
am: bfc21dd3df

Change-Id: I8bef60e5095aa1478c00e2caf46692030f344815

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:10:06 +0000 (00:10 +0000)]

Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev
am: 195e72300f

Change-Id: Ief81bcc22d14d494ca24ca211d6fed45b0282669

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:08:12 +0000 (00:08 +0000)]

Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-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 am: 1bc1d02b95 am: fcb7a1e605
  [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 am: 1bc1d02b95
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:08:12 +0000 (00:08 +0000)]

Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-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 am: 1bc1d02b95
  [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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:06:33 +0000 (00:06 +0000)]

Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev

* changes:
[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba am: 01d8ffcb85
Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:06:33 +0000 (00:06 +0000)]

Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:06:25 +0000 (00:06 +0000)]

Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev

* changes:
  [automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am: a5c3676d9f am: 1cd6d429d1 am: 54fb9da18c am: 1702f52890
  [automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am: a5c3676d9f am: 1cd6d429d1 am: 54fb9da18c
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:06:25 +0000 (00:06 +0000)]

Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev

* changes:
  [automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am: a5c3676d9f am: 1cd6d429d1 am: 54fb9da18c
  [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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:05:48 +0000 (00:05 +0000)]

[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba am: 01d8ffcb85

Change-Id: I89283bf7d8843dfe9a3475377850459ad8a227bd

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:05:28 +0000 (00:05 +0000)]

[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev am: 4773895ad6 am: 346ec93169 am: 6c9ef24bba am: f6dee24b67 am: 5ffbc4d349 am: 1e8caebd71
am: e1eb94f29c

Change-Id: Id270102aede6b5c6d37c03824f3cf78c0036e0e4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:05:15 +0000 (00:05 +0000)]

[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd am: 3b8128941a

Change-Id: I0203787fa7a43e39579f79a0feafb64ff12ebabb

commit | commitdiff | tree

Lajos Molnar [Tue, 15 Aug 2017 00:05:09 +0000 (00:05 +0000)]

Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev
am: e9bfcf0dba

Change-Id: Idc67edcfe892f51d62c2cbd8860c1ecfedae9663

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:05:09 +0000 (00:05 +0000)]

[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd

Change-Id: I46eb3eda84faff6f49002504727142033e70314e

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:04:51 +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 am: 1bc1d02b95 am: fcb7a1e605

Change-Id: Id93c75191a471dbade64c71771187c8ffc375b88

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:04:45 +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 am: 1bc1d02b95

Change-Id: Iac0a2234cef95eb9a042ff2979b96a219cdee9b3

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 15 Aug 2017 00:04:34 +0000 (00:04 +0000)]

[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am: a5c3676d9f am: 1cd6d429d1 am: 54fb9da18c am: 1702f52890

Change-Id: I6ae39b1b8101d5c211c4e51ab2f013ee6ac2a2d4

frameworks/av

RSS Atom

About OSDN

Find Software

Develop Software

Help