Commit Graph

42986 Commits

Author SHA1 Message Date
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
Scott Main
8e9e63253e Merge "docs: make AD logo clickable on home page" into ics-mr1 2012-01-12 15:44:53 -08:00
Svetoslav Ganov
72d54e5414 Merge "AccessibilityService description not internationalized." 2012-01-12 15:36:58 -08:00
Jeff Brown
5b409aa549 Merge "Rewrite SQLite database wrappers." 2012-01-12 15:03:26 -08:00
Jeff Brown
b7629cbea1 Merge "Fix indentation and whitespace." 2012-01-12 14:59:30 -08:00
Jeff Brown
12de5d5dc5 Merge "Clean up database tests a little bit." 2012-01-12 14:59:11 -08:00
Chia-chi Yeh
69c1cdf5b4 am 1e9e7f76: am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit '1e9e7f76d5e6187befaf96eece258c27fd08bdc5':
  VPN: silence VPN notifications.
2012-01-12 14:30:44 -08:00
Chia-chi Yeh
6939c0a7aa am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b':
  VPN: silence VPN notifications.
2012-01-12 14:26:43 -08:00
Chia-chi Yeh
41e18e335b Merge "VPN: silence VPN notifications." into ics-mr1 2012-01-12 14:24:30 -08:00
Gilles Debunne
015312159a Merge "Fixed fadingEdge documentation" 2012-01-12 14:21:58 -08:00
Roman Nurik
b0bc089750 am 4ecb2633: am aaaafca8: docs: Android design CSS/JS fixes
* commit '4ecb2633981d0d58421562ca379a5c79adb413a0':
  docs: Android design CSS/JS fixes
2012-01-12 14:11:01 -08:00
Roman Nurik
762f28178b am aaaafca8: docs: Android design CSS/JS fixes
* commit 'aaaafca8543eaa75f1865d70c801c9b62caa56e2':
  docs: Android design CSS/JS fixes
2012-01-12 14:07:51 -08:00
The Android Automerger
50f402c4a8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:01:29 -08:00
Roman Nurik
ba6eb25ba2 am 0786bc73: am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '0786bc734e55b40a16d1a475f311c5460ff55d36':
  docs: minor Design Principles fixes for Android Design
2012-01-12 13:38:01 -08:00
Jim Miller
5bd7c88fc7 am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '1aff11be4585d6ddff784d7e74188963050805fa':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
2012-01-12 13:37:58 -08:00
Daniel Sandler
9057f24e0b am 66e66e1d: am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f':
  Clean up wifi/mobile indicators in the expanded panel.
2012-01-12 13:37:54 -08:00
Scott Main
2bd98c5ad3 am 499b9441: am cf602dbd: docs: replace "decide for me image" bug: 5860467
* commit '499b944133298b4da344fbf97cff25c6f6b9d62f':
  docs: replace "decide for me image" bug: 5860467
2012-01-12 13:37:41 -08:00
Roman Nurik
cec1831ed9 am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit 'baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9':
  docs: minor Design Principles fixes for Android Design
2012-01-12 12:46:50 -08:00
Roman Nurik
be0ede7010 Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1 2012-01-12 12:45:00 -08:00
Jim Miller
807fe69065 am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '7a286d8391a58637e6834f4de296bf66183ce1b2':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
2012-01-12 12:31:07 -08:00
Jim Miller
32bfab04c4 Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2012-01-12 12:28:59 -08:00
Daniel Sandler
0321dbe5bb am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
* commit '755a967bdc2cddb6fbadd10e357f8a5328520061':
  Clean up wifi/mobile indicators in the expanded panel.
2012-01-12 11:40:43 -08:00
Daniel Sandler
6d810d88f8 Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1 2012-01-12 11:38:39 -08:00