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

Dongwon Kang [Mon, 11 Sep 2017 16:49:15 +0000 (16:49 +0000)]

Track graphic buffer mode in OMXNodeInstance
am: f630233ee4

Change-Id: I3e1810c85e4a153f97ff0e4b2168c21e4e00a4b1

Dongwon Kang [Wed, 26 Jul 2017 20:55:59 +0000 (13:55 -0700)]

Track graphic buffer mode in OMXNodeInstance

Test: CtsMediaTestCases & YT & Play Movies & Cast
Bug: 62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:40:28 +0000 (19:40 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570 am: c0fc9412f8 am: 68f3d037b4 am: 3775c0c2ce am: 29ac52e4e8 am: d1c36259d8 am: 9c9386918a am: 924b20fa49
am: 654bf4f8e9

Change-Id: I18a3052d9fc3c7dd78277ff239e54ca616ceae0f

commit | commitdiff | tree

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

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570 am: c0fc9412f8 am: 68f3d037b4 am: 3775c0c2ce am: 29ac52e4e8 am: d1c36259d8 am: 9c9386918a
am: 924b20fa49

Change-Id: I2ea0e0a01595908ecc85c06d3cdd5ff82cd03346

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:33:25 +0000 (19:33 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570 am: c0fc9412f8 am: 68f3d037b4 am: 3775c0c2ce am: 29ac52e4e8 am: d1c36259d8
am: 9c9386918a

Change-Id: I71801ac3e19e71f6f93800754bd07752af976292

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:28:56 +0000 (19:28 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570 am: c0fc9412f8 am: 68f3d037b4 am: 3775c0c2ce am: 29ac52e4e8
am: d1c36259d8

Change-Id: Ia8c09dfc98c5970b5ee8f67873e0ffd2035c9418

commit | commitdiff | tree

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

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570 am: c0fc9412f8 am: 68f3d037b4 am: 3775c0c2ce
am: 29ac52e4e8

Change-Id: I3bea1b6ec413cb65b49b5318c64ce0979453db5f

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:14:53 +0000 (19:14 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570 am: c0fc9412f8 am: 68f3d037b4
am: 3775c0c2ce

Change-Id: I9a2a3028bc8d2623d269fc6ac4dec1611361d9f5

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:11:23 +0000 (19:11 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570 am: c0fc9412f8
am: 68f3d037b4

Change-Id: Ife2921f9fe3c14f13b7a13377b8f54249979f939

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:08:23 +0000 (19:08 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d am: 49903e4e0d am: 395c7417a7 am: b7d875f570
am: c0fc9412f8

Change-Id: I4decd70a4b16e0afc8b2177d955280107c5f01aa

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:04:23 +0000 (19:04 +0000)]

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:00:51 +0000 (19:00 +0000)]

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 18:57:53 +0000 (18:57 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e am: 5b89f4af6d
am: 49903e4e0d

Change-Id: I4896ddcb270fe1c07e2f70e70eea99946e5c2ac1

commit | commitdiff | tree

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

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169 am: 0d7d0ab16e
am: 5b89f4af6d

Change-Id: Iaf9973226c72e46e7bf976e7917c102e737516b2

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 18:48:54 +0000 (18:48 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f am: f84e9b9169
am: 0d7d0ab16e

Change-Id: If958b023d571cabf9b180daaa6f7049e148cbe35

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 18:43:50 +0000 (18:43 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c am: 5dfd2b5d9f
am: f84e9b9169

Change-Id: Ic4b40082b3a42c470e4cea5d7efb19c32ba47030

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 18:40:50 +0000 (18:40 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev am: c65287a08c
am: 5dfd2b5d9f

Change-Id: I353d7057154a79d1ef44614450e75d123885be27

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 18:37:22 +0000 (18:37 +0000)]

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c am: 91144 am: 79220ea724
am: 9c65df568a

Change-Id: I26f78990d18738d800397531b9bbef810c7d125d

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 18:32:19 +0000 (18:32 +0000)]

Merge "Check buffer size in useBuffer in software components" into klp-dev
am: c65287a08c

Change-Id: I4b97f1df29bc3a2be401542be525c85880987b9b

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c am: 91144 am: 79220ea724

Change-Id: Ic000a7d1436b22416496a57a337827be4fe62523

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 18:30:23 +0000 (18:30 +0000)]

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c am: 91144 am: 0868c86c78
am: 61a0addea2

Change-Id: I8b86ade94fa2ed09063f67565916aebf506c3817

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c am: 91144 am: 0868c86c78

Change-Id: I0d3d98b5431db0a3bda7e1f3e9bdd41ef655227b

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c am: 91144 am: 1fdf6d7aed

Change-Id: Idc9e6f02e5577c6ef504cb6ccf892cff71d04049

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c am: 91144e452f

Change-Id: I88bdd26f00c3a85b19eb5708d946a3d280191eac

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c

Change-Id: Ib61e6205a19fd587ed006245d490b1a83b95adcf

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee

Change-Id: Ifb3a880e644220deb0049317f56bb6946fbad256

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704

Change-Id: Id8f2a4db1283fdd1fac8376c4e52566347ab6fa9

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb

Change-Id: I9e8e351a90cebbe87a755fc9ddcd5d06d7b37add

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82

Change-Id: I3042941f91290fdca070bcaa5cd00de36deb5d16

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae

Change-Id: I3bed8696d76f4d08d059fd74e5e85b3d361a4c77

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0

Change-Id: Iba67f3a765f9398b8ce0c2b90aa13be1a9669ba7

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0 am: f6ae88fdec

Change-Id: I8523a6a7220d1b6022965cd7df1b736b06aeee02

commit | commitdiff | tree

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

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3 -s ours am: c1e3b0cda0

Change-Id: I203f15b2b318b43ef01ab2e741a2cec7a5a55e5c

commit | commitdiff | tree

Lajos Molnar [Wed, 16 Aug 2017 18:19:15 +0000 (18:19 +0000)]

Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev
am: 9e41bec8d3 -s ours

Change-Id: I8e3a43273b89ae97ccba0715d99e9dc5286821ef

commit | commitdiff | tree

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 "Check buffer size in useBuffer in software components" into nyc-mr2-dev

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

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