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

Dongwon Kang [Wed, 16 Aug 2017 18:11:52 +0000 (18:11 +0000)]

Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev am: 7286ecc232
am: 7cc3a167fa

Change-Id: Ie8def259a635c2b080541f5402731ba1f02e88e7

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 18:09:00 +0000 (18:09 +0000)]

Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev
am: 7286ecc232

Change-Id: Ib53b5fb2056d318d79ffa52aafd1f50d3d9c5123

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 18:08:24 +0000 (18:08 +0000)]

Merge changes from topic "am-793ae1d1-008c-4cc0-9717-ce9555544b26" into oc-dev
am: 6df241a03e

Change-Id: I86c0ecb695b09c77e06af66afee1ebc48a9453e7

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Aug 2017 17:52:07 +0000 (17:52 +0000)]

Merge changes from topic "am-793ae1d1-008c-4cc0-9717-ce9555544b26" into oc-dev

* changes:
[automerger] Check buffer size in useBuffer in software components am: 00209af1ec
Check buffer size in useBuffer in software components

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Aug 2017 17:52:07 +0000 (17:52 +0000)]

Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 02:20:20 +0000 (02:20 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3
am: 6a53272e6f

Change-Id: I2daeea1b47b32953fb4ea3f4860bff6819df42ec

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 02:12:58 +0000 (02:12 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 3ca83cf1b3

Change-Id: If5b9d8616aa3b783109dff6ee30c537ce849edd4

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 02:11:46 +0000 (02:11 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 350f941d70
am: 6cdeb3b0d0

Change-Id: I8abfa884ae221f47e8e206ad8fd0f51b28b2b304

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:59:11 +0000 (01:59 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1 am: 350f941d70

Change-Id: I680b406b826b4ad7db534e8fe12b994aced6654d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:59:07 +0000 (01:59 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f am: 886a1ef47a

Change-Id: I236cb6d5c2b3fc9b43159ac08b0018d048287d50

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:59:01 +0000 (01:59 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0 am: a59539409f

Change-Id: Icf3c5f2a24169d2fb62774b1f82bfa61ce6a4959

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:55 +0000 (01:58 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6 am: e8dd7338f0

Change-Id: I3d08f7d93bf04a5435e9360cd26dd1fd3b442dc3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:51 +0000 (01:58 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d am: 4ee00072f6

Change-Id: Ic6af6c07fdcf25e7ac862da9658b045860beca6a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:46 +0000 (01:58 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8 am: 69e7eac88d

Change-Id: I2ab1da7b98c9dce50fca6113eee2d656d2c402de

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:41 +0000 (01:58 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af am: 34b2a8b522 am: d98bd836b8

Change-Id: Iad6852ae0dc6d2297469a0a388ab593de6209188

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:36 +0000 (01:58 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:30 +0000 (01:58 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb am: 480084e6af

Change-Id: I33f6fdffdaa35fbd524c61a30348b90680ab9dae

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:23 +0000 (01:58 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb

Change-Id: Ifce752f0511ce8fc5d16f79f682063109b8bee37

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:18 +0000 (01:58 +0000)]

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c

Change-Id: Ib1416049d9793045e08182d61c22cad65383ffd5

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:57:43 +0000 (01:57 +0000)]

Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev
am: 15f75d0422

Change-Id: Id14d38f22f91c68682acdb3572c07a6e57780b03

commit | commitdiff | tree

Caroline Tice [Wed, 16 Aug 2017 01:48:04 +0000 (01:48 +0000)]

[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11 am: 3078294720 am: af0f766ea4
am: 62548c00e8

Change-Id: Id8b7a37a8dd15e59266dbe91b0d376b338465863

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 01:46:45 +0000 (01:46 +0000)]

[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev am: d55784db36 am: 7492e9c6aa am: e8cad97bb0 am: b33be95d6f
am: e08d21ef28

Change-Id: I2aac8879189211cadb164e2d6c1b421ac59c5b3e

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 01:45:48 +0000 (01:45 +0000)]

[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev am: ae2d8ccc79 am: 02cf7d9038
am: dc41d373b4

Change-Id: I65b8cf42fdf3623cb3c732bfef78196aff246a44

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:45:15 +0000 (01:45 +0000)]

[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11 am: 3078294720 am: af0f766ea4

Change-Id: Ida8052785bffff2bf0796637e66ee896403665e5

commit | commitdiff | tree

Caroline Tice [Wed, 16 Aug 2017 01:44:24 +0000 (01:44 +0000)]

[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11
am: 3078294720

Change-Id: I493f6ce73fa41751212e2ee8ec06c7b0b73ac011

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:42:59 +0000 (01:42 +0000)]

[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev am: d55784db36 am: 7492e9c6aa am: e8cad97bb0 am: b33be95d6f

Change-Id: I46b3a1889e181856affbc432fe66bbf699533ab9

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:42:34 +0000 (01:42 +0000)]

[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4 am: 659570f8ef am: 050b66447c
am: 7aa6ebe3e2

Change-Id: I4fccda99a002e7f705d23a2197437887b9233378

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 01:42:02 +0000 (01:42 +0000)]

[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev am: d55784db36 am: 7492e9c6aa
am: e8cad97bb0

Change-Id: I923d37353752987e444ace506494305592d597d0

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:40:33 +0000 (01:40 +0000)]

[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev am: ae2d8ccc79 am: 02cf7d9038

Change-Id: I092d936030ca2b7607a705a6d6f04c5d7313c90b

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 01:39:40 +0000 (01:39 +0000)]

Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev
am: ae2d8ccc79

Change-Id: I476327926fbfc9cd8496198357698b5fafa684af

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:39:22 +0000 (01:39 +0000)]

[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev am: bf0b6a90d3 am: e6b394e558 am: dd553a39a2 am: 8408963f51
am: 02aa77b1e6

Change-Id: I73e43c34e0ae43ac924bfe73c01add5ead26509a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:38:06 +0000 (01:38 +0000)]

[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4 am: 659570f8ef am: 050b66447c

Change-Id: I025bc2474bd0adeeffa5f900c579228bf19fe999

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:38:04 +0000 (01:38 +0000)]

[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am: f1a596eb57" into cw-f-dev am: 64f7720a22 am: def0f4df7d
am: 51121612b9

Change-Id: I26fb1e674077ff78030acaf909ee48cd93f38a92

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:36:59 +0000 (01:36 +0000)]

[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4 am: 659570f8ef
am: 28129f7618

Change-Id: Ic2f6e04cc738991f9dadf783854dfa2061a59114

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:35:26 +0000 (01:35 +0000)]

[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev am: bf0b6a90d3 am: e6b394e558 am: dd553a39a2 am: 8408963f51

Change-Id: Ie51ed33de1653a9c6c359217cec685e34230b871

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:34:52 +0000 (01:34 +0000)]

[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e am: 06933f70bd am: 0157c3bc3c am: 4e7f895f5d am: 44039db28f
am: bb30fb542c

Change-Id: I6610b204c9229a8e5863c027c476c5a3846522ad

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:34:36 +0000 (01:34 +0000)]

[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev am: bf0b6a90d3 am: e6b394e558
am: dd553a39a2

Change-Id: Ic391a349adc514174c4dc258e737cfe29ed64c02

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:33:51 +0000 (01:33 +0000)]

[automerger] Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844 am: a49b21ad39 am: 2f1346c362 am: b8257aad9e am: 5ff968b1ca am: 1235159945
am: 7d6245096b

Change-Id: I140c385ab3365343dc429fa015cd579fdb303478

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:32:50 +0000 (01:32 +0000)]

[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am: f1a596eb57" into cw-f-dev am: 64f7720a22 am: def0f4df7d

Change-Id: I39486f3b1a9f728887ada6d5c3bb6cafdc33d12d

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:32:44 +0000 (01:32 +0000)]

[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into cw-f-dev am: 9338cdaf46 am: 374e415b7f
am: 18a851e9c9

Change-Id: If7ce65daf64c71e26ca867d967aebf839fd51d48

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:32:14 +0000 (01:32 +0000)]

Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am: f1a596eb57" into cw-f-dev
am: 64f7720a22

Change-Id: I57848da3351c68b421f1a41b447625903d7be718

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:30:30 +0000 (01:30 +0000)]

[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e am: 06933f70bd am: 0157c3bc3c am: 4e7f895f5d am: 44039db28f

Change-Id: I335110b215bc31362adfd0de6728b4b7de12ed79

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:29:39 +0000 (01:29 +0000)]

[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e am: 06933f70bd am: 0157c3bc3c
am: 4e7f895f5d

Change-Id: I5afb96bb8ce6be263ad7352c510338d3db0ac023

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:27:52 +0000 (01:27 +0000)]

[automerger] Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844 am: a49b21ad39 am: 2f1346c362 am: b8257aad9e am: 5ff968b1ca am: 1235159945

Change-Id: I8d6d0d9c5746d5e5fd74976ba440ccd7e6199711

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:27:37 +0000 (01:27 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev am: 6e4c870d0a am: 105295f24b am: b8b727d04a am: 2ca5d02c11 am: 06efbf2c98 am: e010d848da
am: bdeb664822

Change-Id: I9ae25c9f23a7ec15a02daf59d886fd0e8057240a

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:26:37 +0000 (01:26 +0000)]

[automerger] Merge "Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c" into mnc-dr1.5-dev am: f2ad6db91e am: 7b9c0079b7 am: e6de027b05 am: 45ac425f45 am: 604fdb025c am: 48161562d1
am: d6058293f4

Change-Id: I252f0adfefdf02ac497c7739effc5249dae0f265

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:26:32 +0000 (01:26 +0000)]

[automerger] Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844 am: a49b21ad39 am: 2f1346c362 am: b8257aad9e
am: 5ff968b1ca

Change-Id: I6c7511c9d38d9d20fa6842fd5adf25b2de06d72d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:25:05 +0000 (01:25 +0000)]

[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into cw-f-dev am: 9338cdaf46 am: 374e415b7f

Change-Id: I88bd99abb8e0b1a87b8644064364260e475ba44a

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:24:12 +0000 (01:24 +0000)]

[automerger] Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev am: 3815133611 am: 633566e2b7 am: c527ced637 am: 1285f5bda9 am: 633546196e
am: 5ab2631934

Change-Id: I267fd7f711bdb662007290d79908752497df53c3

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:24:10 +0000 (01:24 +0000)]

Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into cw-f-dev
am: 9338cdaf46

Change-Id: Ie2e14db691972b46d821b41bf56360486d2198b9

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:22:36 +0000 (01:22 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev am: 6e4c870d0a am: 105295f24b am: b8b727d04a am: 2ca5d02c11 am: 06efbf2c98 am: e010d848da

Change-Id: I80f1de86d01087d40dfaa0bc37edc619aac043f8

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:21:36 +0000 (01:21 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev am: 6e4c870d0a am: 105295f24b am: b8b727d04a am: 2ca5d02c11
am: 06efbf2c98

Change-Id: I7e4be3b21f30847b29fbd1ff66504c353fc795e0

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:20:10 +0000 (01:20 +0000)]

[automerger] Merge "Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c" into mnc-dr1.5-dev am: f2ad6db91e am: 7b9c0079b7 am: e6de027b05 am: 45ac425f45 am: 604fdb025c am: 48161562d1

Change-Id: I5a52321f7f60c48fbecc18ccb87159fcfdbe4c14

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:20:07 +0000 (01:20 +0000)]

[automerger] Merge "Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-mr1-dev am: a555aca817" into cw-f-dev am: 99353fca89 am: 0f06d5c027
am: 1c08d18a03

Change-Id: Ifaab66163f5248d978d3dc01fba1135b3e5f5de9

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:19:36 +0000 (01:19 +0000)]

[automerger] Merge "Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c" into mnc-dr1.5-dev am: f2ad6db91e am: 7b9c0079b7 am: e6de027b05 am: 45ac425f45
am: 604fdb025c

Change-Id: I5ecba31e2d71c36cbcd85301e9114c304ad15729

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:19:12 +0000 (01:19 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-dev am: ce05315be8 am: 7f1c11536e am: fdf2401dd4 am: 4b92f492d8 am: 79b8a2fe62
am: f33bd3c105

Change-Id: Id629c54b6ce8f987d5671a543c1efdc3e4673369

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:18:06 +0000 (01:18 +0000)]

[automerger] Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev am: 3815133611 am: 633566e2b7 am: c527ced637 am: 1285f5bda9 am: 633546196e

Change-Id: I06a20ebe66fac21b44382b99c5cf56f316c40a2d

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:17:17 +0000 (01:17 +0000)]

[automerger] Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev am: 3815133611 am: 633566e2b7 am: c527ced637
am: 1285f5bda9

Change-Id: I50f1aaef9f31cd7172c2aa209d30462803dad336

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:15:42 +0000 (01:15 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-mr1-dev am: 541979d825 am: 38e3c9319a am: 18bf1ab9a8
am: e3a623e1dd

Change-Id: Ibbec8e0e648d2d34c2e3e7d03236aeafb915029f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:15:36 +0000 (01:15 +0000)]

[automerger] Merge "Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-mr1-dev am: a555aca817" into cw-f-dev am: 99353fca89 am: 0f06d5c027

Change-Id: Id0a0bfedd4612d98b0d0a4570ccafdd3917527cb

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:14:41 +0000 (01:14 +0000)]

Merge "Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-mr1-dev am: a555aca817" into cw-f-dev
am: 99353fca89

Change-Id: I7800943bda2a44cf9457c777f41f9dbddedd1f12

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:13:09 +0000 (01:13 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-dev am: ce05315be8 am: 7f1c11536e am: fdf2401dd4 am: 4b92f492d8 am: 79b8a2fe62

Change-Id: I4e64393422612aef8f6ea90d39cdcb89d3e2d905

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:13:07 +0000 (01:13 +0000)]

[automerger] Merge "Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into nyc-mr1-dev am: 0e95544f48" into cw-f-dev am: b65f641cd8 am: 93b543ccf8
am: ffb512183f

Change-Id: I202bfa537fe76287ca87a694862242393b7db1b0

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:12:09 +0000 (01:12 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-dev am: ce05315be8 am: 7f1c11536e am: fdf2401dd4
am: 4b92f492d8

Change-Id: I4ace6e884b914f208f404541f8a3c48df9fc15a9

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:10:40 +0000 (01:10 +0000)]

[automerger] Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into cw-f-dev am: 3257b0e389 am: fa23a89c9d
am: 6f0bfdb0e1

Change-Id: I958b5374f618d6d71f7c47e8d849bf4e87cf53bf

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:10:18 +0000 (01:10 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-mr1-dev am: 541979d825 am: 38e3c9319a am: 18bf1ab9a8

Change-Id: Ic4f19d849e6efdf5b5ef469924861a8404d65a72

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:09:16 +0000 (01:09 +0000)]

Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-mr1-dev am: 541979d825
am: 38e3c9319a

Change-Id: Ic4d48c3ad03d90d7a367ee414a4430e9cb113ba0

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:07:44 +0000 (01:07 +0000)]

[automerger] Merge "Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into nyc-mr1-dev am: 0e95544f48" into cw-f-dev am: b65f641cd8 am: 93b543ccf8

Change-Id: I926deb5a39fce5010af3cbc1194cd2a7e035a476

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:06:26 +0000 (01:06 +0000)]

Merge "Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into nyc-mr1-dev am: 0e95544f48" into cw-f-dev
am: b65f641cd8

Change-Id: I1026aeb2813165a2c8b125fc998bb12115965d74

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:05:57 +0000 (01:05 +0000)]

