OSDN Git Service

android-x86/frameworks-av.git
7 years ago[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into...
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

7 years ago[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into...
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

7 years ago[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into...
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

7 years ago[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into...
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

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev
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

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
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

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev
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

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev
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

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev
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

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev
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

7 years agoMerge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1...
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

7 years agoMerge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev
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

7 years agoMerge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev
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

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev
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

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
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

7 years ago[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650...
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

7 years ago[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650...
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

7 years ago[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650...
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

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
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

7 years ago[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650...
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

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev
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

7 years agoMerge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc...
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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev
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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev
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

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-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

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev
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

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-mr1-dev
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

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dev

* changes:
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485 am: 2f35f02f96 am: 4f6a7b45ec am: d324672375
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485 am: 2f35f02f96 am: 4f6a7b45ec
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485 am: 2f35f02f96
  [automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485
  Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr1.5-dev
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

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-e-dev
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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev
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

7 years agoMerge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc...
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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev
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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-mr1-dev
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

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-e-dev
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev
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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev
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

7 years agoMerge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
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

7 years agoMerge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1-dev
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

7 years agoMerge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-dr1-dev
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

7 years agoMerge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-dev
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

7 years agoMerge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev
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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev
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

7 years agoMerge changes from topic "am-4f76118405fa44d29be1267bbd7eff82" into nyc-mr1-dev
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev
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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-dr1-dev
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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-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

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years agoMerge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-e-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-mr1-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-mr1-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff am: 9064a5c7c0 am: 25b927e233 am: 0ad7b10c1e
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff am: 9064a5c7c0 am: 25b927e233
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff am: 9064a5c7c0
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-dr1-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-dr1-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff am: 9064a5c7c0 am: 25b927e233
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff am: 9064a5c7c0
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years agoMerge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff am: 9064a5c7c0
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861 am: 61c116adff
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525 am: 5e5bb2a861
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb am: 4d76a4b525
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46 am: 8f6c537ffb
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7 am: 5045de6f46
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:23:11 +0000 (22:23 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62 am: 6810ac8bcd am: 1338d42a52 am: c8effca29b am: db30246808 am: e118a11588

Change-Id: I4ba215315c58c02473c0331cce26cd02b81be09a

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:23:06 +0000 (22:23 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62 am: 6810ac8bcd am: 1338d42a52 am: c8effca29b am: db30246808

Change-Id: I9255d681a58a53befdfadd5f5905974171184b0b

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:23:00 +0000 (22:23 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62 am: 6810ac8bcd am: 1338d42a52 am: c8effca29b

Change-Id: I472c1399c3e2ed863ddd2dba07f4db4d400366ad

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:55 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62 am: 6810ac8bcd am: 1338d42a52

Change-Id: I0ff7a6ea3a6b981028f07e86067aa071bc99f80a

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:50 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62 am: 6810ac8bcd

Change-Id: I5ddb4c86be53e4d975c4eb5abfeece0874a3a0fa

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:44 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6 am: fb86876c62

Change-Id: I2c156d1e0f52aa28448448eb403478ed7759c512

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:39 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918 am: 442d5ba7b6

Change-Id: Ieb9ea8613b8f4ce3848344380cc79bbf252cb996

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:33 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3 am: ca0bd10918

Change-Id: I56303a18ee48e2032d1d937899bd73035f507eba

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:28 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1 am: da2d2587d3

Change-Id: I3f836425d32d5e5cd53162c5dcbb0150a6947a95

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am:...
Wei Jia [Mon, 14 Aug 2017 22:22:23 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400 am: ab9bfb83b1

Change-Id: I33ebb671bd8f8b036bd585b70fff42f3d61c078f

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400
Wei Jia [Mon, 14 Aug 2017 22:22:17 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400

Change-Id: I63d3ee56db210794a06b97f1283bebf978284f42

7 years ago[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4
Wei Jia [Mon, 14 Aug 2017 22:22:12 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4

Change-Id: If51ef2fb8858fa23a4503f031e9a9127c975ef36

7 years agoMPEG4Source: fix fragmented read.
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.

Test: passed CTS test DecoderTest#testDecodeFragmented
Bug: 64314728
Bug: 36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit ba9af7792dfed6e9b1b216aab91a97e713eec891)
(cherry picked from commit 6b401a337674f2f22b7589534700a33187899869)