OSDN Git Service
Marco Nelissen [Tue, 10 Oct 2017 22:21:58 +0000 (22:21 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b
am:
efcbb62657 -s ours
Change-Id: I418cd498a25c0a1670ab1ba52c5e85ced779c3e0
Eric Laurent [Tue, 10 Oct 2017 21:21:31 +0000 (21:21 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
Marco Nelissen [Tue, 10 Oct 2017 21:14:35 +0000 (21:14 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2
am:
0ada8e950b
Change-Id: I0a88ce1fa0a73966d2c1a61e1ff70d0f30d711ae
Marco Nelissen [Tue, 10 Oct 2017 21:09:54 +0000 (21:09 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c
am:
c3f16a62a2
Change-Id: Ie546935111a19ca0ff157e8bffb95dffd7ed8a46
Marco Nelissen [Tue, 10 Oct 2017 21:01:59 +0000 (21:01 +0000)]
Don't CHECK if the source can't be started
am:
711f83fa6c
Change-Id: Ib21b34c2c9707cfeb9a20a31417c84c9af8a585e
TreeHugger Robot [Tue, 10 Oct 2017 20:56:11 +0000 (20:56 +0000)]
Merge changes from topic "
b23270724" into nyc-dev
* changes:
Handle idle->loaded state transition when loaded->idle is still in progress
IMediaExtractor: ensure users to check returned value by getTrack.
Don't CHECK if the source can't be started
Fix issues with extractor dumpsys
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Julien Desprez [Tue, 26 Sep 2017 17:02:21 +0000 (17:02 +0000)]
Revert "Make stagefright command available for STS tests."
Bug:
66943976
This reverts commit
e286ff463b46ca987562adc9b24d49f1ee191b92.
Change-Id: I9704307962d86e82baf0215b60fadeaa1cc470df
Andres Celis [Wed, 20 Sep 2017 20:24:48 +0000 (13:24 -0700)]
Make stagefright command available for STS tests.
Bug:
65246490
Change-Id: If34d5e625181bd81bc112b1c9b519b2c0891740b
Marco Nelissen [Thu, 1 Sep 2016 22:11:57 +0000 (15:11 -0700)]
Handle idle->loaded state transition when loaded->idle is still in progress
Bug:
31156921
Bug:
23270724
Change-Id: I926cab482fadecb8bb885d85e0d083a4501596fd
Wei Jia [Fri, 28 Apr 2017 17:20:07 +0000 (10:20 -0700)]
IMediaExtractor: ensure users to check returned value by getTrack.
Test: fix the crash from the stream in the bug.
Bug:
37777357
Bug:
23270724
Change-Id: Ia99907c396a2074a9419db9b8103a9325b290169
Marco Nelissen [Thu, 1 Sep 2016 20:12:24 +0000 (13:12 -0700)]
Don't CHECK if the source can't be started
Bug:
19779574
Bug:
31156921
Bug:
23270724
Change-Id: I770619949ed211dab301ee3da10069d319279715
Marco Nelissen [Mon, 19 Dec 2016 22:06:30 +0000 (14:06 -0800)]
Fix issues with extractor dumpsys
Tracks and descriptions were added to their respective lists in
opposite order, so dumpsys could mix up the format and active
state for a given track. Also fix potential NULL pointer dereference.
Bug:
33179012
Bug:
23270724
Change-Id: I700d535da0e72f5641bf9257a34fdb5d5d068b12
Marco Nelissen [Thu, 1 Sep 2016 20:12:24 +0000 (13:12 -0700)]
Don't CHECK if the source can't be started
Bug:
19779574
Bug:
31156921
Change-Id: I770619949ed211dab301ee3da10069d319279715
Wonsik Kim [Wed, 13 Sep 2017 20:20:48 +0000 (20:20 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da am:
18b22afe7a am:
e42227983a
am:
f669386ff9
Change-Id: I15571eb5c05ea0bbf77ec5a746c989d84f38ccee
Wonsik Kim [Wed, 13 Sep 2017 20:14:48 +0000 (20:14 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da am:
18b22afe7a
am:
e42227983a
Change-Id: I9613239a8e331d3a1811ca35bba3baf3ab819abe
Wonsik Kim [Wed, 13 Sep 2017 20:11:29 +0000 (20:11 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am:
7fad4bb2da
am:
18b22afe7a
Change-Id: Ib5d83c4bca072150c4a85905895088de4bdb8bf0
Wonsik Kim [Wed, 13 Sep 2017 20:08:20 +0000 (20:08 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev
am:
7fad4bb2da
Change-Id: I9d7c50eab930c2d6a3aadf9bc0685d6ccf870cb0
Wonsik Kim [Wed, 13 Sep 2017 16:41:29 +0000 (16:41 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev
Marco Nelissen [Wed, 13 Sep 2017 05:01:24 +0000 (05:01 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
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
Hangyu Kuang [Fri, 19 Aug 2016 20:49:43 +0000 (13:49 -0700)]
media: Fix a typo in parsing nclc atom.
Bug:
30974361
bug:
64836941
Change-Id: I12a75ed30d3259d863e744fae3ccff79d8a95f39
(cherry picked from commit
51a0ff56f49faf1a19281f6d786fe18bf84794c6)
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: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
Santhosh Behara [Sat, 10 Oct 2015 00:32:58 +0000 (17:32 -0700)]
nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer
MediaCodec could send out message of output buffer available right before
it hits an error and clears its buffers.
Test: compiles
Author: Shalaj Jain <shalajj@codeaurora.org>
Bug:
36075131
Change-Id: Ife308f3b8dc0448bcd1112b13cc0805bf7dedd7d
(cherry picked from commit
55f70d17df468db2b6691cbd7285a461e812eee4)
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: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
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
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
TreeHugger Robot [Wed, 16 Aug 2017 00:47:25 +0000 (00:47 +0000)]
Merge "Fix 'potential memory leak' compiler warning." into nyc-dev
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
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
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
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
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
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
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
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
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
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
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
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
Android Build Merger (Role) [Wed, 16 Aug 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde" into lmp-mr1-app-dev
Android Build Merger (Role) [Wed, 16 Aug 2017 00:17:19 +0000 (00:17 +0000)]
Merge changes from topic "am-
128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev
* changes:
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8 am:
275b2d63cd
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde
Android Build Merger (Role) [Wed, 16 Aug 2017 00:17:19 +0000 (00:17 +0000)]
Merge changes from topic "am-
128361686df44cf9941f696c8a613f42" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8 am:
275b2d63cd am:
3ab082ef33
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8 am:
275b2d63cd
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde
Android Build Merger (Role) [Wed, 16 Aug 2017 00:16:01 +0000 (00:16 +0000)]
[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
Change-Id: I253e5c811ab35a63b4816171c7330c12f20d1845
Dongwon Kang [Wed, 16 Aug 2017 00:15:21 +0000 (00:15 +0000)]
Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dr-dev am:
1d98dc05a5" into cw-e-dev
am:
62c597c745
Change-Id: I4e748d074ef47ed1fcdc24a45ee3f960772b768a
Android Build Merger (Role) [Wed, 16 Aug 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Merge changes from topic "am-
a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am:
624243ea5c" into mnc-dr1.5-dev
Android Build Merger (Role) [Wed, 16 Aug 2017 00:14:14 +0000 (00:14 +0000)]
Merge changes from topic "am-
fea5623ffa3c4402ab1f8a9c615e35bb" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am:
624243ea5c am:
cb42932a3b
Merge changes from topic "am-
a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am:
624243ea5c
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:22 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8 am:
275b2d63cd am:
3ab082ef33
Change-Id: I9a0d67642b407be9b2c89810a40d4cef6973eb3c
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:17 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8 am:
275b2d63cd
Change-Id: I3c40f98952e44516ad2e4e94d3616e991af51979
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:13 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc am:
53c10d4ac8
Change-Id: Iedaffcb0dc47f38b9b8ee84ea670ceb5f3d6700f
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:08 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc
Change-Id: Ib01cacc36ddeeb6c999601ff74e717992745d40d
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:03 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e
Change-Id: Id2a32097ac7af664a6fdb3e6e69ccdb6df38e8b4
Dongwon Kang [Wed, 16 Aug 2017 00:12:17 +0000 (00:12 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev
am:
4c01d8afde
Change-Id: I8c11f8cac81a8c9de0df8506f3bb3fa339422bb6
Android Build Merger (Role) [Wed, 16 Aug 2017 00:11:49 +0000 (00:11 +0000)]
[automerger] Merge changes from topic "am-
a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev am:
624243ea5c am:
cb42932a3b
Change-Id: I91e9226845765da1deaabe2416ee14ea88926836
Dongwon Kang [Wed, 16 Aug 2017 00:10:51 +0000 (00:10 +0000)]
Merge changes from topic "am-
a8e8440a183d4fe18cbe2acc2bff719b" into cw-e-dev
am:
624243ea5c
Change-Id: Idb56d443f62726e0f14669530cb7632cedd94a3d
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:59 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39 am:
7db07c6af2 am:
3fbc42577f am:
5b29a62dd4 am:
588b07d6c1
Change-Id: Ia988f026dd46101606df8b36c44b50857ce18c7e
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:53 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39 am:
7db07c6af2 am:
3fbc42577f am:
5b29a62dd4
Change-Id: If51c039b28662085c3e14257c1ca0e46c29aeaca
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:48 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39 am:
7db07c6af2 am:
3fbc42577f
Change-Id: Ib2f41678a66afb5b09a4e4beae7baef7e1c7b508
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:44 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39 am:
7db07c6af2
Change-Id: I74e32ac4f04c5729613961aecc900c5f612935e7
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:39 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39
Change-Id: Ia07ed172e6fdaa560add83dc2bb8d2c4f50b3448
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:34 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f
Change-Id: I565376e4dda0297ba53ce7f4418d1b7fc685a600
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:29 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061
Change-Id: I7e3fc6ae23f15b69860965678eaa788e3c75add1