[automerger] Merge "Merge changes from topic "am-0109ecc3f5a04e2ab62168a4e0c7aae9" into nyc-mr1-dev am: c9b11ddb12" into cw-f-dev am: be37eb8cda am: 6c1a38259a
am: 152e6a468b

Change-Id: I5444220b157c4dfc3878e6df7988799db031d233

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:05:12 +0000 (01:05 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into cw-f-dev am: 1c94827951 am: d63266e059
am: 2771c532cb

Change-Id: I82eb09872443534ba9d92bf3500ca0ed57db2501

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:05:06 +0000 (01:05 +0000)]

[automerger] Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into cw-f-dev am: 3257b0e389 am: fa23a89c9d

Change-Id: Ic253df0dd785bdd42ca6c6e56d48b95d9e3f0929

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:04:14 +0000 (01:04 +0000)]

Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into cw-f-dev
am: 3257b0e389

Change-Id: I87aef8a0906dce8e36d7bcb2b8bc4e90600976a0

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 01:02:21 +0000 (01:02 +0000)]

[automerger] Merge "Merge changes from topic "am-0109ecc3f5a04e2ab62168a4e0c7aae9" into nyc-mr1-dev am: c9b11ddb12" into cw-f-dev am: be37eb8cda am: 6c1a38259a

Change-Id: Ida95469bf2131d25f271da999d2b48cdedbdae28

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 01:01:07 +0000 (01:01 +0000)]

