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

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

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: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

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: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: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: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: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

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

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

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

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 "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 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

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: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: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

commit | commitdiff | tree

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

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

Change-Id: I32ba1bd275bd9356a2bb162d85813fdcfbdd2e96

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev
am: 391c549642

Change-Id: I23c36b39ad9c0ab44bad9c7970617974d2d109f1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]

Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-mr1-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 am: f42a9e6867
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]

Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-mr1-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 am: 25c4731698
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:53:12 +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 am: f42a9e6867

Change-Id: I2add5d5861cd0170ffe9126b18dbc969b0408b39

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:40 +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 am: 25c4731698

Change-Id: I985d31cd9256e57192d81f531d8888178184770b

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:29 +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 am: 88fd67f2b3

Change-Id: I2511f9f153451bacd186bd25998323c3977156d6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:51:24 +0000 (23:51 +0000)]

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

* changes:
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev am: 8c7913271e am: dd96a6df71 am: 6895bd894f am: ded980ca6d
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:49:01 +0000 (23:49 +0000)]

[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev am: 8c7913271e am: dd96a6df71 am: 6895bd894f am: ded980ca6d

Change-Id: I82995d16e03bd5a181e122057672b8924daaf837

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:46:25 +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 am: 5ffbc4d349

Change-Id: I4342dc73fb2c8ea94b0367029a5def2dfe7183d3

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:44:11 +0000 (23:44 +0000)]

Merge changes from topic "am-4f76118405fa44d29be1267bbd7eff82" into nyc-mr1-dev

* changes:
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev am: 1e314546c8 am: f0bda45342 am: 24b654bab3
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev am: 1e314546c8 am: f0bda45342
  Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev am: 1e314546c8

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:40:27 +0000 (23:40 +0000)]

[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev am: 1e314546c8 am: f0bda45342 am: 24b654bab3

Change-Id: I5c60628810dcf4a1c749d136f12a76b9d8966886

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 14 Aug 2017 23:40:22 +0000 (23:40 +0000)]

[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev am: 1e314546c8 am: f0bda45342

Change-Id: Ie1ab3d7a0ea225514da994010dfe0f12e961aabe

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Mon, 14 Aug 2017 23:39:55 +0000 (23:39 +0000)]

Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-dr1-dev
am: 727dec27a0

Change-Id: I87ba21468c76cf01f8405fe69892ad6c55ca50fc

commit | commitdiff | tree

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

frameworks/av

RSS Atom

About OSDN

Find Software

Develop Software

Help