OSDN Git Service

android-x86/frameworks-av.git
7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:22 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde am: fafd25255e am: a78c7f4ecc am: 53c10d4ac8 am: 275b2d63cd am: 3ab082ef33

Change-Id: I9a0d67642b407be9b2c89810a40d4cef6973eb3c

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:17 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde am: fafd25255e am: a78c7f4ecc am: 53c10d4ac8 am: 275b2d63cd

Change-Id: I3c40f98952e44516ad2e4e94d3616e991af51979

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:13 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde am: fafd25255e am: a78c7f4ecc am: 53c10d4ac8

Change-Id: Iedaffcb0dc47f38b9b8ee84ea670ceb5f3d6700f

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:08 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde am: fafd25255e am: a78c7f4ecc

Change-Id: Ib01cacc36ddeeb6c999601ff74e717992745d40d

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:03 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde am: fafd25255e

Change-Id: Id2a32097ac7af664a6fdb3e6e69ccdb6df38e8b4

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev
Dongwon Kang [Wed, 16 Aug 2017 00:12:17 +0000 (00:12 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev
am: 4c01d8afde

Change-Id: I8c11f8cac81a8c9de0df8506f3bb3fa339422bb6

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:59 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061 am: ff9c5ad85f am: 31199e5d39 am: 7db07c6af2 am: 3fbc42577f am: 5b29a62dd4 am: 588b07d6c1

Change-Id: Ia988f026dd46101606df8b36c44b50857ce18c7e

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:53 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061 am: ff9c5ad85f am: 31199e5d39 am: 7db07c6af2 am: 3fbc42577f am: 5b29a62dd4

Change-Id: If51c039b28662085c3e14257c1ca0e46c29aeaca

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:48 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061 am: ff9c5ad85f am: 31199e5d39 am: 7db07c6af2 am: 3fbc42577f

Change-Id: Ib2f41678a66afb5b09a4e4beae7baef7e1c7b508

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:44 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061 am: ff9c5ad85f am: 31199e5d39 am: 7db07c6af2

Change-Id: I74e32ac4f04c5729613961aecc900c5f612935e7

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:39 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061 am: ff9c5ad85f am: 31199e5d39

Change-Id: Ia07ed172e6fdaa560add83dc2bb8d2c4f50b3448

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:34 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061 am: ff9c5ad85f

Change-Id: I565376e4dda0297ba53ce7f4418d1b7fc685a600

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:29 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061

Change-Id: I7e3fc6ae23f15b69860965678eaa788e3c75add1

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev
Dongwon Kang [Wed, 16 Aug 2017 00:05:57 +0000 (00:05 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev
am: 47da6c0b7e

Change-Id: Ic636c904d8dd4f7b329e2571f336aabf4f2a0079

7 years agoMerge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:05:20 +0000 (00:05 +0000)]
Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:02:00 +0000 (00:02 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5 am: 460898007c am: 8ebf804e5e

Change-Id: I530b34008bb703e2bf97f1d746dbb45d35616c3a

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Wed, 16 Aug 2017 00:01:55 +0000 (00:01 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5 am: 460898007c

Change-Id: I7a7bc02eb28d856dea9eeea9f398b1458352fb84

7 years agoMerge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into mnc-dr-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 23:59:43 +0000 (23:59 +0000)]
Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into mnc-dr-dev

* changes:
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1
  Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b

7 years agoMerge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 23:59:43 +0000 (23:59 +0000)]
Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev

* changes:
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1
  Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b

7 years agoMerge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into nyc-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 23:59:43 +0000 (23:59 +0000)]
Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into nyc-dev

* changes:
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f am: f97aea42a4 am: d20214e5e8
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f am: f97aea42a4
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1
  Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b

7 years agoMerge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into mnc-dr1.5-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 23:59:43 +0000 (23:59 +0000)]
Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into mnc-dr1.5-dev

* changes:
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f am: f97aea42a4
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1
  Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b

7 years agoMerge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 23:59:08 +0000 (23:59 +0000)]
Merge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dev