Merge "Merge changes from topic "am-0109ecc3f5a04e2ab62168a4e0c7aae9" into nyc-mr1-dev am: c9b11ddb12" into cw-f-dev
am: be37eb8cda

Change-Id: I2ba62197756ba46a5afc19df8e0edf2e7c577d50

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:59:14 +0000 (00:59 +0000)]

[automerger] Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into cw-f-dev am: da78323431 am: d225aa4777
am: 65235e2126

Change-Id: I89e5b6df9e9dd96b3f353d3ca13359e17ede5c00

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:58:59 +0000 (00:58 +0000)]

[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into cw-f-dev am: 1c94827951 am: d63266e059

Change-Id: I4d3291b5b21e1b21de24054704b8e4c71bc9107f

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:58:13 +0000 (00:58 +0000)]

Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into cw-f-dev
am: 1c94827951

Change-Id: I63706aae3f33adbf2585332f7006889dcf7f0435

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:58:12 +0000 (00:58 +0000)]

[automerger] Merge changes from topic "am-0109ecc3f5a04e2ab62168a4e0c7aae9" into cw-f-dev am: 22a4d6b6a1 am: d3fdce1bea
am: 7728e5a808

Change-Id: I2ae21b99390b7dd977d39339bec70376e6f5deb2

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:54:57 +0000 (00:54 +0000)]

