Commit Graph

42971 Commits

Author SHA1 Message Date
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
Scott Main
c903d52575 am cf602dbd: docs: replace "decide for me image" bug: 5860467
* commit 'cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
  docs: replace "decide for me image" bug: 5860467
2012-01-12 11:35:54 -08:00
Matthew Xie
4d7e349bcc am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '1890fa822091ea700b7409ac79a57cf650b55003':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
2012-01-12 11:29:39 -08:00
Matthew Xie
a4a1636b88 am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
* commit '79d84930cd776c7173330eeb13b3282b6034fc37':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
2012-01-12 11:27:10 -08:00
Scott Main
2ec2f4d51d am db4296bd: am a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
* commit 'db4296bde95352b6bb5614fad3b08ffaa49dd9c3':
  docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519
2012-01-12 11:26:49 -08:00
Scott Main
aa8778a93e am a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
* commit 'a618eeb552981d8bca38dbe8c28e2b1b1bffdf5e':
  docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519
2012-01-12 11:24:24 -08:00
Matthew Xie
82ba232b50 Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1 2012-01-12 11:24:06 -08:00
Scott Main
8a7c2b1533 am b2ff327c: am abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
* commit 'b2ff327cb41185030077189bc3e80376acf11c68':
  docs: further clarify the behavior of targetSdkVersion bug: 5854083
2012-01-12 11:23:11 -08:00
Scott Main
dab211a8d5 Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1 2012-01-12 11:22:24 -08:00
Scott Main
1c68323cbc am abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
* commit 'abfe4cb6f0ebd6c901d3210fed719d03db9e80b7':
  docs: further clarify the behavior of targetSdkVersion bug: 5854083
2012-01-12 11:21:02 -08:00
Scott Main
0775fc7f0c Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1 2012-01-12 11:19:08 -08:00
John Reck
691383f6e9 am 6b9a41c5: am baaf136c: am 0a3fcc3e: Fix Apache stack
* commit '6b9a41c55ef9c8ff6f2c7d76f1b81fbe85b2e7d4':
  Fix Apache stack
2012-01-12 11:07:16 -08:00
John Reck
0f10b2a7b4 am baaf136c: am 0a3fcc3e: Fix Apache stack
* commit 'baaf136cd279e22a7ae4b551ebd5fad23b84996d':
  Fix Apache stack
2012-01-12 11:03:06 -08:00
John Reck
7cb12cb7aa am 0a3fcc3e: Fix Apache stack
* commit '0a3fcc3eed15ed50bcaa7808b6ccb170fb137210':
  Fix Apache stack
2012-01-12 11:00:17 -08:00
Michael Jurka
5abd6ee84f Merge "Fix NPE in Recent Apps" 2012-01-12 10:41:32 -08:00
Mathias Agopian
e8045dc60e Merge "remove dead/usnused code" 2012-01-12 10:37:10 -08:00