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

(root) / android-x86 / frameworks-av.git / log

Dongwon Kang [Mon, 11 Sep 2017 16:38:08 +0000 (16:38 +0000)]

Block allocateBufferWithBackup in secure native handle mode am: 528c7dd7c2 am: 9b14c30565
am: 9f7e205a80

Change-Id: Ifa7f56a0f34b5cf9068f804b5a97beb018ee4aec

commit | commitdiff | tree

Dongwon Kang [Mon, 11 Sep 2017 16:34:39 +0000 (16:34 +0000)]

Block allocateBufferWithBackup in secure native handle mode am: 528c7dd7c2
am: 9b14c30565

Change-Id: Iad77f455e6f20065af28e2482457f396d0aa1631

commit | commitdiff | tree

Dongwon Kang [Mon, 11 Sep 2017 16:31:37 +0000 (16:31 +0000)]

Block allocateBufferWithBackup in secure native handle mode
am: 528c7dd7c2

Change-Id: Id35842dd006cb7fa8607793c85a91eb534f577d1

commit | commitdiff | tree

Dongwon Kang [Tue, 15 Aug 2017 18:47:21 +0000 (11:47 -0700)]

Block allocateBufferWithBackup in secure native handle mode

Bug: 63522818
Test: CtsMediaTestCases & YT & Play Movies & Cast
Change-Id: I2be2748ecabf49d7842a90676e68978bf0c56b71

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

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

Change-Id: Idd819bf765bf0da09c1995f99072822b8127ccc8

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 19:00:51 +0000 (19:00 +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

Change-Id: I6c6f140b5d164ce5e7e0fa7206016e0ce80a8396

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

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

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

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

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

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

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

commit | commitdiff | tree

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

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

Change-Id: I028e4c8aa34459f769af75dfe1f652ae228ea3a7

commit | commitdiff | tree

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

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

Change-Id: I690884d7fc4654fd2902dabe85c070dc224b88a5

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

Merge "Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e" into nyc-dr1-dev

commit | commitdiff | tree

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

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

Change-Id: I340ea45d56759ddacc4081d856a163a80d2ae9f9

commit | commitdiff | tree

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

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

Change-Id: I2a7f963e308022fc2d29093bdff2eb1f0990312f

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:41:39 +0000 (00:41 +0000)]

Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev
am: f1a596eb57

Change-Id: Ia8661e514136f8d7710a4155770510cfd23ad74c

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:41:10 +0000 (00:41 +0000)]

Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev
am: fa5fbd299e

Change-Id: I69ecb56beb12c40de5e3ad61bd86af49ea86ef5c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:39:39 +0000 (00:39 +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

Change-Id: If3fd763bfa5d84d01311891bb1b4f9627ad35717

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:39:34 +0000 (00:39 +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

Change-Id: I2f902bbaff1558c251ab973c1bc9c34da589385a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:39:27 +0000 (00:39 +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

Change-Id: Ib66e1729935cce09416e941e2d3de3e2be8f1996

commit | commitdiff | tree

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

Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36
  Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc

commit | commitdiff | tree

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

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

* changes:
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba am: 55514fd4de am: e2ffec65b6
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba am: 55514fd4de
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36
  Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc

commit | commitdiff | tree

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

Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba am: 55514fd4de
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36
  Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc

commit | commitdiff | tree

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

Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dr1-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36
  Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc

commit | commitdiff | tree

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

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

Change-Id: I90a99c15e5836ddfe260abffd7e9a40e65d3d484

commit | commitdiff | tree

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

[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba am: 55514fd4de am: e2ffec65b6

Change-Id: Ifbdd1a33c6b017ca7c11856179d09d5766e98a01

commit | commitdiff | tree

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

[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba am: 55514fd4de

Change-Id: I92c484c5b0d85609ffa6f4ec2521e08198ecfa45

commit | commitdiff | tree

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

[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4 am: 7a003500ba

Change-Id: Ia848afef145d60672b10a1b4f757a2c1a3adc725

commit | commitdiff | tree

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

[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4

Change-Id: Ib49df47342712904a0a10cd75ff6632d5045dea0

commit | commitdiff | tree

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

[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe

Change-Id: Ic3defa97462ec88f9de9a152ea1a6bd0cb6e952c

commit | commitdiff | tree

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

[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374

Change-Id: I4932faaf02058d0c9a1ca26355fd69586443c734

commit | commitdiff | tree

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

[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36

Change-Id: I0201484dc7447147690dbf4e0c429f515e20b6ff

commit | commitdiff | tree

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

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

Change-Id: I0eb7f491686f78a4cec6cfe624d4febeecc6a3f3

commit | commitdiff | tree

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

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

Change-Id: I3d70e03c7afcd4ef9a5d9fd74c10b06bd187d9aa

commit | commitdiff | tree

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

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

Change-Id: Ie527f041c16fcd99964bff6b3febeae8d3970d51

commit | commitdiff | tree

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

Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev
am: 7321b13ddc

Change-Id: If2e53431ccd1bf4bc0bb720bf916b731a35fdaaf

commit | commitdiff | tree

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

Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev
am: 6e4c870d0a

Change-Id: Ia8180d576ddfc171aafef7b3b0cc9ecf0aa3b7fd

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:26:58 +0000 (00: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

Change-Id: Ic78084a046fe6fef7371f873714cb63aeceeb08c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:26:47 +0000 (00: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

Change-Id: I43f05cea32a7ff7ea01be0e06f1e41c49f506b19

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 16 Aug 2017 00:26:42 +0000 (00: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

Change-Id: I39f90bfc7cfce41670dabe1be0a75a386a9735e5

commit | commitdiff | tree

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

Merge "Merge changes from topic "am-a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am: 624243ea5c" into mnc-dr1.5-dev
am: f2ad6db91e

Change-Id: Ie6b393bfec4eb9cdf41d194b1aba662e5af38ec5

commit | commitdiff | tree

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

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

Change-Id: Ic99a855892c7d2fe6367e2bafa7d87f1ccccf1d7

commit | commitdiff | tree

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

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

Change-Id: Ic48b2a40ed04bb6403021c378fb3daccad73e9c3

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:23:35 +0000 (00:23 +0000)]

Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev
am: 3815133611

Change-Id: I666c25a5396ebe2ed71832afe035f4b75b258c10

commit | commitdiff | tree

Dongwon Kang [Wed, 16 Aug 2017 00:23:05 +0000 (00:23 +0000)]

Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-mr1-dev
am: a555aca817

Change-Id: I38e3ca68898b250c83088281f7676740e1dacffe

commit | commitdiff | tree

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

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

Change-Id: I4a63beee773cfc34699294447dfede4633b058da

commit | commitdiff | tree

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

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

Change-Id: Ie1e84362315d77d598561cb9583f95d185e6a017

commit | commitdiff | tree

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

Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-dev
am: ce05315be8

Change-Id: I90cc16f5bd89cf5c9f5da3b71e30e6b25fe59db4

commit | commitdiff | tree

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

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

Change-Id: Id2b1f3144aa294f9de1e9ceb21eb2694fc7e5d87

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev

* changes:
[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745 am: 69ab1e7d95
Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745

commit | commitdiff | tree

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

Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-mr1-dev

* changes:
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745 am: 69ab1e7d95 am: 5e3e3410e9 am: 5b22b43642
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745 am: 69ab1e7d95 am: 5e3e3410e9
  [automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745 am: 69ab1e7d95
  Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5" into cw-e-dev am: 62c597c745

frameworks/av

RSS Atom

About OSDN

Find Software

Develop Software

Help