[automerger] Merge "Merge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dev am: 82e4ecfee6" into nyc-dr1-dev am: e983853337 am: 1ec14dc55f am: 68aed18dab am: 03c8643a55
am: 6dcf44acef

Change-Id: Iaac87aa2ab3381e4ce8729af7f38baedda88d261

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:54:20 +0000 (00:54 +0000)]

[automerger] Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into cw-f-dev am: da78323431 am: d225aa4777

Change-Id: I02813eca027176c44a56b333b6f424c606ceb4a0

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:54:09 +0000 (00:54 +0000)]

[automerger] Merge changes from topic "am-600ed715d1804320b3820567267cf9ff" into cw-f-dev am: e180f7e22a am: 76f724b275
am: 801fcca914

Change-Id: I35c2cbd5fe98bbf2fef7a8ab3af4b200103b7825

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:53:26 +0000 (00:53 +0000)]

Merge changes from topic "am-fea5623ffa3c4402ab1f8a9c615e35bb" into cw-f-dev
am: da78323431

Change-Id: I16ec9afc44fc7dc66720c28af71c94e56fb8b3c8

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:53:22 +0000 (00:53 +0000)]

[automerger] Merge changes from topic "am-9095d0ba6346461d9302974fa253390e" into cw-f-dev am: 091dd46623 am: e2ccf6f675
am: 63dd26103d

