Commit Graph

43138 Commits

Author SHA1 Message Date
Eric Fischer
dae7cb6bce Merge "Mark locale-neutral configuration strings translatable="false"" 2012-01-27 11:22:52 -08:00
Nick Pelly
c490675718 Merge "Fix doc bug." 2012-01-27 11:03:57 -08:00
Nick Pelly
fe3ebda60f Merge "Fix build: update current.txt" 2012-01-27 10:35:12 -08:00
Stephen Hines
084f76135b Merge "Don't wait forever if there are no commands to execute." 2012-01-27 10:08:18 -08:00
Nick Pelly
cbec2b18a3 Merge "Add NdefMessage.getByteLength(), and more minor fixes:" 2012-01-27 09:59:10 -08:00
Jamie Gennis
eebc37915c Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 2012-01-27 09:53:14 -08:00
Glenn Kasten
9313ab3af5 Merge "Use audio_source_t consistently" 2012-01-27 09:06:00 -08:00
Glenn Kasten
e0ec95efb6 Merge "AudioStreamIn and AudioStreamOut" 2012-01-27 07:22:30 -08:00
Glenn Kasten
faa921735e Merge "Declare methods in binder opcode order" 2012-01-27 07:19:53 -08:00
Glenn Kasten
84a68b7bad Merge "Use enum effect_state consistently" 2012-01-27 07:19:10 -08:00
Glenn Kasten
e59167a25e Merge "Use enum track_state consistently" 2012-01-27 07:18:23 -08:00
Glenn Kasten
3596794e2f Merge "Use enum mixer_state consistently" 2012-01-27 07:16:46 -08:00
Alon Albert
751ecf24fd Merge "Throw NPE if s is null" 2012-01-26 17:05:58 -08:00
Andreas Huber
e3e675fea2 Merge "The software AAC encoder is now an OMX component." 2012-01-26 16:00:38 -08:00
Chet Haase
bfe3b45d0e Merge "Fix old issue with compatibility-scaled apps and Animations" 2012-01-26 15:53:03 -08:00
Daniel Sandler
3cef740514 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.
2012-01-26 15:47:06 -08:00
Geremy Condra
7ac703fedf Merge "Removed intent logging from SearchDialog.java" 2012-01-26 15:06:18 -08:00
Jim Miller
345d9dd3f0 Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled." 2012-01-26 14:30:49 -08:00
Eric Fischer
200e2c8024 Merge "Import translations. DO NOT MERGE" 2012-01-26 14:26:10 -08:00
Gilles Debunne
16b060f555 Merge "Modified algorithm to remove duplicated suggestions" 2012-01-26 14:09:20 -08:00
Gilles Debunne
9c10a1d2ac Merge "Remove @deprecate in View's fadingEdge" 2012-01-26 14:09:00 -08:00
Stephen Hines
789e6fc09b Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 2012-01-26 13:55:57 -08:00
Daniel Sandler
9604fdcf94 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.
2012-01-26 13:04:17 -08:00
Daniel Sandler
e84ea3722f Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Scott Main
ed46932b49 am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP
* commit '2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
  docs: add action bar icons ZIP
2012-01-26 11:47:35 -08:00
Scott Main
9912602489 am 6c055bbd: docs: add action bar icons ZIP
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP
2012-01-26 11:44:58 -08:00
Ben Cheng
3c212e71c8 Merge "Preserve NEON callee-save registers d8-d15." 2012-01-26 11:16:59 -08:00
Scott Main
49faa9ca45 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
2012-01-25 18:03:20 -08:00
Scott Main
9fb836c3f8 am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
  docs: remove the 1.0 icon template pack
2012-01-25 18:00:42 -08:00
Scott Main
278a730b83 Merge "docs: remove the 1.0 icon template pack" into ics-mr1 2012-01-25 17:58:54 -08:00
Scott Main
8df45f00e4 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
2012-01-25 17:54:48 -08:00
Scott Main
a4fda50a92 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
2012-01-25 17:52:08 -08:00
Scott Main
25120a84bb Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 2012-01-25 17:50:20 -08:00
Joe Malin
5392aebe86 am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:33:06 -08:00
Joe Malin
941e34e3aa am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:30:13 -08:00
Joe Malin
0d9aecbbd8 am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:27:46 -08:00
Svetoslav Ganov
6eeb4f29a4 Merge "Fixing failing focus tests" 2012-01-25 17:09:54 -08:00
Teng-Hui Zhu
ab64314928 Merge "Make sure WebView get notified before the EGL context destroyed." 2012-01-25 16:53:05 -08:00
Dianne Hackborn
df0a4caa24 Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc." 2012-01-25 16:15:43 -08:00
Dianne Hackborn
907e08f2de Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
2012-01-25 15:14:50 -08:00
Gilles Debunne
8b80621ed5 Merge "Unbalanced batch edit begin and end leave TextView unresponsive" 2012-01-25 15:08:29 -08:00
Fabrice Di Meglio
27ee11b062 Merge "Update Javadoc for InputConnection.deleteSurroundingText()" 2012-01-25 14:52:40 -08:00
Gilles Debunne
26ec02b9c9 Merge "TextView's display list updated on layout" 2012-01-25 14:07:08 -08:00
Wink Saville
aa1e433e56 Merge "Add additional debug" 2012-01-25 14:04:59 -08:00
Wink Saville
10abf9cd54 Merge "Fix ClassCastException" 2012-01-25 13:45:02 -08:00
Nick Pelly
058cadde46 Merge "Add API's for normalizing MIME's and URI's." 2012-01-25 12:55:58 -08:00
Dianne Hackborn
5b941d0c0c Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs." 2012-01-25 12:29:17 -08:00
Jeff Brown
3b891312c8 Merge "Fix an inconsistent comment." 2012-01-25 11:52:48 -08:00
Robert Greenwalt
839d927da3 am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '109533519153307b10e2b3ae327ca4b4cd0c75d3':
  Filter our v6 address from tethering dns.
2012-01-25 11:33:14 -08:00
Robert Greenwalt
424661c12a am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
  Filter our v6 address from tethering dns.
2012-01-25 11:30:39 -08:00