OSDN Git Service
Chong Zhang [Wed, 23 Aug 2017 20:51:17 +0000 (13:51 -0700)]
heif: fix decoding of image size different from full tiled area
Bug:
64077740
Change-Id: I57ee7e1bc05e320be723d224b9328526543cad25
TreeHugger Robot [Mon, 21 Aug 2017 05:29:06 +0000 (05:29 +0000)]
Merge "heif: add new format type" into oc-mr1-dev
TreeHugger Robot [Sat, 19 Aug 2017 03:08:08 +0000 (03:08 +0000)]
Merge "SoftVideoDecoderOMXComponent: max-size can be less than size" into oc-mr1-dev
Michael Lane [Fri, 18 Aug 2017 14:56:44 +0000 (14:56 +0000)]
Merge "stagefright: allow secure audio input buffer" into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 12:12:05 +0000 (12:12 +0000)]
Merge "Fix the calculation of the number of frames" into oc-mr1-dev
Pawin Vongmasa [Wed, 16 Aug 2017 10:47:16 +0000 (03:47 -0700)]
Fix the calculation of the number of frames
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
64730503
Change-Id: Ie858a52cf7267b3783f67ca378a8c5efb726495c
Evgenii Stepanov [Wed, 2 Aug 2017 23:36:56 +0000 (16:36 -0700)]
[cfi] Adjust RLIMIT_AS by CFI shadow size.
CFI (control flow integrity) implementation is using a MAP_NORESERVE
allocation of up to 2GB is size. Only a tiny portion of it is backed
by physical memory. Take this into account when setting RLIMIT_AS for
media services.
Test: no immediate effect; CFI shadow increase for 48-bit aarch64 can
be reapplied w/o breaking android boot.
Bug:
64293803
See https://android-review.googlesource.com/#/c/platform/bionic/+/424903/.
(cherry picked from commit
f1b0523625ed27266bee8fcc64a3867e02b9a187)
Change-Id: I3fe72edcdaf908f42a1ffdfde645e34263564990
Wonsik Kim [Wed, 19 Jul 2017 18:41:23 +0000 (11:41 -0700)]
stagefright: allow secure audio input buffer
Bug:
63343701
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I64cae10d17ec7421ffdc60dd0aa202f6c74f83bf
(cherry picked from commit
f7005138e0d63c79131923ebcab1f9dd9074878b)
Phil Burk [Thu, 17 Aug 2017 15:52:14 +0000 (15:52 +0000)]
Merge "aaudio: prevent memory leak from double configure" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 22:44:09 +0000 (22:44 +0000)]
Merge "soundtrigger: require RECORD_AUDIO permission for DSP hotword" into oc-mr1-dev
Edwin Wong [Wed, 16 Aug 2017 22:22:39 +0000 (22:22 +0000)]
Merge "Support both Clear key plugin UUIDs." into oc-mr1-dev
Dongwon Kang [Wed, 16 Aug 2017 19:44:28 +0000 (19:44 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a am:
924b20fa49 am:
654bf4f8e9
am:
2e183b62fe
Change-Id: I1a47c087e9ac373eeac653310e9918eddaace8ab
Dongwon Kang [Wed, 16 Aug 2017 19:40:28 +0000 (19:40 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a am:
924b20fa49
am:
654bf4f8e9
Change-Id: I18a3052d9fc3c7dd78277ff239e54ca616ceae0f
Dongwon Kang [Wed, 16 Aug 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a
am:
924b20fa49
Change-Id: I2ea0e0a01595908ecc85c06d3cdd5ff82cd03346
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
Lajos Molnar [Wed, 16 Aug 2017 18:40:53 +0000 (18:40 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724 am:
9c65df568a
am:
69d44851ee
Change-Id: I5ef010226fcf5784e9979a754d1fe996c3425d7e
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
Lajos Molnar [Wed, 16 Aug 2017 18:37:22 +0000 (18:37 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724
am:
9c65df568a
Change-Id: I26f78990d18738d800397531b9bbef810c7d125d
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:31:42 +0000 (18:31 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724
Change-Id: Ic000a7d1436b22416496a57a337827be4fe62523
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
Dongwon Kang [Wed, 16 Aug 2017 18:14:29 +0000 (18:14 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev am:
7286ecc232 am:
7cc3a167fa
am:
687011c382
Change-Id: Id9fae283a2d4e4e3f7ae1f95a007a77ab869ba87
Dongwon Kang [Wed, 16 Aug 2017 18:13:47 +0000 (18:13 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev am:
6df241a03e
am:
f0a734dbf0
Change-Id: I9b3600dcdd71169fd7d095f423b70cbdc57d2864
Dongwon Kang [Wed, 16 Aug 2017 18:11:52 +0000 (18:11 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev am:
7286ecc232
am:
7cc3a167fa
Change-Id: Ie8def259a635c2b080541f5402731ba1f02e88e7
Dongwon Kang [Wed, 16 Aug 2017 18:09:00 +0000 (18:09 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev
am:
7286ecc232
Change-Id: Ib53b5fb2056d318d79ffa52aafd1f50d3d9c5123
Dongwon Kang [Wed, 16 Aug 2017 18:08:24 +0000 (18:08 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev
am:
6df241a03e
Change-Id: I86c0ecb695b09c77e06af66afee1ebc48a9453e7
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
TreeHugger Robot [Wed, 16 Aug 2017 17:52:07 +0000 (17:52 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
00209af1ec
Check buffer size in useBuffer in software components
Phil Burk [Mon, 14 Aug 2017 19:38:58 +0000 (12:38 -0700)]
aaudio: prevent memory leak from double configure
Prevent AudioEndpoint from being configure()d twice.
Check return value of AudioEndpoint.configure().
Prevent AudioStreamInternal from being open()ed twice.
Bug:
64522125
Test: adb shell dumpsys media.audio_flinger --unreachable
Change-Id: I3ae07af5610fd1f9e539f884923f781eefcd645f
Lajos Molnar [Thu, 10 Aug 2017 14:04:14 +0000 (07:04 -0700)]
SoftVideoDecoderOMXComponent: max-size can be less than size
A component can be configured for size that is greater than the
max size. In such case, configure for the larger of these.
Bug:
37101765
Change-Id: I9bf3cd38e34cbedc00c54862d6782f2841ae2ee8
Eric Laurent [Wed, 16 Aug 2017 01:17:26 +0000 (18:17 -0700)]
soundtrigger: require RECORD_AUDIO permission for DSP hotword
Check android.permission.RECORD_AUDIO permission in addition to
android.permission.CAPTURE_AUDIO_HOTWORD for DSP hotword operations
as those require access to device microphone.
Bug:
62265680
Test: check "OK Google" detection with and without DSP
Change-Id: Icba2520331164bcd618e91916ca701e677d419b8
Dongwon Kang [Wed, 16 Aug 2017 02:22:52 +0000 (02:22 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
3ca83cf1b3 am:
6a53272e6f
am:
7709475e7a
Change-Id: I85a0eea9c430164faff23b342821bd04037d4f2a
Dongwon Kang [Wed, 16 Aug 2017 02:20:20 +0000 (02:20 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
3ca83cf1b3
am:
6a53272e6f
Change-Id: I2daeea1b47b32953fb4ea3f4860bff6819df42ec
Android Build Merger (Role) [Wed, 16 Aug 2017 02:12:58 +0000 (02:12 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
3ca83cf1b3
Change-Id: If5b9d8616aa3b783109dff6ee30c537ce849edd4
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
Android Build Merger (Role) [Wed, 16 Aug 2017 01:51:37 +0000 (01:51 +0000)]
Merge "[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am:
a810630df2 am:
00824c3dfb am:
10ef0c6b11 am:
3078294720 am:
af0f766ea4 am:
62548c00e8 am:
bfb16d1394" into oc-mr1-dev
Caroline Tice [Wed, 16 Aug 2017 01:51:11 +0000 (01:51 +0000)]
[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am:
a810630df2 am:
00824c3dfb am:
10ef0c6b11 am:
3078294720 am:
af0f766ea4 am:
62548c00e8
am:
bfb16d1394
Change-Id: Ic5b026e5761755334919e4ecb700fbb781ff5495
Lajos Molnar [Wed, 16 Aug 2017 01:50:07 +0000 (01:50 +0000)]
[automerger] Merge changes from topic "am-
1e7935a2-3929-4000-bb19-
9e0ff0e29216" into nyc-dr1-dev am:
d55784db36 am:
7492e9c6aa am:
e8cad97bb0 am:
b33be95d6f am:
e08d21ef28
am:
2d58e26b74
Change-Id: I6f12cd4190c60ca8cb7c4619094502590f72a77d
Lajos Molnar [Wed, 16 Aug 2017 01:48:58 +0000 (01:48 +0000)]
[automerger] Merge changes from topic "am-
1e7935a2-3929-4000-bb19-
9e0ff0e29216" into cw-f-dev am:
ae2d8ccc79 am:
02cf7d9038 am:
dc41d373b4
am:
608b18dfc6
Change-Id: I34405c0b7c10cabac7565ff077266a1fce3942d3
Caroline Tice [Wed, 16 Aug 2017 01:48:04 +0000 (01:48 +0000)]
[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am:
a810630df2 am:
00824c3dfb am:
10ef0c6b11 am:
3078294720 am:
af0f766ea4
am:
62548c00e8
Change-Id: Id8b7a37a8dd15e59266dbe91b0d376b338465863
Lajos Molnar [Wed, 16 Aug 2017 01:46:45 +0000 (01:46 +0000)]
[automerger] Merge changes from topic "am-
1e7935a2-3929-4000-bb19-
9e0ff0e29216" into nyc-dr1-dev am:
d55784db36 am:
7492e9c6aa am:
e8cad97bb0 am:
b33be95d6f
am:
e08d21ef28
Change-Id: I2aac8879189211cadb164e2d6c1b421ac59c5b3e
Lajos Molnar [Wed, 16 Aug 2017 01:45:48 +0000 (01:45 +0000)]
[automerger] Merge changes from topic "am-
1e7935a2-3929-4000-bb19-
9e0ff0e29216" into cw-f-dev am:
ae2d8ccc79 am:
02cf7d9038
am:
dc41d373b4
Change-Id: I65b8cf42fdf3623cb3c732bfef78196aff246a44
Dongwon Kang [Wed, 16 Aug 2017 01:45:18 +0000 (01: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 am:
050b66447c am:
7aa6ebe3e2
am:
8174a131ac
Change-Id: I328b37e5e5fb332f1ea1aec35b322b313302d826
Android Build Merger (Role) [Wed, 16 Aug 2017 01:45:15 +0000 (01:45 +0000)]
[automerger] Merge "Fix 'potential memory leak' compiler warning." into nyc-dev am:
a810630df2 am:
00824c3dfb am:
10ef0c6b11 am:
3078294720 am:
af0f766ea4
Change-Id: Ida8052785bffff2bf0796637e66ee896403665e5
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
Android Build Merger (Role) [Wed, 16 Aug 2017 01:42:59 +0000 (01:42 +0000)]
[automerger] Merge changes from topic "am-
1e7935a2-3929-4000-bb19-
9e0ff0e29216" into nyc-dr1-dev am:
d55784db36 am:
7492e9c6aa am:
e8cad97bb0 am:
b33be95d6f
Change-Id: I46b3a1889e181856affbc432fe66bbf699533ab9
Dongwon Kang [Wed, 16 Aug 2017 01:42:34 +0000 (01:42 +0000)]
[automerger] Merge "Merge "Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dr-dev am:
1d98dc05a5" into cw-e-dev am:
62c597c745" into mnc-dr1.5-dev am:
97b3e39844" into nyc-dev am:
75a8372309 am:
86ebfcb7c4 am:
659570f8ef am:
050b66447c
am:
7aa6ebe3e2
Change-Id: I4fccda99a002e7f705d23a2197437887b9233378
Dongwon Kang [Wed, 16 Aug 2017 01:42:34 +0000 (01:42 +0000)]
[automerger] Merge "Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-dev am:
fa5fbd299e" into nyc-dr1-dev am:
bf0b6a90d3 am:
e6b394e558 am:
dd553a39a2 am:
8408963f51 am:
02aa77b1e6
am:
8dbed118e7
Change-Id: I7e4b89725c565211dc7791a36cd555e014d7b494
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
Dongwon Kang [Wed, 16 Aug 2017 01:41:39 +0000 (01:41 +0000)]
[automerger] Merge "Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am:
f1a596eb57" into cw-f-dev am:
64f7720a22 am:
def0f4df7d am:
51121612b9
am:
3521b8099f
Change-Id: If66dbf78adfa2ddc3937c8761166ff4fc890cf0d
Android Build Merger (Role) [Wed, 16 Aug 2017 01:40:33 +0000 (01:40 +0000)]
[automerger] Merge changes from topic "am-
1e7935a2-3929-4000-bb19-
9e0ff0e29216" into cw-f-dev am:
ae2d8ccc79 am:
02cf7d9038
Change-Id: I092d936030ca2b7607a705a6d6f04c5d7313c90b
Dongwon Kang [Wed, 16 Aug 2017 01:40:32 +0000 (01:40 +0000)]
[automerger] Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-dev am:
fa5fbd299e am:
06933f70bd am:
0157c3bc3c am:
4e7f895f5d am:
44039db28f am:
bb30fb542c
am:
344c54c499
Change-Id: I8b866de37c9000b9bdfea2beeea1eb64b0c7de1d
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:39:22 +0000 (01:39 +0000)]
[automerger] Merge "Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-dev am:
fa5fbd299e" into nyc-dr1-dev am:
bf0b6a90d3 am:
e6b394e558 am:
dd553a39a2 am:
8408963f51
am:
02aa77b1e6
Change-Id: I73e43c34e0ae43ac924bfe73c01add5ead26509a
Dongwon Kang [Wed, 16 Aug 2017 01:39:10 +0000 (01: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 am:
5ff968b1ca am:
1235159945 am:
7d6245096b
am:
85e844b15f
Change-Id: Ia262f9bd4bb7390dcc55ffb146d0d0d7224d8163
Android Build Merger (Role) [Wed, 16 Aug 2017 01:38:06 +0000 (01:38 +0000)]
[automerger] Merge "Merge "Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dr-dev am:
1d98dc05a5" into cw-e-dev am:
62c597c745" into mnc-dr1.5-dev am:
97b3e39844" into nyc-dev am:
75a8372309 am:
86ebfcb7c4 am:
659570f8ef am:
050b66447c
Change-Id: I025bc2474bd0adeeffa5f900c579228bf19fe999
Dongwon Kang [Wed, 16 Aug 2017 01:38:04 +0000 (01:38 +0000)]
[automerger] Merge "Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am:
f1a596eb57" into cw-f-dev am:
64f7720a22 am:
def0f4df7d
am:
51121612b9
Change-Id: I26fb1e674077ff78030acaf909ee48cd93f38a92
Dongwon Kang [Wed, 16 Aug 2017 01:37:44 +0000 (01:37 +0000)]
[automerger] Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into cw-f-dev am:
9338cdaf46 am:
374e415b7f am:
18a851e9c9
am:
43dc82e949
Change-Id: Ib5d68f90c645ad990a2f24156742f1051bd82b9b
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
Android Build Merger (Role) [Wed, 16 Aug 2017 01:35:26 +0000 (01:35 +0000)]
[automerger] Merge "Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-dev am:
fa5fbd299e" into nyc-dr1-dev am:
bf0b6a90d3 am:
e6b394e558 am:
dd553a39a2 am:
8408963f51
Change-Id: Ie51ed33de1653a9c6c359217cec685e34230b871
Dongwon Kang [Wed, 16 Aug 2017 01:34:52 +0000 (01:34 +0000)]
[automerger] Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-dev am:
fa5fbd299e am:
06933f70bd am:
0157c3bc3c am:
4e7f895f5d am:
44039db28f
am:
bb30fb542c
Change-Id: I6610b204c9229a8e5863c027c476c5a3846522ad
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:33:51 +0000 (01:33 +0000)]
[automerger] Merge "Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dr-dev am:
1d98dc05a5" into cw-e-dev am:
62c597c745" into mnc-dr1.5-dev am:
97b3e39844 am:
a49b21ad39 am:
2f1346c362 am:
b8257aad9e am:
5ff968b1ca am:
1235159945
am:
7d6245096b
Change-Id: I140c385ab3365343dc429fa015cd579fdb303478
Android Build Merger (Role) [Wed, 16 Aug 2017 01:32:50 +0000 (01:32 +0000)]
[automerger] Merge "Merge changes from topic "am-
8df6e69344e440f09140f067e6b62c52" into nyc-mr1-dev am:
f1a596eb57" into cw-f-dev am:
64f7720a22 am:
def0f4df7d
Change-Id: I39486f3b1a9f728887ada6d5c3bb6cafdc33d12d
OSDN Git Service