Change-Id: I24351ba111269a5400f1f16c0576832537fb7e8e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:53:06 +0000 (00:53 +0000)]

[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb am: 10ef0c6b11

Change-Id: If1e4758c3c25dcc5f86ecabc850581f223dfb2ff

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:53:01 +0000 (00:53 +0000)]

[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am: a810630df2 am: 00824c3dfb

Change-Id: Ia2f5c6628952af53831071099fa13641d6bd2db7

commit | commitdiff | tree

Caroline Tice [Wed, 16 Aug 2017 00:51:38 +0000 (00:51 +0000)]

Merge "Fix 'potential memory leak' compiler warning." into nyc-dev
am: a810630df2

Change-Id: I8ff7ee6622f807c6feb988a122d6b5a8c3eefbfb

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:51:03 +0000 (00:51 +0000)]

[automerger] Merge changes from topic "am-0109ecc3f5a04e2ab62168a4e0c7aae9" into cw-f-dev am: 22a4d6b6a1 am: d3fdce1bea

Change-Id: Icbc10c7aa36502fcd263493830bcbc84ac62990e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:49:45 +0000 (00:49 +0000)]

[automerger] Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev am: d55784db36 am: 7492e9c6aa

Change-Id: Ibd3f536fc5b9d523b04d94e46bed84390a368cb1

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:49:13 +0000 (00:49 +0000)]

