Commit Graph

42907 Commits

Author SHA1 Message Date
Scott Main
37a79cfbec Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 2012-01-13 18:23:40 -08:00
Scott Main
3d66c69643 am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
  docs: mention x86 as a native platform filter
2012-01-13 18:23:35 -08:00
Dianne Hackborn
1f7dba4b26 am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
  Update notification documentation to follow current guidelines.
2012-01-13 18:23:34 -08:00
Daniel Sandler
f176920175 am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit 'bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
  cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
2012-01-13 18:23:33 -08:00
Scott Main
3d3293b131 Merge "docs: mention x86 as a native platform filter" into ics-mr1 2012-01-13 18:21:42 -08:00
Irfan Sheriff
5098fcce97 Merge "cleanup for concurrency" 2012-01-13 16:41:41 -08:00
Dianne Hackborn
55f960feb3 Merge "Update notification documentation to follow current guidelines." into ics-mr1 2012-01-13 16:36:05 -08:00
Michael Kolb
6168fe00b1 Merge "fix layer scrollbar updates" 2012-01-13 16:25:14 -08:00
Jeff Sharkey
1be47191a0 Merge "Introduce FileRotator." 2012-01-13 15:33:42 -08:00
Jeff Brown
fcc24a5b4d Merge "Fix compilation with Clang." 2012-01-13 15:16:59 -08:00
Jeff Brown
43f0a8a1b1 Merge "Fix a few memory leaks in the input dispatcher." 2012-01-13 15:16:29 -08:00
Gilles Debunne
80ec198c44 Merge "Sub display list in TextView" 2012-01-13 14:53:54 -08:00
David 'Digit' Turner
91e6d9c64d Merge "media/mtp: Add missing LOCAL_C_INCLUDES" 2012-01-13 14:32:50 -08:00
Stephen Hines
76fb659abe Merge "Add support for new root.expand() calls." 2012-01-13 13:57:24 -08:00
Glenn Kasten
1db13d7951 Get AID_GRAPHICS from right place
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
2012-01-13 13:45:39 -08:00
Kenny Root
eb051e35e9 resolved conflicts for merge of e80341c8 to master
Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
2012-01-13 13:39:28 -08:00
Kenny Root
575f408150 am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
  Fix issue with selecting proper JNI libraries
2012-01-13 13:12:34 -08:00
Kenny Root
f39fc5a881 Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 2012-01-13 13:11:02 -08:00
Dianne Hackborn
fc37fe6c27 am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '100651779fde99f7ae2a10719d688b51115f08e9':
  Fix issue #5823276: home repaints after full-screen app is exited
2012-01-13 13:01:48 -08:00
Dianne Hackborn
3d9e6137a8 am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '2e282f35b009fe4c23daca35592dae2032641643':
  Fix issue #5823276: home repaints after full-screen app is exited
2012-01-13 12:58:45 -08:00
Dianne Hackborn
6393739ea4 Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-13 12:56:40 -08:00
Bart Sears
77e747afe0 am bcce2a19: am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit 'bcce2a195390c3f5fc235c3fa551d3d725a7f88a':
  Update to latest version of Roboto
2012-01-13 12:37:53 -08:00
Bart Sears
3339f65a39 am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6':
  Update to latest version of Roboto
2012-01-13 12:35:07 -08:00
Bart Sears
0667548a8a Merge "Update to latest version of Roboto" into ics-mr1 2012-01-13 12:32:43 -08:00
Christopher Tate
79691d284b am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '89620c5d982858f590f3740169c9f69ee380be3e':
  Streamline package-installed handling by the Backup Manager
2012-01-13 12:18:55 -08:00
Romain Guy
0e57869f58 Merge "Remove unused parameter" 2012-01-13 12:13:52 -08:00
Christopher Tate
125fb9efd9 am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '2cf18d28785fdd188641867503586627cb212302':
  Streamline package-installed handling by the Backup Manager
2012-01-13 12:08:09 -08:00
Christopher Tate
cab5000317 Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 2012-01-13 11:49:20 -08:00
John Huang
f008476558 am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit 'e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
  Fix teardown of secondary connections on CDMA
2012-01-13 11:41:01 -08:00
John Huang
29c2558465 am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
  Fix teardown of secondary connections on CDMA
2012-01-13 11:39:03 -08:00
John Huang
f5114c03de Merge "Fix teardown of secondary connections on CDMA" into ics-mr1 2012-01-13 11:37:15 -08:00
Jean-Baptiste Queru
5798b3a332 am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:28:09 -08:00
Jean-Baptiste Queru
0dc09a60af am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:25:09 -08:00
Jean-Baptiste Queru
97e7d232f1 am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:22:08 -08:00
Robert Ly
00be552d14 am 7da0abc5: am 62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '7da0abc52e3cbdeeb7fae0d22895710254ef9ec4':
  cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
2012-01-13 11:20:43 -08:00
Robert Ly
d0bcc3ce38 am 62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
* commit '62472581c30a3202b7bbd86e644b4346d5a4e65c':
  cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
2012-01-13 11:09:27 -08:00
Alon Albert
c9a124b30d Merge "New command to request a sync" 2012-01-13 10:35:53 -08:00
Robert Ly
c61fa6848c Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1 2012-01-13 10:13:14 -08:00
Jean-Baptiste Queru
dcee50eeef Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2012-01-13 07:48:56 -08:00
Evgeniy Stepanov
97470659e9 Fix compilation with Clang.
warning: extraneous template parameter list in template specialization
template<>

Change-Id: If3e3e1d06a018343b40ac0984dfd9ecc12629f8d
2012-01-13 15:33:54 +04:00
Guang Zhu
1f219c0e44 Merge "Move where prop dev.bootcomplete is set" 2012-01-12 21:00:15 -08:00
Bart Sears
d1ec66b84e Merge "Add glyphs for Vertical Text" 2012-01-12 19:20:05 -08:00
Mathias Agopian
323aff2f17 Merge "fix a bug with vsync management" 2012-01-12 18:49:07 -08:00
Ken Wakasa
9bb754289a Merge "Bring LatinIME's privateImeOptions "forceAscii" to a formal public API" 2012-01-12 18:15:42 -08:00
Alon Albert
128ccb297f Merge "Log global autosync on dumpsys Protect dumpsys from divide by zero" 2012-01-12 17:39:37 -08:00
James Dong
0e5dbb938e Merge "Separate sniffing from session initialization" 2012-01-12 16:56:58 -08:00
Adam Cohen
b171d3508e Merge "Getting rid of hack where the wallpaper offset was being deferred" 2012-01-12 16:47:00 -08:00
Mathias Agopian
616c0cdf2c fix a bug with vsync management
this bug was introduced recently. we were signaling *all* clients
regardless of the vsync rate.

Change-Id: I2ae8a6c820a390f602382596ba75e8ed737fb2ef
2012-01-12 16:13:54 -08:00
Scott Main
0a9c04e4e0 am cea3892b: am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit 'cea3892bd7fdf605d51a7f99aa0d20dfbea80dd3':
  docs: make AD logo clickable on home page
2012-01-12 15:49:34 -08:00
Scott Main
7af121d449 am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
* commit '722c8c02f1e17c232b041440ea97a2fda336a6e8':
  docs: make AD logo clickable on home page
2012-01-12 15:47:15 -08:00