OSDN Git Service
Jeff Brown [Sat, 28 Jan 2012 01:38:56 +0000 (17:38 -0800)]
am
cb0af4f1: Merge "Improve watchdog monitor for InputReader and InputDispatcher."
* commit '
cb0af4f1b0709b236a030f41c75edd97cf0bf1fd':
Improve watchdog monitor for InputReader and InputDispatcher.
Jeff Brown [Sat, 28 Jan 2012 01:38:53 +0000 (17:38 -0800)]
am
2d2d7d6f: Merge "Implement a cancelation mechanism for queries."
* commit '
2d2d7d6f42fe22ecc2b1dc8bb96a19e503a61a20':
Implement a cancelation mechanism for queries.
Jeff Brown [Sat, 28 Jan 2012 01:37:31 +0000 (17:37 -0800)]
Merge "Improve watchdog monitor for InputReader and InputDispatcher."
Jeff Brown [Sat, 28 Jan 2012 01:37:24 +0000 (17:37 -0800)]
Merge "Implement a cancelation mechanism for queries."
Glenn Kasten [Sat, 28 Jan 2012 00:25:54 +0000 (16:25 -0800)]
am
30c918ce: Use final on new member variables
* commit '
30c918ce7fbe171944b28fc91b3f22b3d631872d':
Use final on new member variables
Alex Sakhartchouk [Fri, 27 Jan 2012 23:29:09 +0000 (15:29 -0800)]
Merge "Better constant names, removed unused code, general cleanup." into graphics-dev
Jean-Michel Trivi [Fri, 27 Jan 2012 22:53:22 +0000 (14:53 -0800)]
am
cf0c7d10: Merge "Bug
5567648 Request and abandon audio focus in calls"
* commit '
cf0c7d1031ea213c1b728aca972522afcd4a92c3':
Bug
5567648 Request and abandon audio focus in calls
Jean-Michel Trivi [Fri, 27 Jan 2012 22:50:28 +0000 (14:50 -0800)]
Merge "Bug
5567648 Request and abandon audio focus in calls"
Fabrice Di Meglio [Fri, 27 Jan 2012 22:44:02 +0000 (14:44 -0800)]
am
39d18f53: Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
* commit '
39d18f53b3ec721ecc5cc629b71f902b33504bea':
Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE
Fabrice Di Meglio [Fri, 27 Jan 2012 22:42:06 +0000 (14:42 -0800)]
Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
Jean-Michel Trivi [Fri, 27 Jan 2012 22:17:55 +0000 (14:17 -0800)]
am
11001c34: Merge "Bug
5567648 disassociate audio mode and audio focus"
* commit '
11001c344a37ac515328133f46b80a2c92e61b6c':
Bug
5567648 disassociate audio mode and audio focus
Jean-Michel Trivi [Fri, 27 Jan 2012 22:15:37 +0000 (14:15 -0800)]
Merge "Bug
5567648 disassociate audio mode and audio focus"
Glenn Kasten [Fri, 27 Jan 2012 22:12:42 +0000 (14:12 -0800)]
am
b975ae45: Merge "Remove optional LVMX service"
* commit '
b975ae45cb246457c350863975a3ef5b3baa7fb4':
Remove optional LVMX service
Glenn Kasten [Fri, 27 Jan 2012 22:11:16 +0000 (14:11 -0800)]
Merge "Remove optional LVMX service"
Gilles Debunne [Fri, 27 Jan 2012 21:57:16 +0000 (13:57 -0800)]
am
566e8baf: Merge "Fix for IOOB when suggestions have disappeared"
* commit '
566e8baf43a08b1000b8c4c24fb14fe94e46394d':
Fix for IOOB when suggestions have disappeared
Gilles Debunne [Fri, 27 Jan 2012 21:57:14 +0000 (13:57 -0800)]
am
ea118122: Merge "Handle tap and move cursor before showing suggestions"
* commit '
ea1181220deaf1820fb5cc13247d5e976b5543d4':
Handle tap and move cursor before showing suggestions
Gilles Debunne [Fri, 27 Jan 2012 21:54:50 +0000 (13:54 -0800)]
Merge "Fix for IOOB when suggestions have disappeared"
Gilles Debunne [Fri, 27 Jan 2012 21:54:42 +0000 (13:54 -0800)]
Merge "Handle tap and move cursor before showing suggestions"
Teng-Hui Zhu [Fri, 27 Jan 2012 21:50:07 +0000 (13:50 -0800)]
am
91391744: Merge "Revert "Hack to workaround the fact that the EGL context can be""
* commit '
913917449d4b5da28056a02b81fb49e73f98d9a1':
Revert "Hack to workaround the fact that the EGL context can be"
Teng-Hui Zhu [Fri, 27 Jan 2012 21:48:25 +0000 (13:48 -0800)]
Merge "Revert "Hack to workaround the fact that the EGL context can be""
Jason Sams [Fri, 27 Jan 2012 21:30:20 +0000 (13:30 -0800)]
Merge "Add comment to confusing commands." into graphics-dev
Eric Fischer [Fri, 27 Jan 2012 20:01:31 +0000 (12:01 -0800)]
am
d4760fc2: Merge "Import translations. DO NOT MERGE"
* commit '
d4760fc2b731f1ffe1d5f2efb4a887772f1c5150':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 27 Jan 2012 19:58:58 +0000 (11:58 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Fri, 27 Jan 2012 19:55:35 +0000 (11:55 -0800)]
am
b6c51b9a: Import translations. DO NOT MERGE
* commit '
b6c51b9a88f80c15d27cef6ea747eeeba0f6e903':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 27 Jan 2012 19:24:55 +0000 (11:24 -0800)]
am
66ed8578: Merge "Mark locale-neutral configuration strings translatable="false""
* commit '
66ed857806f0f781df543f436335cba0dfb3bf39':
Mark locale-neutral configuration strings translatable="false"
Eric Fischer [Fri, 27 Jan 2012 19:22:52 +0000 (11:22 -0800)]
Merge "Mark locale-neutral configuration strings translatable="false""
Nick Pelly [Fri, 27 Jan 2012 19:05:19 +0000 (11:05 -0800)]
am
d343bb96: Merge "Fix doc bug."
* commit '
d343bb9692acd1668cf3683085880d8edd1c53b8':
Fix doc bug.
Nick Pelly [Fri, 27 Jan 2012 19:03:57 +0000 (11:03 -0800)]
Merge "Fix doc bug."
Nick Pelly [Fri, 27 Jan 2012 18:37:28 +0000 (10:37 -0800)]
am
fbc659e2: Merge "Fix build: update current.txt"
* commit '
fbc659e259816b97877f49ff6ca1bd637fd7b7b8':
Fix build: update current.txt
Nick Pelly [Fri, 27 Jan 2012 18:35:12 +0000 (10:35 -0800)]
Merge "Fix build: update current.txt"
Stephen Hines [Fri, 27 Jan 2012 18:10:27 +0000 (10:10 -0800)]
am
cee905be: Merge "Don\'t wait forever if there are no commands to execute."
* commit '
cee905be4874f6d3f112527a53b0f7ff87655c66':
Don't wait forever if there are no commands to execute.
Stephen Hines [Fri, 27 Jan 2012 18:08:18 +0000 (10:08 -0800)]
Merge "Don't wait forever if there are no commands to execute."
Nick Pelly [Fri, 27 Jan 2012 18:00:58 +0000 (10:00 -0800)]
am
ef78d96b: Merge "Add NdefMessage.getByteLength(), and more minor fixes:"
* commit '
ef78d96b905f7b55cef5df7f5582a249a685458f':
Add NdefMessage.getByteLength(), and more minor fixes:
Nick Pelly [Fri, 27 Jan 2012 17:59:10 +0000 (09:59 -0800)]
Merge "Add NdefMessage.getByteLength(), and more minor fixes:"
Jamie Gennis [Fri, 27 Jan 2012 17:54:38 +0000 (09:54 -0800)]
am
7bea6502: Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"
* commit '
7bea65020872a9945a6938068c4922d33cef5b4e':
SurfaceTexture: use fence sync on omap4 & s5pc110
Jamie Gennis [Fri, 27 Jan 2012 17:53:14 +0000 (09:53 -0800)]
Merge "SurfaceTexture: use fence sync on omap4 & s5pc110"
Glenn Kasten [Fri, 27 Jan 2012 17:07:55 +0000 (09:07 -0800)]
am
c14639a9: Merge "Use audio_source_t consistently"
* commit '
c14639a9a1dfda34f828e2a6d774edfe5c3c6919':
Use audio_source_t consistently
Glenn Kasten [Fri, 27 Jan 2012 17:06:00 +0000 (09:06 -0800)]
Merge "Use audio_source_t consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:24:16 +0000 (07:24 -0800)]
am
c1f63ddb: Merge "AudioStreamIn and AudioStreamOut"
* commit '
c1f63ddba76717db4f42ec04a06a0be12f22b2dc':
AudioStreamIn and AudioStreamOut
Glenn Kasten [Fri, 27 Jan 2012 15:22:30 +0000 (07:22 -0800)]
Merge "AudioStreamIn and AudioStreamOut"
Glenn Kasten [Fri, 27 Jan 2012 15:21:49 +0000 (07:21 -0800)]
am
6562dadf: Merge "Declare methods in binder opcode order"
* commit '
6562dadf3c9c97e14b2cd264d08eaae39c9e6d0c':
Declare methods in binder opcode order
Glenn Kasten [Fri, 27 Jan 2012 15:21:46 +0000 (07:21 -0800)]
am
591993f1: Merge "Use enum effect_state consistently"
* commit '
591993f162d0dbf7f6ce0e33a5f8f1bb687e91ce':
Use enum effect_state consistently
Glenn Kasten [Fri, 27 Jan 2012 15:21:43 +0000 (07:21 -0800)]
am
86012869: Merge "Use enum track_state consistently"
* commit '
86012869b8a99e43158f9fe6488b5928a034b03b':
Use enum track_state consistently
Glenn Kasten [Fri, 27 Jan 2012 15:19:53 +0000 (07:19 -0800)]
Merge "Declare methods in binder opcode order"
Glenn Kasten [Fri, 27 Jan 2012 15:19:20 +0000 (07:19 -0800)]
am
43f4dd4f: Merge "Use enum mixer_state consistently"
* commit '
43f4dd4fa19bf3808f9fddc8a678a0fc935173bb':
Use enum mixer_state consistently
Glenn Kasten [Fri, 27 Jan 2012 15:19:10 +0000 (07:19 -0800)]
Merge "Use enum effect_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:18:23 +0000 (07:18 -0800)]
Merge "Use enum track_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:16:46 +0000 (07:16 -0800)]
Merge "Use enum mixer_state consistently"
Alon Albert [Fri, 27 Jan 2012 01:07:46 +0000 (17:07 -0800)]
am
815af1ff: Merge "Throw NPE if s is null"
* commit '
815af1ff595a6c028f28c16139a9e64ad98507a3':
Throw NPE if s is null
Alon Albert [Fri, 27 Jan 2012 01:05:58 +0000 (17:05 -0800)]
Merge "Throw NPE if s is null"
Alex Sakhartchouk [Fri, 27 Jan 2012 00:31:11 +0000 (16:31 -0800)]
Merge "Material name cleanup. Minor refactoring." into graphics-dev
Andreas Huber [Fri, 27 Jan 2012 00:02:40 +0000 (16:02 -0800)]
am
4bc8bfaf: Merge "The software AAC encoder is now an OMX component."
* commit '
4bc8bfaf11839b12d88fcb40e57a1eea456aef7c':
The software AAC encoder is now an OMX component.
Andreas Huber [Fri, 27 Jan 2012 00:00:38 +0000 (16:00 -0800)]
Merge "The software AAC encoder is now an OMX component."
Chet Haase [Thu, 26 Jan 2012 23:55:11 +0000 (15:55 -0800)]
am
23fb7dc7: Merge "Fix old issue with compatibility-scaled apps and Animations"
* commit '
23fb7dc7c74ac16273cb22313080eaa9de915225':
Fix old issue with compatibility-scaled apps and Animations
Alex Sakhartchouk [Thu, 26 Jan 2012 23:54:52 +0000 (15:54 -0800)]
Merge "Separating scenegraph from the app that uses it." into graphics-dev
Chet Haase [Thu, 26 Jan 2012 23:53:03 +0000 (15:53 -0800)]
Merge "Fix old issue with compatibility-scaled apps and Animations"
Daniel Sandler [Thu, 26 Jan 2012 23:49:40 +0000 (15:49 -0800)]
am
bbbf6b9c: am
70828a1d: am
5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '
bbbf6b9c49301460a34e749d476c10834a609cf5':
Suppress mobile-out-of-service label if wifi connected.
Daniel Sandler [Thu, 26 Jan 2012 23:47:06 +0000 (15:47 -0800)]
am
70828a1d: am
5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '
70828a1d40c9bf0e5066166216013093298de034':
Suppress mobile-out-of-service label if wifi connected.
Geremy Condra [Thu, 26 Jan 2012 23:08:34 +0000 (15:08 -0800)]
am
838a0e0e: Merge "Removed intent logging from SearchDialog.java"
* commit '
838a0e0ed8aadfea635954e365ec9232abfacd71':
Removed intent logging from SearchDialog.java
Geremy Condra [Thu, 26 Jan 2012 23:06:18 +0000 (15:06 -0800)]
Merge "Removed intent logging from SearchDialog.java"
Jim Miller [Thu, 26 Jan 2012 22:34:08 +0000 (14:34 -0800)]
am
fb9e3643: Merge "Fix
5620754: don\'t show pattern unlock after SIM unlock if not enabled."
* commit '
fb9e364380f91295490d1acbfc9a571cb6a4384b':
Fix
5620754: don't show pattern unlock after SIM unlock if not enabled.
Jim Miller [Thu, 26 Jan 2012 22:30:49 +0000 (14:30 -0800)]
Merge "Fix
5620754: don't show pattern unlock after SIM unlock if not enabled."
Eric Fischer [Thu, 26 Jan 2012 22:28:25 +0000 (14:28 -0800)]
am
b14ecd26: Merge "Import translations. DO NOT MERGE"
* commit '
b14ecd2684d5b2c1f284b669d2ffa9c19bfee7b4':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 22:26:10 +0000 (14:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Gilles Debunne [Thu, 26 Jan 2012 22:11:15 +0000 (14:11 -0800)]
am
e93c5171: Merge "Modified algorithm to remove duplicated suggestions"
* commit '
e93c51713c440d572913292926c6e606edd6c64d':
Modified algorithm to remove duplicated suggestions
Gilles Debunne [Thu, 26 Jan 2012 22:11:12 +0000 (14:11 -0800)]
am
89429a42: Merge "Remove @deprecate in View\'s fadingEdge"
* commit '
89429a42116ad26df6add801aba66e6e454a10dd':
Remove @deprecate in View's fadingEdge
Gilles Debunne [Thu, 26 Jan 2012 22:09:20 +0000 (14:09 -0800)]
Merge "Modified algorithm to remove duplicated suggestions"
Gilles Debunne [Thu, 26 Jan 2012 22:09:00 +0000 (14:09 -0800)]
Merge "Remove @deprecate in View's fadingEdge"
Stephen Hines [Thu, 26 Jan 2012 21:58:14 +0000 (13:58 -0800)]
am
caaac348: Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."
* commit '
caaac348ed163f59cf1b8185bb14137050c18e7e':
Fix bugs with unsigned rsAtomicCas/Max/Min.
Stephen Hines [Thu, 26 Jan 2012 21:55:57 +0000 (13:55 -0800)]
Merge "Fix bugs with unsigned rsAtomicCas/Max/Min."
Daniel Sandler [Thu, 26 Jan 2012 21:04:17 +0000 (13:04 -0800)]
am
5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '
5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
Suppress mobile-out-of-service label if wifi connected.
Daniel Sandler [Thu, 26 Jan 2012 21:02:32 +0000 (13:02 -0800)]
Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
Scott Main [Thu, 26 Jan 2012 19:50:13 +0000 (11:50 -0800)]
am
7e4ef617: am
2de74f5f: am
6c055bbd: docs: add action bar icons ZIP
* commit '
7e4ef61732d7de33e34f5935cfad51049f65116a':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:47:35 +0000 (11:47 -0800)]
am
2de74f5f: am
6c055bbd: docs: add action bar icons ZIP
* commit '
2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
docs: add action bar icons ZIP
Scott Main [Thu, 26 Jan 2012 19:44:58 +0000 (11:44 -0800)]
am
6c055bbd: docs: add action bar icons ZIP
* commit '
6c055bbdf475e6cd324912326c802244b9a76c3b':
docs: add action bar icons ZIP
Ben Cheng [Thu, 26 Jan 2012 19:19:16 +0000 (11:19 -0800)]
am
f429ff70: Merge "Preserve NEON callee-save registers d8-d15."
* commit '
f429ff70776c7cf68a6f726afdf984dbbf9e6901':
Preserve NEON callee-save registers d8-d15.
Ben Cheng [Thu, 26 Jan 2012 19:16:58 +0000 (11:16 -0800)]
Merge "Preserve NEON callee-save registers d8-d15."
Alex Sakhartchouk [Thu, 26 Jan 2012 02:06:25 +0000 (18:06 -0800)]
Merge "Adding shader textures and removing specialized code." into graphics-dev
Scott Main [Thu, 26 Jan 2012 02:05:58 +0000 (18:05 -0800)]
am
9413752f: am
e7ffc5a6: am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
9413752f30a505dfd36fcedb26dc1dd933c9840d':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 02:03:20 +0000 (18:03 -0800)]
am
e7ffc5a6: am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 02:00:42 +0000 (18:00 -0800)]
am
9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '
9ac4dd828065410efbb380992d996c7e93daf437':
docs: remove the 1.0 icon template pack
Scott Main [Thu, 26 Jan 2012 01:58:54 +0000 (17:58 -0800)]
Merge "docs: remove the 1.0 icon template pack" into ics-mr1
Scott Main [Thu, 26 Jan 2012 01:57:14 +0000 (17:57 -0800)]
am
8a89e93b: am
1f9026ca: am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
8a89e93ba40d6ce5534262f8dcd878817adfa08f':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:54:48 +0000 (17:54 -0800)]
am
1f9026ca: am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:52:08 +0000 (17:52 -0800)]
am
f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '
f466db14ec32fbaf08a868df40f7685a7e7df3db':
docs: remove ADL presentation PDFs to conserve site space
Scott Main [Thu, 26 Jan 2012 01:50:20 +0000 (17:50 -0800)]
Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
Joe Malin [Thu, 26 Jan 2012 01:35:26 +0000 (17:35 -0800)]
am
bf80175c: am
ba8dd79f: am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
bf80175cca216636edd4b139da581eaeaee31888':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:33:06 +0000 (17:33 -0800)]
am
ba8dd79f: am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:30:13 +0000 (17:30 -0800)]
am
9f426604: am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
DOC CHANGE: New Content Provider topics
Joe Malin [Thu, 26 Jan 2012 01:27:46 +0000 (17:27 -0800)]
am
a2a46f62: DOC CHANGE: New Content Provider topics
* commit '
a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
DOC CHANGE: New Content Provider topics
Svetoslav Ganov [Thu, 26 Jan 2012 01:11:35 +0000 (17:11 -0800)]
am
758d97c3: Merge "Fixing failing focus tests"
* commit '
758d97c3126144018b38d0e4ca4deb8b92420e0c':
Fixing failing focus tests
Svetoslav Ganov [Thu, 26 Jan 2012 01:09:54 +0000 (17:09 -0800)]
Merge "Fixing failing focus tests"
Teng-Hui Zhu [Thu, 26 Jan 2012 00:56:02 +0000 (16:56 -0800)]
am
99b46be9: Merge "Make sure WebView get notified before the EGL context destroyed."
* commit '
99b46be97bd02d304024d692de12e5779ed34355':
Make sure WebView get notified before the EGL context destroyed.
Teng-Hui Zhu [Thu, 26 Jan 2012 00:53:05 +0000 (16:53 -0800)]
Merge "Make sure WebView get notified before the EGL context destroyed."
Dianne Hackborn [Thu, 26 Jan 2012 00:18:05 +0000 (16:18 -0800)]
am
52da22f2: Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
* commit '
52da22f2731cf5f312be9a913295af6638e49595':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Thu, 26 Jan 2012 00:15:43 +0000 (16:15 -0800)]
Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Gilles Debunne [Wed, 25 Jan 2012 23:11:01 +0000 (15:11 -0800)]
am
3f696b26: Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
* commit '
3f696b264e4a3dd28421e9e1a58fe2c6241f48e4':
Unbalanced batch edit begin and end leave TextView unresponsive
Gilles Debunne [Wed, 25 Jan 2012 23:08:29 +0000 (15:08 -0800)]
Merge "Unbalanced batch edit begin and end leave TextView unresponsive"
Fabrice Di Meglio [Wed, 25 Jan 2012 22:56:09 +0000 (14:56 -0800)]
am
842e3790: Merge "Update Javadoc for InputConnection.deleteSurroundingText()"
* commit '
842e379074e069d0273711399f45a2d7109f9e64':
Update Javadoc for InputConnection.deleteSurroundingText()