Merge changes from topic "am-0109ecc3f5a04e2ab62168a4e0c7aae9" into cw-f-dev
am: 22a4d6b6a1

Change-Id: I924ee65f787f67ee7a579d2b244028840d2c8910

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 00:48:51 +0000 (00:48 +0000)]

Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev
am: d55784db36

Change-Id: I2fd44e45b88f16eafe1c52cf73b94823df3655cc

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:47:41 +0000 (00:47 +0000)]

[automerger] Merge "Merge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dev am: 82e4ecfee6" into nyc-dr1-dev am: e983853337 am: 1ec14dc55f am: 68aed18dab am: 03c8643a55

Change-Id: I1173279c62feca68269309132c1b5a245a610d82

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Aug 2017 00:47:25 +0000 (00:47 +0000)]

Merge "Fix 'potential memory leak' compiler warning." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Aug 2017 00:47:25 +0000 (00:47 +0000)]

Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev

* changes:
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52 am: 2298edf58a am: 56b9616eb4
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52 am: 2298edf58a
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52
  Fix 'potential memory leak' compiler warning.

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Aug 2017 00:47:25 +0000 (00:47 +0000)]

Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-dr1-dev

* changes:
[automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52
Fix 'potential memory leak' compiler warning.

commit | commitdiff | tree

TreeHugger Robot [Wed, 16 Aug 2017 00:47:25 +0000 (00:47 +0000)]

Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into nyc-mr1-dev

* changes:
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52 am: 2298edf58a
  [automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52
  Fix 'potential memory leak' compiler warning.

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:45:58 +0000 (00:45 +0000)]

[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4 am: 659570f8ef

Change-Id: I4173c6fc6f72a576716cbeef08ba40d2f428086a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:45:53 +0000 (00:45 +0000)]

[automerger] Merge "Merge "Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745" into mnc-dr1.5-dev am: 97b3e39844" into nyc-dev am: 75a8372309 am: 86ebfcb7c4

Change-Id: I56b246744f1d7554d82f173b6636a229f0799993

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:45:44 +0000 (00:45 +0000)]

[automerger] Merge "Merge changes from topic "am-4cce2137e87344a1983525827ec480bb" into nyc-dev am: 82e4ecfee6" into nyc-dr1-dev am: e983853337 am: 1ec14dc55f
am: 68aed18dab

Change-Id: Ieec27a55230306b6c63ed190b0c13ae7d4e32d5a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:44:47 +0000 (00:44 +0000)]

[automerger] Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev am: bf0b6a90d3 am: e6b394e558

Change-Id: I8bdc7e27a2a48cc873be5c12cc5f008101c3afba