OSDN Git Service
Dianne Hackborn [Fri, 10 Feb 2012 02:10:48 +0000 (18:10 -0800)]
am
d10035d5: Merge "Some hardening of isolated processes by restricting access to services."
* commit '
d10035d52bcd4eed9f83cad580d606cd522dd6c7':
Some hardening of isolated processes by restricting access to services.
Dianne Hackborn [Fri, 10 Feb 2012 02:08:38 +0000 (18:08 -0800)]
Merge "Some hardening of isolated processes by restricting access to services."
Dianne Hackborn [Fri, 10 Feb 2012 00:12:18 +0000 (16:12 -0800)]
Some hardening of isolated processes by restricting access to services.
Services now must explicitly opt in to being accessed by isolated
processes. Currently only the activity manager and surface flinger
allow this. Activity manager is needed so that we can actually
bring up the process; SurfaceFlinger is needed to be able to get the
display information for creating the Configuration. The SurfaceFlinger
should be safe because the app doesn't have access to the window
manager so can't actually get a surface to do anything with.
The activity manager now protects most of its entry points against
isolated processes.
Change-Id: I0dad8cb2c873575c4c7659c3c2a7eda8e98f46b0
Fabrice Di Meglio [Fri, 10 Feb 2012 01:36:41 +0000 (17:36 -0800)]
am
8bb8dc9b: Merge "Update BiDiTests app"
* commit '
8bb8dc9b5f67d6c82d18da4ea46053ea80b75c84':
Update BiDiTests app
Fabrice Di Meglio [Fri, 10 Feb 2012 01:35:21 +0000 (17:35 -0800)]
Merge "Update BiDiTests app"
Scott Main [Fri, 10 Feb 2012 00:08:36 +0000 (16:08 -0800)]
Scott Main [Fri, 10 Feb 2012 00:06:31 +0000 (16:06 -0800)]
Scott Main [Fri, 10 Feb 2012 00:04:15 +0000 (16:04 -0800)]
am
db7da7ee: am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
db7da7ee40231225861f4d39ea2f256bbca06f24':
docs: fix xss issue bug
5125642
Scott Main [Fri, 10 Feb 2012 00:01:51 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
James Dong [Thu, 9 Feb 2012 23:24:32 +0000 (15:24 -0800)]
am
4f0106cc: Merge "Finish up B frame support in MPEG4Writer"
* commit '
4f0106cca0c40cd506367c894436f91c4920a5e1':
Finish up B frame support in MPEG4Writer
James Dong [Thu, 9 Feb 2012 23:22:58 +0000 (15:22 -0800)]
Merge "Finish up B frame support in MPEG4Writer"
Jason Sams [Thu, 9 Feb 2012 23:19:10 +0000 (15:19 -0800)]
am
468a9715: Merge "Remove unused param."
* commit '
468a971512f4665b13e83cc3c7dc24c9031b14eb':
Remove unused param.
Jason Sams [Thu, 9 Feb 2012 23:17:27 +0000 (15:17 -0800)]
Merge "Remove unused param."
Andreas Huber [Thu, 9 Feb 2012 22:54:58 +0000 (14:54 -0800)]
am
8f0f10a8: Merge "Experiment with seeking to closest frame instead of closest syncframe"
* commit '
8f0f10a80a89b2071b949f13ac6ff23514366d23':
Experiment with seeking to closest frame instead of closest syncframe
Andreas Huber [Thu, 9 Feb 2012 22:52:58 +0000 (14:52 -0800)]
Merge "Experiment with seeking to closest frame instead of closest syncframe"
Joe Fernandez [Thu, 9 Feb 2012 21:53:42 +0000 (13:53 -0800)]
am
f4aaf1f5: am
4f21e3a0: am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
f4aaf1f56247289838f4bb25ee704196464be4f2':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:51:00 +0000 (13:51 -0800)]
am
4f21e3a0: am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
4f21e3a08adefbb5e109e2f844386ed844c1c436':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:48:46 +0000 (13:48 -0800)]
am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:46:41 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
Scott Main [Thu, 9 Feb 2012 20:55:36 +0000 (12:55 -0800)]
am
e7eeace5: am
ec12ae99: am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
e7eeace594861365b4b5de08eee2cb4c0abf06b2':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:53:12 +0000 (12:53 -0800)]
am
ec12ae99: am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
ec12ae9933e463181338834387caa7c58b330635':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:50:18 +0000 (12:50 -0800)]
am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:08 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Eric Fischer [Thu, 9 Feb 2012 19:38:54 +0000 (11:38 -0800)]
am
48e1b91b: Merge "Import translations. DO NOT MERGE"
* commit '
48e1b91b36a47b39c2317a9fd595799dcf92b844':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 19:37:18 +0000 (11:37 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:28:38 +0000 (11:28 -0800)]
am
c725a370: Merge "Import translations. DO NOT MERGE"
* commit '
c725a3705ba8646e134091981e84da99fe4076b1':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 19:26:02 +0000 (11:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Thu, 9 Feb 2012 19:22:17 +0000 (11:22 -0800)]
am
7ff3144a: Merge "Add new feature for running services in "isolated" sandbox processes."
* commit '
7ff3144aa6a4c5e6f0f64933ce174b424cfbfd6e':
Add new feature for running services in "isolated" sandbox processes.
Dianne Hackborn [Thu, 9 Feb 2012 19:20:07 +0000 (11:20 -0800)]
Merge "Add new feature for running services in "isolated" sandbox processes."
Jamie Gennis [Thu, 9 Feb 2012 19:09:30 +0000 (11:09 -0800)]
am
1c90e73f: Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
* commit '
1c90e73f5d22c3d8e07b236ec8f33a42c01e056f':
Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue.
Jamie Gennis [Thu, 9 Feb 2012 19:08:02 +0000 (11:08 -0800)]
Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
Steve Block [Thu, 9 Feb 2012 11:29:24 +0000 (03:29 -0800)]
am
0777d2df: Merge "Clarify comments for WebSettings."
* commit '
0777d2df89e4c5269fce6054ee1a0446043ce112':
Clarify comments for WebSettings.
Steve Block [Thu, 9 Feb 2012 11:04:49 +0000 (03:04 -0800)]
Merge "Clarify comments for WebSettings."
Justin Ho [Wed, 8 Feb 2012 21:00:39 +0000 (13:00 -0800)]
am
fe07b9a2: Merge "Tentative fix for mysteriously recycled bitmap"
* commit '
fe07b9a2ab54305de553332d0ab278fdf7158ae4':
Tentative fix for mysteriously recycled bitmap
Justin Ho [Wed, 8 Feb 2012 20:59:17 +0000 (12:59 -0800)]
Merge "Tentative fix for mysteriously recycled bitmap"
Dianne Hackborn [Wed, 8 Feb 2012 19:40:04 +0000 (11:40 -0800)]
am
f6a7e1f7: Merge "Don\'t wait for current activity to pause before resuming next."
* commit '
f6a7e1f7cd12fbbb2e35391850aec7d7d57b8f66':
Don't wait for current activity to pause before resuming next.
Dianne Hackborn [Wed, 8 Feb 2012 19:38:23 +0000 (11:38 -0800)]
Merge "Don't wait for current activity to pause before resuming next."
James Dong [Wed, 8 Feb 2012 18:44:44 +0000 (10:44 -0800)]
am
e1a409ba: Merge "Enable B frame support in MPEG4Writer"
* commit '
e1a409ba68087c66238c986b270c17932e39f0ba':
Enable B frame support in MPEG4Writer
James Dong [Wed, 8 Feb 2012 18:42:35 +0000 (10:42 -0800)]
Merge "Enable B frame support in MPEG4Writer"
Glenn Kasten [Wed, 8 Feb 2012 18:29:48 +0000 (10:29 -0800)]
am
52835f5d: Merge "Combine duplicate code & document wp<> in mClients"
* commit '
52835f5d201ac05743586f3553ced856d62a08fb':
Combine duplicate code & document wp<> in mClients
Gilles Debunne [Wed, 8 Feb 2012 18:29:46 +0000 (10:29 -0800)]
am
c067717c: Merge "Invalidate text display list when text properties change."
* commit '
c067717c1e4e25c511c3712e213c6f0ce2451d57':
Invalidate text display list when text properties change.
Glenn Kasten [Wed, 8 Feb 2012 18:27:58 +0000 (10:27 -0800)]
Merge "Combine duplicate code & document wp<> in mClients"
Gilles Debunne [Wed, 8 Feb 2012 18:27:46 +0000 (10:27 -0800)]
Merge "Invalidate text display list when text properties change."
Glenn Kasten [Wed, 8 Feb 2012 18:23:31 +0000 (10:23 -0800)]
am
8e0cc398: Merge "Use audio_io_handle_t consistently instead of int"
* commit '
8e0cc398e348f2c75498f813560bc73be6640371':
Use audio_io_handle_t consistently instead of int
Glenn Kasten [Wed, 8 Feb 2012 18:22:11 +0000 (10:22 -0800)]
Merge "Use audio_io_handle_t consistently instead of int"
Marco Nelissen [Wed, 8 Feb 2012 18:17:18 +0000 (10:17 -0800)]
am
b3f04a65: Merge "Delete entries in bulk"
* commit '
b3f04a656907abb0d89485edb24517249a0a9142':
Delete entries in bulk
Marco Nelissen [Wed, 8 Feb 2012 18:15:01 +0000 (10:15 -0800)]
Merge "Delete entries in bulk"
Glenn Kasten [Wed, 8 Feb 2012 17:52:58 +0000 (09:52 -0800)]
am
f31d0500: Simplify destructors
* commit '
f31d05007c9cc5db90e0641e4f8621f5463dcb4e':
Simplify destructors
Glenn Kasten [Wed, 8 Feb 2012 17:39:49 +0000 (09:39 -0800)]
am
c722ba33: Merge "Effect UUID inputs passed by pointer are const"
* commit '
c722ba33dd1225cd26d9d758e08234a1bb8f4864':
Effect UUID inputs passed by pointer are const
Glenn Kasten [Wed, 8 Feb 2012 17:37:26 +0000 (09:37 -0800)]
Merge "Effect UUID inputs passed by pointer are const"
Wink Saville [Wed, 8 Feb 2012 17:21:24 +0000 (09:21 -0800)]
am
1b651212: Merge "Add ril.test.emergency system property."
* commit '
1b6512127b11256b615c3f8e9049494fb0ad4f1b':
Add ril.test.emergency system property.
Wink Saville [Wed, 8 Feb 2012 17:19:19 +0000 (09:19 -0800)]
Merge "Add ril.test.emergency system property."
Glenn Kasten [Wed, 8 Feb 2012 16:42:22 +0000 (08:42 -0800)]
am
a5a6580d: Merge "Use pid_t not int"
* commit '
a5a6580d17acbad9407a92e7372598aeed3d0a70':
Use pid_t not int
Glenn Kasten [Wed, 8 Feb 2012 16:42:18 +0000 (08:42 -0800)]
am
1b33107f: Merge "Don\'t double destruct audio_track_cblk_t"
* commit '
1b33107f3798636cb85cc876b17d4e2adbf1294a':
Don't double destruct audio_track_cblk_t
Glenn Kasten [Wed, 8 Feb 2012 16:42:16 +0000 (08:42 -0800)]
am
cd330e7f: Merge "AudioFlinger methods const and inline"
* commit '
cd330e7f38bf72290c1a230cb93b8177470e88bf':
AudioFlinger methods const and inline
Glenn Kasten [Wed, 8 Feb 2012 16:40:28 +0000 (08:40 -0800)]
Merge "Use pid_t not int"
Glenn Kasten [Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)]
Merge "Don't double destruct audio_track_cblk_t"
Glenn Kasten [Wed, 8 Feb 2012 16:39:39 +0000 (08:39 -0800)]
Merge "AudioFlinger methods const and inline"
Glenn Kasten [Wed, 8 Feb 2012 16:37:52 +0000 (08:37 -0800)]
am
1e3a8d30: Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
* commit '
1e3a8d3090f2a33562201f95f736949a8d2df576':
Remove dead mutex in AudioTrack/AudioRecord thread
Glenn Kasten [Wed, 8 Feb 2012 16:35:41 +0000 (08:35 -0800)]
am
cbe8b722: Merge "Use virtual destructors"
* commit '
cbe8b722479c7777c1ada27a898cefa47c1acdc7':
Use virtual destructors
Glenn Kasten [Wed, 8 Feb 2012 16:34:33 +0000 (08:34 -0800)]
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
Glenn Kasten [Wed, 8 Feb 2012 16:33:41 +0000 (08:33 -0800)]
Merge "Use virtual destructors"
Glenn Kasten [Wed, 8 Feb 2012 15:47:29 +0000 (07:47 -0800)]
am
22776652: Merge "Improve performance for sp<> on stack"
* commit '
2277665266780eae75d6c25df4826bffbffa00cc':
Improve performance for sp<> on stack
Glenn Kasten [Wed, 8 Feb 2012 15:45:22 +0000 (07:45 -0800)]
am
09b9ba0d: Merge "AudioTrack declare more methods const"
* commit '
09b9ba0db29aaebe682b7391d93ae179b8bd8ee8':
AudioTrack declare more methods const
Glenn Kasten [Wed, 8 Feb 2012 15:45:20 +0000 (07:45 -0800)]
am
01a80269: Merge "Use 0 not NULL for sp<> and wp<>"
* commit '
01a802692f6bf2c97a623683d073e949af61d7a9':
Use 0 not NULL for sp<> and wp<>
Glenn Kasten [Wed, 8 Feb 2012 15:45:15 +0000 (07:45 -0800)]
Merge "Improve performance for sp<> on stack"
Glenn Kasten [Wed, 8 Feb 2012 15:43:05 +0000 (07:43 -0800)]
am
35624c17: Merge "Use bool instead of int"
* commit '
35624c17973a941fe000026d899f065c1155021b':
Use bool instead of int
Glenn Kasten [Wed, 8 Feb 2012 15:42:40 +0000 (07:42 -0800)]
Merge "AudioTrack declare more methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:41:44 +0000 (07:41 -0800)]
Merge "Use 0 not NULL for sp<> and wp<>"
Glenn Kasten [Wed, 8 Feb 2012 15:40:57 +0000 (07:40 -0800)]
am
16d64ad6: Merge "Declare more IAudioFlinger methods const"
* commit '
16d64ad699b2dc91d5e1f149a3de645cf83ec965':
Declare more IAudioFlinger methods const
Glenn Kasten [Wed, 8 Feb 2012 15:40:54 +0000 (07:40 -0800)]
am
e0efd5f6: Merge "Remove dead code"
* commit '
e0efd5f6c19e8944e5dd65e8c537fcb32b1b9fd2':
Remove dead code
Glenn Kasten [Wed, 8 Feb 2012 15:40:23 +0000 (07:40 -0800)]
Merge "Use bool instead of int"
Glenn Kasten [Wed, 8 Feb 2012 15:39:27 +0000 (07:39 -0800)]
Merge "Declare more IAudioFlinger methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:38:42 +0000 (07:38 -0800)]
Merge "Remove dead code"
Scott Main [Wed, 8 Feb 2012 05:54:18 +0000 (21:54 -0800)]
Scott Main [Wed, 8 Feb 2012 05:54:15 +0000 (21:54 -0800)]
am
a5bbd3b3: am
f8274e50: am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
a5bbd3b348a72f6a64445defdbb29c36fb2b62d9':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:52:27 +0000 (21:52 -0800)]
Scott Main [Wed, 8 Feb 2012 05:52:24 +0000 (21:52 -0800)]
am
f8274e50: am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
f8274e506c1e4ef798554244370daf57cc88ecdb':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:50:20 +0000 (21:50 -0800)]
Scott Main [Wed, 8 Feb 2012 05:49:37 +0000 (21:49 -0800)]
am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:48:03 +0000 (21:48 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:47:38 +0000 (21:47 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Guang Zhu [Wed, 8 Feb 2012 03:43:19 +0000 (19:43 -0800)]
am
1c4ea6a2: Merge "Revert "Make NDC not block forever and handle restart.""
* commit '
1c4ea6a26c32a0a6f6b41966dabcc8d7f106ad85':
Revert "Make NDC not block forever and handle restart."
Romain Guy [Wed, 8 Feb 2012 03:43:15 +0000 (19:43 -0800)]
am
bc52cce2: Better error message when drawing with recycled bitmaps
* commit '
bc52cce276b6238e8f30f71a0dcf24209481261e':
Better error message when drawing with recycled bitmaps
Guang Zhu [Wed, 8 Feb 2012 03:42:07 +0000 (19:42 -0800)]
Merge "Revert "Make NDC not block forever and handle restart.""
Jason Sams [Wed, 8 Feb 2012 02:58:19 +0000 (18:58 -0800)]
am
5b6abb38: Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
* commit '
5b6abb38f0892f429976bd6976f93ae216b21d38':
Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream.
Jason Sams [Wed, 8 Feb 2012 02:56:39 +0000 (18:56 -0800)]
Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
Romain Guy [Wed, 8 Feb 2012 02:24:53 +0000 (18:24 -0800)]
am
28587f44: Merge "Fix the system"
* commit '
28587f445a2af6d94d1b215e019e8bcc377c17a1':
Fix the system
Romain Guy [Wed, 8 Feb 2012 02:22:43 +0000 (18:22 -0800)]
Merge "Fix the system"
Fabrice Di Meglio [Wed, 8 Feb 2012 01:51:42 +0000 (17:51 -0800)]
am
ed219c11: Merge "Fix bug #
5979311 Change TextView to not clip top/bottom text"
* commit '
ed219c117d449304bd720fc7d7da1f361015dc58':
Fix bug #
5979311 Change TextView to not clip top/bottom text
Fabrice Di Meglio [Wed, 8 Feb 2012 01:49:47 +0000 (17:49 -0800)]
Merge "Fix bug #
5979311 Change TextView to not clip top/bottom text"
Romain Guy [Wed, 8 Feb 2012 01:09:08 +0000 (17:09 -0800)]
am
68c02e25: Merge "Preliminary support for clipRect(Rect, Op)"
* commit '
68c02e25e84e9814d313b43680631b98e25fa6d5':
Preliminary support for clipRect(Rect, Op)
Romain Guy [Wed, 8 Feb 2012 01:07:00 +0000 (17:07 -0800)]
Merge "Preliminary support for clipRect(Rect, Op)"
Romain Guy [Wed, 8 Feb 2012 01:04:34 +0000 (17:04 -0800)]
Preliminary support for clipRect(Rect, Op)
This adds basic support for clip regions. It is currently disabled at compile
time. Enabling clip regions will require setting up a stencil buffer.
Change-Id: I638616a972276e38737f8ac0633692c3845eaa74
Robert Greenwalt [Wed, 8 Feb 2012 00:43:34 +0000 (16:43 -0800)]
am
ec159352: Merge "Make NDC not block forever and handle restart."
* commit '
ec159352fe7fb4c6a476c3542dc65037cb57f982':
Make NDC not block forever and handle restart.
Wink Saville [Wed, 8 Feb 2012 00:43:30 +0000 (16:43 -0800)]
am
28900a7b: Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
* commit '
28900a7b36c372b953648a6ce4c8858de25e9197':
Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful.
Jeff Sharkey [Wed, 8 Feb 2012 00:43:27 +0000 (16:43 -0800)]
am
b5718c29: Merge "Send broadcast when changing restrict background."
* commit '
b5718c29aece51dd337e719c5b94be867833d53e':
Send broadcast when changing restrict background.
Jason Sams [Wed, 8 Feb 2012 00:42:03 +0000 (16:42 -0800)]
Merge "Merge commit '
bdeec118' into manualmerge" into graphics-dev
Jason Sams [Wed, 8 Feb 2012 00:40:51 +0000 (16:40 -0800)]
Merge commit '
bdeec118' into manualmerge
Conflicts:
libs/rs/rsThreadIO.h
Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2