OSDN Git Service

android-x86/frameworks-av.git
7 years ago[automerger] Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into...
Lajos Molnar [Tue, 15 Aug 2017 01:14:08 +0000 (01:14 +0000)]
[automerger] Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev am: d82f105ee4 am: da883dcfde am: 0546623542
am: 0285bd5f78

Change-Id: I24f091ec34a5f0e5f1243c3f9f00d2468b59a5d6

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 01:13:24 +0000 (01:13 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851 am: 2a6dfd0c2d am: 8edd82630f am: ba5d60d647 am: 3a56077716
am: 31c92a4340

Change-Id: I28af4c47dc4cf69e2b4718136adbe9c71ade3341

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Lajos Molnar [Tue, 15 Aug 2017 01:12:20 +0000 (01:12 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb am: 4a2da16607 am: e0729dd03e am: afb276edb5 am: 6e024ccf6c
am: 6d9f2aa4a1

Change-Id: I6b3bc83ca7c9950eb80a000ae8da694c7fa256cb

7 years ago[automerger] Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c...
Lajos Molnar [Tue, 15 Aug 2017 01:11:38 +0000 (01:11 +0000)]
[automerger] Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev am: b0a2af2643" into cw-f-dev am: f793a45b64 am: ab880a41ca am: f71fab6644
am: e3756f0d5c

Change-Id: Ifa9402f9c98293799a9511f87c68faa09b585def

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 01:11:02 +0000 (01:11 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4 am: e4aea51b88 am: 53f19a4746 am: 3d1d01e186
am: c8155207b1

Change-Id: I38dda4dafd17aae2280381402d826a2edba1063b

7 years ago[automerger] Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into...
Lajos Molnar [Tue, 15 Aug 2017 01:05:20 +0000 (01:05 +0000)]
[automerger] Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev am: d82f105ee4 am: da883dcfde
am: 0546623542

Change-Id: I3b8da873ee6efad4af0205402d857c9401bf410b

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 01:04:19 +0000 (01:04 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851 am: 2a6dfd0c2d am: 8edd82630f am: ba5d60d647
am: 3a56077716

Change-Id: Ic021b9cb85acda34403f05fdad1c5459f05bf28a

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Lajos Molnar [Tue, 15 Aug 2017 01:03:25 +0000 (01:03 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb am: 4a2da16607 am: e0729dd03e am: afb276edb5
am: 6e024ccf6c

Change-Id: I854ba189fed688a321401ccb2f196bc28aa653b2

7 years ago[automerger] Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c...
Lajos Molnar [Tue, 15 Aug 2017 01:02:45 +0000 (01:02 +0000)]
[automerger] Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev am: b0a2af2643" into cw-f-dev am: f793a45b64 am: ab880a41ca
am: f71fab6644

Change-Id: I75d976c2fbb89c78a304cb65c6d75178a2fdcbe0

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 01:02:02 +0000 (01:02 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4 am: e4aea51b88 am: 53f19a4746
am: 3d1d01e186

Change-Id: I144d2daa6af9d5aa9427b04e29a0d59324a49ace

7 years ago[automerger] Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:58:51 +0000 (00:58 +0000)]
[automerger] Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev am: d82f105ee4 am: da883dcfde

Change-Id: I20fdf3bb07f9064ada7240d41a6c464332cb79ef

7 years agoMerge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev
Lajos Molnar [Tue, 15 Aug 2017 00:58:08 +0000 (00:58 +0000)]
Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev
am: d82f105ee4

Change-Id: Ibdaf2181549e6ee0a3a192e0c0ae527fd6258d91

7 years ago[automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047...
Lajos Molnar [Tue, 15 Aug 2017 00:57:11 +0000 (00:57 +0000)]
[automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev am: af875ddae7 am: 55014a7720 am: 7ba97eca4d am: 471220f118
am: e6e6638220

Change-Id: Ibfd50df89030ac4a934f1e2bfc6f9ef44e5d3efb

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:56:41 +0000 (00:56 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851 am: 2a6dfd0c2d am: 8edd82630f am: ba5d60d647

Change-Id: I113efec511a2c1a9ac9a503cd3c571b18b71b30a

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Lajos Molnar [Tue, 15 Aug 2017 00:55:54 +0000 (00:55 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev am: 195e72300f am: cb0c0252b2 am: 37d89613a2 am: 0bf0da55c1
am: 36b9da4c3a

Change-Id: I6922005c91a0ee9151f5b83519ac782bebf3a365

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 00:55:05 +0000 (00:55 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851 am: 2a6dfd0c2d
am: 8edd82630f

Change-Id: Ie13c411b64260efb27485a694bb50a38b748b0aa

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 00:54:34 +0000 (00:54 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev am: 4afbd35abe am: ecf86f2b98 am: 93a41f6b04
am: a402dcdce8

Change-Id: I23b6b284117e39267742859c170702bf16884a3c

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:53:44 +0000 (00:53 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb am: 4a2da16607 am: e0729dd03e am: afb276edb5

Change-Id: I62a2347a9d7fea6bb905e9fa3c8120ee9f7db8eb

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Lajos Molnar [Tue, 15 Aug 2017 00:52:46 +0000 (00:52 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb am: 4a2da16607
am: e0729dd03e

Change-Id: I65f5a024da29d86188f83d14243fbc6811cc80a3

7 years ago[automerger] Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:51:35 +0000 (00:51 +0000)]
[automerger] Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev am: b0a2af2643" into cw-f-dev am: f793a45b64 am: ab880a41ca

Change-Id: I32f5860580fbb624e1b8dfd2bb97d0c507989e63

7 years agoMerge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1...
Lajos Molnar [Tue, 15 Aug 2017 00:50:42 +0000 (00:50 +0000)]
Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev am: b0a2af2643" into cw-f-dev
am: f793a45b64

Change-Id: Ia362ed72c81e4c7db2c68f2b3647e8bc8a7dd112

7 years ago[automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047...
Lajos Molnar [Tue, 15 Aug 2017 00:49:54 +0000 (00:49 +0000)]
[automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev am: af875ddae7 am: 55014a7720 am: 7ba97eca4d
am: 471220f118

Change-Id: Ic4db8919424ac39a96ab1e78889d914c88e847e9

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:49:18 +0000 (00:49 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4 am: e4aea51b88 am: 53f19a4746

Change-Id: I22d4ffe0a4ff45d71e97fb1ad0755407a5d61c30

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Lajos Molnar [Tue, 15 Aug 2017 00:49:13 +0000 (00:49 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev am: 195e72300f am: cb0c0252b2 am: 37d89613a2
am: 0bf0da55c1

Change-Id: I0b2914c22bf5805d3f14496c91f2f47927833d69

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 00:48:31 +0000 (00:48 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev am: 4afbd35abe am: ecf86f2b98
am: 93a41f6b04

Change-Id: Ie3da08fdc1230a936335a3d10f1c1bde459e7afd

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Lajos Molnar [Tue, 15 Aug 2017 00:48:28 +0000 (00:48 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4
am: e4aea51b88

Change-Id: I0ec5194fe29f2b057acbdd69dd9c361db34258d7

7 years ago[automerger] Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into...
Lajos Molnar [Tue, 15 Aug 2017 00:45:40 +0000 (00:45 +0000)]
[automerger] Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev am: 7508147a56 am: f846ad87ee am: 3f542c92af
am: 10dee37a9c

Change-Id: I1b94020b7a86db57f028f2820c95c0d4949517e5

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Lajos Molnar [Tue, 15 Aug 2017 00:45:04 +0000 (00:45 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev am: 95f27c865f am: ee044bb24a am: 4e9279a3e7
am: 399ca4810b

Change-Id: Ia274e0e3c1b9e9e9ec49490ca3b1d479c08a719c

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:44:31 +0000 (00:44 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd am: 3b8128941a am: 614d9e491a am: 84c88f5e32 am: 732238df95
am: f29c6dec2a

Change-Id: I289c728d8ab86de9d789716b6cdd79b0da89742e

7 years ago[automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:42:57 +0000 (00:42 +0000)]
[automerger] Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev am: af875ddae7 am: 55014a7720 am: 7ba97eca4d

Change-Id: Ic91ec2ea79a03b9d312173d8ad61262b23717d77

7 years agoMerge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1...
Lajos Molnar [Tue, 15 Aug 2017 00:42:07 +0000 (00:42 +0000)]
Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev am: af875ddae7
am: 55014a7720

Change-Id: Ic7431d01b1d0d86a5a32826683dcfc0b9c1f5106

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:41:32 +0000 (00:41 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev am: 391c549642 am: e82fe7a4e7 am: 925dba7faa am: f68a6fab54 am: 3697793b4c
am: e29ed92fc0

Change-Id: Ibf4fcad32aeda1d330dbda00fdaea8a9bc9c791c

7 years ago[automerger] Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into...
Lajos Molnar [Tue, 15 Aug 2017 00:41:03 +0000 (00:41 +0000)]
[automerger] Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev am: 7508147a56 am: f846ad87ee
am: 3f542c92af

Change-Id: I691a0d23a4bba70cafb9987608407b8c69ea9cf6

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:40:52 +0000 (00:40 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev am: 195e72300f am: cb0c0252b2 am: 37d89613a2

Change-Id: Id2a50a540a5f1364ab52cbe6002436eb1fac055a

7 years ago[automerger] Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5...
Lajos Molnar [Tue, 15 Aug 2017 00:40:52 +0000 (00:40 +0000)]
[automerger] Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1-dev am: 6adf95f76b" into cw-f-dev am: ba9116b245 am: cc7439facb am: f6099dd281
am: 691dcd96f1

Change-Id: I54e395bf8ac8e027182cc8bb6ade8d5e6cd126ff

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Lajos Molnar [Tue, 15 Aug 2017 00:40:20 +0000 (00:40 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev am: 95f27c865f am: ee044bb24a
am: 4e9279a3e7

Change-Id: I979089f0c4497871f9b57a7ac318b2c4e201a8c8

7 years agoMerge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev am...
Lajos Molnar [Tue, 15 Aug 2017 00:39:58 +0000 (00:39 +0000)]
Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev am: 195e72300f
am: cb0c0252b2

Change-Id: I56c10ac95fac750396af0d2e60a94639cb90571b

7 years ago[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into...
Lajos Molnar [Tue, 15 Aug 2017 00:39:38 +0000 (00:39 +0000)]
[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-f-dev am: 71b6110bb4 am: 1f03721507 am: 79e916ebe3
am: 4f75f234d1

Change-Id: I6d499d3660b05fed82527f0296440acb3830db46

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:39:33 +0000 (00:39 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd am: 3b8128941a am: 614d9e491a am: 84c88f5e32
am: 732238df95

Change-Id: I978a629acbccd8b5b7ef4e274cc63fee75e357e5

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:38:19 +0000 (00:38 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev am: 4afbd35abe am: ecf86f2b98

Change-Id: Ic4b4f90d018dfa7aa062757adab043de8dea9113

7 years agoMerge "stagefright: update google video codec capabilities" into oc-mr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 00:38:06 +0000 (00:38 +0000)]
Merge "stagefright: update google video codec capabilities" into oc-mr1-dev

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev
Lajos Molnar [Tue, 15 Aug 2017 00:35:20 +0000 (00:35 +0000)]
Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev
am: 4afbd35abe

Change-Id: I3de349f93c854b0cc5d1b41d29acc35ef67ec16f

7 years ago[automerger] Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:33:48 +0000 (00:33 +0000)]
[automerger] Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev am: 7508147a56 am: f846ad87ee

Change-Id: I0a243f7e30d335714a4063c0f38635cd6b1be9dd

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:33:47 +0000 (00:33 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev am: 391c549642 am: e82fe7a4e7 am: 925dba7faa am: f68a6fab54
am: 3697793b4c

Change-Id: I090ce945bf75ff3daa9036f4179ca1a8dfe5eec2

7 years agoMerge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev
Lajos Molnar [Tue, 15 Aug 2017 00:33:12 +0000 (00:33 +0000)]
Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev
am: 7508147a56

Change-Id: I49b254a913f3f8b43ee0de6a67c589e1cf7e7ca2

7 years ago[automerger] Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5...
Lajos Molnar [Tue, 15 Aug 2017 00:33:06 +0000 (00:33 +0000)]
[automerger] Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1-dev am: 6adf95f76b" into cw-f-dev am: ba9116b245 am: cc7439facb
am: f6099dd281

Change-Id: I190c7543c3bd2fa54262b14d1c448b256dd5f2d4

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:31:25 +0000 (00:31 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev am: 95f27c865f am: ee044bb24a

Change-Id: Ib80c7daa3867cbfa8380f95f74cc364498a8a79e

7 years ago[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into...
Lajos Molnar [Tue, 15 Aug 2017 00:31:22 +0000 (00:31 +0000)]
[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-f-dev am: 71b6110bb4 am: 1f03721507
am: 79e916ebe3

Change-Id: I82f5eae33d61c3f927d74dcc0ec4b5fd71a5173f

7 years agoMerge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev
Lajos Molnar [Tue, 15 Aug 2017 00:30:46 +0000 (00:30 +0000)]
Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev
am: 95f27c865f

Change-Id: Ibea82e4167cca75126e3428b5836af9095d65d08

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:29:11 +0000 (00:29 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd am: 3b8128941a am: 614d9e491a am: 84c88f5e32

Change-Id: I98725b8551fd1502d4cdb7a37e937fd424f4cd97

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:28:24 +0000 (00:28 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd am: 3b8128941a
am: 614d9e491a

Change-Id: I6c567b8c5c4a613edd60879d0c84bcd9a07ba53f

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:26:59 +0000 (00:26 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-f-dev am: 5de5d129f3 am: 13e4caee6e am: b4fcee2624
am: 2db5d8757f

Change-Id: I3f6b111c2ffcf1dad3b263c705bc34411e0f4de3

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:26:23 +0000 (00:26 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev am: 391c549642 am: e82fe7a4e7 am: 925dba7faa am: f68a6fab54

Change-Id: Ie9d4e6106ff199b5f063ffa19f28a8e7859f7506

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:25:33 +0000 (00:25 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dr1-dev am: 391c549642 am: e82fe7a4e7
am: 925dba7faa

Change-Id: If0082dd7ab11cfebce12f17bbf8b99b63ddb43f8

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Lajos Molnar [Tue, 15 Aug 2017 00:25:04 +0000 (00:25 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b am: c42e782644 am: 5c9fc68825 am: bc0b041f30 am: 21c75b8f69 am: 93b2a3f4f8 am: 88fd67f2b3 am: fb1443d485 am: 321c8cf574 am: ce3ea21af4 am: 0b6bcc9e4b
am: b893a0f6fe

Change-Id: Idf8990e1750f140aa088311729791f94e25e0440

7 years ago[automerger] Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into...
Lajos Molnar [Tue, 15 Aug 2017 00:24:26 +0000 (00:24 +0000)]
[automerger] Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into cw-f-dev am: bfc21dd3df am: 6ce7e89899 am: 1a90544222
am: 788d02f957

Change-Id: I2c4a9338cf0cde7d22ba0c806b7c2d3c9bd3e123

7 years ago[automerger] Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:24:15 +0000 (00:24 +0000)]
[automerger] Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1-dev am: 6adf95f76b" into cw-f-dev am: ba9116b245 am: cc7439facb

Change-Id: Id72cc20123462fb7d2670a67a9f7945028d9a7b4

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Lajos Molnar [Tue, 15 Aug 2017 00:23:40 +0000 (00:23 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev am: 4773895ad6 am: 346ec93169 am: 6c9ef24bba am: f6dee24b67 am: 5ffbc4d349 am: 1e8caebd71 am: e1eb94f29c am: 5a49cf8da9 am: c9dbfb1005
am: 607f3c2cb9

Change-Id: I516cc917ed6cc0f7e06d561067dc91f3202fd9cc

7 years agoMerge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1...
Lajos Molnar [Tue, 15 Aug 2017 00:22:51 +0000 (00:22 +0000)]
Merge "Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into nyc-mr1-dev am: 6adf95f76b" into cw-f-dev
am: ba9116b245

Change-Id: I55f238dcaf97b01395e1f2372c450daf6219174f

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Lajos Molnar [Tue, 15 Aug 2017 00:22:30 +0000 (00:22 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-f-dev am: 5de5d129f3 am: 13e4caee6e
am: b4fcee2624

Change-Id: I3ec13605777ff623677054b61f621526d0ab6b0a

7 years ago[automerger] Merge changes from topic "am-4f76118405fa44d29be1267bbd7eff82" into...
Lajos Molnar [Tue, 15 Aug 2017 00:22:30 +0000 (00:22 +0000)]
[automerger] Merge changes from topic "am-4f76118405fa44d29be1267bbd7eff82" into cw-f-dev am: d92ca03e95 am: 748de57861 am: ef2d8a269b
am: 255b943620

Change-Id: Ib5deb58a1a6ab1abfe7ab40309c121c96956bb6b

7 years ago[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:21:20 +0000 (00:21 +0000)]
[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-f-dev am: 71b6110bb4 am: 1f03721507

Change-Id: I4d1c08c1038f6bf18a74ae66f4f3e9993275bd8a

7 years agoMerge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-f-dev
Lajos Molnar [Tue, 15 Aug 2017 00:20:23 +0000 (00:20 +0000)]
Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-f-dev
am: 71b6110bb4

Change-Id: Ic06c1bc22d4324b2bb757716eda8f04896f71c6c

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Lajos Molnar [Tue, 15 Aug 2017 00:18:59 +0000 (00:18 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b am: c42e782644 am: 5c9fc68825 am: bc0b041f30 am: 21c75b8f69 am: 93b2a3f4f8 am: 88fd67f2b3 am: fb1443d485 am: 321c8cf574 am: ce3ea21af4
am: 0b6bcc9e4b

Change-Id: I693cc035b4049552930666b88c2fcb595f2e4183

7 years ago[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:18:39 +0000 (00:18 +0000)]
[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-f-dev am: 5de5d129f3 am: 13e4caee6e

Change-Id: Idfef1b816c3c5907c81c8feb80e59e90ce52122a

7 years agoMerge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 00:18:37 +0000 (00:18 +0000)]
Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3 am: db14575a0e am: ee58de33d4 am: 5f6e425f18 am: bee553bbe1
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3 am: db14575a0e am: ee58de33d4 am: 5f6e425f18
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3 am: db14575a0e am: ee58de33d4
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3 am: db14575a0e
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645
  Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Lajos Molnar [Tue, 15 Aug 2017 00:16:55 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-dr1-dev am: 727dec27a0 am: 2eefe2a7e9 am: 2a4d2f3fb3 am: 2d379d5309 am: 455a4f8f52
am: bbeaf2c454

Change-Id: I43057400523d02b20fdef3df73e32b4618a6b762

7 years agoMerge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-f-dev
Lajos Molnar [Tue, 15 Aug 2017 00:16:55 +0000 (00:16 +0000)]
Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-f-dev
am: 5de5d129f3

Change-Id: I5217ec9a81584b59067207ac8e42d46e93657d47

7 years ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:16:48 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev am: 7aa1ca5851 am: 2a6dfd0c2d

Change-Id: I6da3f0335375869d0690e2e83f52ed37083cf35f

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev
Lajos Molnar [Tue, 15 Aug 2017 00:16:11 +0000 (00:16 +0000)]
Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dr1-dev
am: 7aa1ca5851

Change-Id: I5f14de69e62b1053e33e6ab03c11b6dd9b87f27f

7 years ago[automerger] Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into...
Lajos Molnar [Tue, 15 Aug 2017 00:16:03 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into cw-f-dev am: bfc21dd3df am: 6ce7e89899
am: 1a90544222

Change-Id: I1e89fa13eba1afe5b6191715aaf2c2771a63d3f8

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Lajos Molnar [Tue, 15 Aug 2017 00:15:25 +0000 (00:15 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev am: 4773895ad6 am: 346ec93169 am: 6c9ef24bba am: f6dee24b67 am: 5ffbc4d349 am: 1e8caebd71 am: e1eb94f29c am: 5a49cf8da9
am: c9dbfb1005

Change-Id: I785e7cc11c3cbdda404c97727bce7ea6941d1f8e

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:10 +0000 (00:15 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b am: c42e782644 am: 5c9fc68825 am: bc0b041f30 am: 21c75b8f69 am: 93b2a3f4f8 am: 88fd67f2b3 am: fb1443d485 am: 321c8cf574 am: ce3ea21af4

Change-Id: I5081ce0f85d28a83d9bcefe84d34c3a6dc7ffaeb

7 years ago[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:15:05 +0000 (00:15 +0000)]
[automerger] Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev am: 7ba7f0edbb am: 4a2da16607

Change-Id: I3eb7ff1432b8bf2213a76bef6a6f270e28277ddc

7 years agoMerge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:14:54 +0000 (00:14 +0000)]
Merge "Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev am: b0a2af2643" into cw-f-dev

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Lajos Molnar [Tue, 15 Aug 2017 00:14:10 +0000 (00:14 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-mr1-dev am: b3e7954a67 am: 70557a9394 am: f154b60ffb am: 6303f90160
am: 97cc6f812e

Change-Id: I02b59d33626841cae384216830dd0d0875c19581

7 years ago[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:14:01 +0000 (00:14 +0000)]
[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3 am: db14575a0e am: ee58de33d4 am: 5f6e425f18 am: bee553bbe1

Change-Id: Iab5def7f8a325a9548df3c804d7517701d884bcd

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev
Lajos Molnar [Tue, 15 Aug 2017 00:14:01 +0000 (00:14 +0000)]
Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-mr1-dev
am: b0a2af2643

Change-Id: I5396934ca314921521f384df5bf7aa5a5eb6458b

7 years ago[automerger] Merge changes from topic "am-4f76118405fa44d29be1267bbd7eff82" into...
Lajos Molnar [Tue, 15 Aug 2017 00:14:00 +0000 (00:14 +0000)]
[automerger] Merge changes from topic "am-4f76118405fa44d29be1267bbd7eff82" into cw-f-dev am: d92ca03e95 am: 748de57861
am: ef2d8a269b

Change-Id: Ieec82d0bbf824ae985778d7cfebb1e03093cf9da

7 years ago[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp...
Lajos Molnar [Tue, 15 Aug 2017 00:13:59 +0000 (00:13 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b am: c42e782644 am: 5c9fc68825 am: bc0b041f30 am: 21c75b8f69 am: 93b2a3f4f8 am: 88fd67f2b3 am: fb1443d485
am: 321c8cf574

Change-Id: Ia020b6c661317a098bb7fdea910b09568bd7d267

7 years agoMerge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev
Lajos Molnar [Tue, 15 Aug 2017 00:13:59 +0000 (00:13 +0000)]
Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-dr1-dev
am: 7ba7f0edbb

Change-Id: Iacb373edc5d77064b59ac7f91121beba140a43ce

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:55 +0000 (00:13 +0000)]
[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3 am: db14575a0e am: ee58de33d4 am: 5f6e425f18

Change-Id: I1c75f7bf2212c9394c6f5d1cea87dc4500ababf1

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:49 +0000 (00:13 +0000)]
[automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6" into mnc-dev am: a0388f92c7 am: 97a6eb0645 am: 89130ee5c3 am: db14575a0e am: ee58de33d4

Change-Id: I4428bc3b7a981cb2b31c266df7d46f150642bdf4

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 ago[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:13:13 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into nyc-dev am: d047df653e am: c314172f83 am: c6123f05f4

Change-Id: I49b2910c86bc6c42979893c18c81dea7af4bc5ff

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 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 ago[automerger] Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:11:25 +0000 (00:11 +0000)]
[automerger] Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into cw-f-dev am: bfc21dd3df am: 6ce7e89899

Change-Id: Id0e5bd0ae7cdd6630a07ab99cd5d086328abe6a4

7 years agoMerge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1...
Lajos Molnar [Tue, 15 Aug 2017 00:10:40 +0000 (00:10 +0000)]
Merge "Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev am: e9bfcf0dba" into nyc-mr1-dev
am: af875ddae7

Change-Id: I171af9cf282d5213c7ce45cb6e43d1a15906ef52

7 years agoMerge changes from topic "am-b52f5848421245739953acc2ee449dc5" into cw-f-dev
Lajos Molnar [Tue, 15 Aug 2017 00:10:32 +0000 (00:10 +0000)]
Merge changes from topic "am-b52f5848421245739953acc2ee449dc5" into cw-f-dev
am: bfc21dd3df

Change-Id: I8bef60e5095aa1478c00e2caf46692030f344815

7 years agoMerge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev
Lajos Molnar [Tue, 15 Aug 2017 00:10:06 +0000 (00:10 +0000)]
Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into nyc-mr1-dev
am: 195e72300f

Change-Id: Ief81bcc22d14d494ca24ca211d6fed45b0282669

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Lajos Molnar [Tue, 15 Aug 2017 00:09:57 +0000 (00:09 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-f-dev am: 24125176ec am: a797cdf267 am: 80711887ff
am: 5b555deb50

Change-Id: I8591db850800629a31d2cd3d68b58fa1e34bcbf3

7 years ago[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into...
Android Build Merger (Role) [Tue, 15 Aug 2017 00:08:26 +0000 (00:08 +0000)]
[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev am: 4773895ad6 am: 346ec93169 am: 6c9ef24bba am: f6dee24b67 am: 5ffbc4d349 am: 1e8caebd71 am: e1eb94f29c am: 5a49cf8da9

Change-Id: Iaae6ad96ff6fd3d09d661b6ebd428382204d9c45

7 years agoMerge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev
Android Build Merger (Role) [Tue, 15 Aug 2017 00:08:12 +0000 (00:08 +0000)]
Merge changes from topic "am-a1e09f871a1c4089bc1ff3cb0429ce7c" into cw-f-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev am: 0ae144f238 am: a0e49db002 am: df3fb4006f am: 6c616ed1be am: 1bc1d02b95 am: fcb7a1e605
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev am: 0ae144f238 am: a0e49db002 am: df3fb4006f am: 6c616ed1be am: 1bc1d02b95
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev am: 0ae144f238 am: a0e49db002 am: df3fb4006f am: 6c616ed1be
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev am: 0ae144f238 am: a0e49db002 am: df3fb4006f
  [automerger] Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev am: 0ae144f238 am: a0e49db002
  Merge "Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283" into mnc-dr-dev am: 0ae144f238

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