OSDN Git Service
Andy Hung [Mon, 11 Sep 2017 22:32:15 +0000 (22:32 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b am:
355a18f58d
am:
c8f3cf02eb
Change-Id: I7c984be87df715dbc6fe5ecc44691e001d7ff09f
Andy Hung [Mon, 11 Sep 2017 22:24:48 +0000 (22:24 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b
am:
355a18f58d
Change-Id: I5f3a24175f1aa70fb1f8d62a449685e9103cad18
Andy Hung [Mon, 11 Sep 2017 22:21:26 +0000 (22:21 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2
am:
74f84d987b
Change-Id: Ie2c1acfdc523c6774dd2f90e0b42a9f274731d57
Andy Hung [Mon, 11 Sep 2017 22:17:17 +0000 (22:17 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415
am:
d08327d1a2
Change-Id: Ia8bdb1eae19450a3c6df255945a8cded55b15909
Andy Hung [Mon, 11 Sep 2017 22:15:47 +0000 (22:15 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454
am:
b995c31415
Change-Id: Iff099acd6ee928f37d2b91144a06d9c78a2a5aae
Andy Hung [Mon, 11 Sep 2017 22:13:42 +0000 (22:13 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474
am:
ae465be454
Change-Id: I272012f714615091a24a9d3bf8a0d2d825576bcf
Andy Hung [Mon, 11 Sep 2017 22:12:13 +0000 (22:12 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100
am:
0a8a0c4474
Change-Id: Icf690ebbc582d61f4369ef208aa150e2aa0c38d7
Andy Hung [Mon, 11 Sep 2017 22:10:43 +0000 (22:10 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
am:
e472e51100
Change-Id: I82f359a057762b8b0fac97d137a2fb20083a518b
Andy Hung [Mon, 11 Sep 2017 22:01:44 +0000 (22:01 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
Dongwon Kang [Mon, 11 Sep 2017 17:13:52 +0000 (17:13 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours am:
c66d4db705 -s ours am:
6b936f54ff -s ours
am:
75612faf76 -s ours
Change-Id: Iad00100a6e9b8f79a648c7a35b57d41d7fafdcfb
Dongwon Kang [Mon, 11 Sep 2017 17:10:15 +0000 (17:10 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours am:
c66d4db705 -s ours
am:
6b936f54ff -s ours
Change-Id: I28559dc35dc859153adc69563b529c74f324a5e7
Dongwon Kang [Mon, 11 Sep 2017 17:07:13 +0000 (17:07 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours
am:
c66d4db705 -s ours
Change-Id: Id1e1ec84d35e12a3ae7ee0e991bcf7729a5e4377
Dongwon Kang [Mon, 11 Sep 2017 17:03:14 +0000 (17:03 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours
am:
177ee220b9 -s ours
Change-Id: I674316a0d0ad9ff64efdb3593d5da3b2d8183a28
Dongwon Kang [Mon, 11 Sep 2017 16:59:44 +0000 (16:59 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3
am:
57c83e2226 -s ours
Change-Id: Id48471463e916b66034956540ffcef7341ac9a9b
Dongwon Kang [Mon, 11 Sep 2017 16:56:15 +0000 (16:56 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939
am:
410f48c5e3
Change-Id: I57d9148bfc3ced57c2b12453f68e45d40523034f
Dongwon Kang [Mon, 11 Sep 2017 16:52:42 +0000 (16:52 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0
am:
e77ea73939
Change-Id: Ia635461b9881a8d74d48f55c2bb0ccf50c2a1383
Dongwon Kang [Mon, 11 Sep 2017 16:49:18 +0000 (16:49 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev
am:
659a498ca0
Change-Id: If10318296ec8fbb5448e37e639ca5b031db5a912
Dongwon Kang [Mon, 11 Sep 2017 16:49:15 +0000 (16:49 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf am:
3e2eac8b68
am:
0c799a519f
Change-Id: Ic526f0640f99a7c71eec90bf866479cc7e3b3963
Dongwon Kang [Mon, 11 Sep 2017 16:45:16 +0000 (16:45 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf
am:
3e2eac8b68
Change-Id: Ia127d32339353934323bc776d24a6b15225c3332
Dongwon Kang [Mon, 11 Sep 2017 16:41:41 +0000 (16:41 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3
am:
fbaadabfdf
Change-Id: I740abcbf02ddfcb7d61747396b75fd2dcaf1920d
Dongwon Kang [Mon, 11 Sep 2017 16:41:38 +0000 (16:41 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565 am:
9f7e205a80
am:
9eeb7cb2fd
Change-Id: I63631c29a43fa5b0fad0bd626138328f7e63b50e
Dongwon Kang [Mon, 11 Sep 2017 16:38:18 +0000 (16:38 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev
am:
df11b20fd3
Change-Id: I3410126b00d0ab7436633ebc858d4153b2ba3d7c
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
Dongwon Kang [Mon, 11 Sep 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev
Dongwon Kang [Mon, 11 Sep 2017 16:34:59 +0000 (16:34 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev
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
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
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
Dongwon Kang [Wed, 26 Jul 2017 20:55:59 +0000 (13:55 -0700)]
Track graphic buffer mode in OMXNodeInstance
Test: cts-tradefed run cts -p android.media & YT & Play Movies & Cast
Bug:
62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:36 +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
Change-Id: Iffd510d4e17d68a038c0755bbd42bd51b656e8fa
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Wed, 16 Aug 2017 00:47:25 +0000 (00:47 +0000)]
Merge "Fix 'potential memory leak' compiler warning." into nyc-dev
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.
OSDN Git Service