* changes:
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15 am: f56750b169 am: 6c09cf96c6 am: a97e485cd1
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15 am: f56750b169 am: 6c09cf96c6
  [automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15 am: f56750b169
  Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev
Dongwon Kang [Tue, 15 Aug 2017 23:59:02 +0000 (23:59 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev
am: 1d98dc05a5

Change-Id: Iebc4d9e483734a233e6cd417481a89278d343f3a

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:28 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f am: f97aea42a4 am: d20214e5e8

Change-Id: I602ea11b16ecb765b66b61b66d7ac374318e0df5

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:21 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f am: f97aea42a4

Change-Id: I5246032a938617b5576eb8600787345645d04065

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:15 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f

Change-Id: Ia4138a070169443d3bbf54c93246e37f11174bfa

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:09 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1

Change-Id: I550412747a6afe16ff7791a8c50a4d7c6e9866e1

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:06 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15 am: f56750b169 am: 6c09cf96c6 am: a97e485cd1

Change-Id: Ib18edeaa8f20b67a743d54cbe9315b3ca222899d

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:00 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15 am: f56750b169 am: 6c09cf96c6

Change-Id: Idb73013dcee5ce9239e52f1168288db9313ae30d

7 years ago[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 23:54:54 +0000 (23:54 +0000)]
[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15 am: f56750b169

Change-Id: Ia46c42bb15d4dd1159fa0ec4409e3db9c54df19c

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev
Dongwon Kang [Tue, 15 Aug 2017 23:54:32 +0000 (23:54 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev
am: 220213623b

Change-Id: I64dc27a3b6982c33ed8bb6f3c6b2801480447faa

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr1.5-dev
Dongwon Kang [Tue, 15 Aug 2017 23:53:39 +0000 (23:53 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr1.5-dev
am: 99e9aa28af

Change-Id: Idba1942f04f1bbd5a32062f6122fe0d8731c653a

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev
Dongwon Kang [Tue, 15 Aug 2017 23:53:34 +0000 (23:53 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev
am: c17b510a15

Change-Id: I07e52bccb5178319f753f243f41a7522d7535eb7

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into cw-e-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into cw-e-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into nyc-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into nyc-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be am: b22b2126a7 am: 94185c1d26
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be am: b22b2126a7
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr1.5-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr1.5-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be am: b22b2126a7
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years agoMerge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

7 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
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

7 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
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

7 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
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

7 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
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

7 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
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

7 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
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

7 years ago[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am...
Lajos Molnar [Tue, 15 Aug 2017 22:21:23 +0000 (22:21 +0000)]
[automerger] Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am: 1ec4196300

Change-Id: I16d35492c1254579794d4398dee28dd556a1703d

7 years agoMerge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD
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

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:36 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be am: b22b2126a7 am: 94185c1d26

Change-Id: Ie832a957bfdfb5b06824a96814ddbaf54a6f1ae2

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:31 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be am: b22b2126a7

Change-Id: I3c714c3a6d809bb4dcfb8f184b9dcef6725b11b8

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:25 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93 am: e408a6f7be

Change-Id: I9d48e3542f6ef811261f29afab91b8f0bcacf090

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:20 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017 am: 62cee3ee93

Change-Id: Id63b9b26263436ac54269878d15897b6d6e4d41f

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:15 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f am: d411bde017

Change-Id: Ic6c8672379bf0e84715d0da49ae4704ac0a2ea02

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:10 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a am: 6d0c3ebd0f

Change-Id: I6a29a7a6f8db29380f6adcc0d4ed6b4c3935c309

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:06:05 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52 am: 0de0b6806a

Change-Id: Idf513ba06641aacf48f457b3a8ae02721404b7c1

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:05:59 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9 am: 33508aff52

Change-Id: Ic12354524144a6d1337be0a7c57efb4711cee660

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb...
Dongwon Kang [Tue, 15 Aug 2017 22:05:53 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9

Change-Id: Ibbbdacd98e6362267e5f7b926a70c133a0a3d9f4

7 years ago[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
Dongwon Kang [Tue, 15 Aug 2017 22:05:47 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am: 4e79910fdb

Change-Id: I12e72631c86a3d1cb5fadb89243c1acacc7c20a7

7 years agoCheck buffer size in useBuffer in software components
Dongwon Kang [Mon, 24 Jul 2017 20:59:51 +0000 (13:59 -0700)]
Check buffer size in useBuffer in software components

Test: No more crash from oob read/write with running poc.
Bug: 63522430
Change-Id: I232d256eacdfaa9347902fe9b42650999f0d2d85

7 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: b4d9e1b413...
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

7 years ago[automerger] stagefright: avoid buffer overflow in base64 decoder am: b4d9e1b413
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

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

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

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

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

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

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

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

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

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

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

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