Commit Graph

36953 Commits

Author SHA1 Message Date
Adam Powell
e9748cc4a5 Merge "Bug 5061529 - Save/restore action view state for menu items across invalidations." 2011-07-21 18:22:02 -07:00
Kazuhiro Ondo
c390c5ba82 am b7ad442c: am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit 'b7ad442c90146f736c6268c21e34a87fbcab6335':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:19:21 -07:00
Kazuhiro Ondo
8123f3669c am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:15:26 -07:00
Pannag Sanketi
800f40be50 Merge "Adding AndoirdOpaque Colorformat to OMX" 2011-07-21 18:11:00 -07:00
Romain Guy
9a9f86dc3d Merge "Ouput looper traces as traceview traces" 2011-07-21 18:07:16 -07:00
Dianne Hackborn
ec3763d4a0 Merge "Fix issue #5021385: Title of any Settings subscreen changes..." 2011-07-21 17:53:51 -07:00
Jeff Brown
ba615bb226 Merge "Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList. Bug: 5062011" 2011-07-21 17:44:08 -07:00
Chia-chi Yeh
f28fa78f3d Merge "VPN: add VpnBuilder as the public API of user space VPN." 2011-07-21 17:37:11 -07:00
Adam Powell
6fc888748c Merge "Fix bug 5048482 - mischievous monkeys editing text in IME extract mode" 2011-07-21 17:33:00 -07:00
Michael Jurka
77ee42e4d3 Merge "Fix crash in recents" 2011-07-21 17:13:13 -07:00
John Wang
3b4768a318 Merge "Remove APN type in notifyDataConnection." 2011-07-21 17:06:08 -07:00
Jaikumar Ganesh
ae6092f5b4 Merge "Auto Pairing tweaks." 2011-07-21 16:27:55 -07:00
Mike Lockwood
a272071020 Merge "UsbDeviceManager: Add USB notification string for USB accessory mode" 2011-07-21 16:24:27 -07:00
Mike Lockwood
f13ffabe25 Merge "USB: Fix handling USB accessory attached when device is booting" 2011-07-21 16:24:18 -07:00
John Reck
5d40714481 Merge "Fixup handling destroy" 2011-07-21 16:21:13 -07:00
Dianne Hackborn
7cd8f154d3 Merge "Fix bug where memory trim was not being delivered with correct level." 2011-07-21 16:19:11 -07:00
Fabrice Di Meglio
054112fec7 Merge "Fix CheckTextView padding" 2011-07-21 16:12:43 -07:00
Chris Craik
a400e601ef Merge "New log format, Manual log generation, plus logging of invalidates" 2011-07-21 15:59:17 -07:00
Jeff Hamilton
b6cd66ba90 Merge "Make READ_FRAME_BUFFER signatureOrSystem." 2011-07-21 15:57:41 -07:00
Romain Guy
fb371f0b8c Merge "Add looper profiling to adb shell am" 2011-07-21 15:31:59 -07:00
Irfan Sheriff
fbc90c827a Merge "Fix multicast API" 2011-07-21 13:45:38 -07:00
Gilles Debunne
aeb0576d49 Merge "Bug 4534376: Suggestion popup is not clipped." 2011-07-21 13:33:13 -07:00
Svetoslav Ganov
371e250972 Merge "Adding accessibility support to the Status Bar." 2011-07-21 13:11:44 -07:00
Adam Powell
8eb07a3f5c Merge "Bug 4948805 - fix custom title divider for dialogs" 2011-07-21 13:10:28 -07:00
Jaikumar Ganesh
0eebb6d4be Merge "Incoming connection dialog tweaks." 2011-07-21 11:53:44 -07:00
Svetoslav Ganov
667012fa47 Merge "Activity selections not always persisted by AcitivtyChooserView." 2011-07-21 11:48:57 -07:00
Jaikumar Ganesh
45944e0a47 Merge "Fix notification manager delete intent." 2011-07-21 11:43:03 -07:00
Irfan Sheriff
e3ad6993a3 Merge "WifiWatchdogSM notification for first wifi disable" 2011-07-21 11:28:51 -07:00
Hong Teng
047360b2ca Merge "fix for issue 4142219 Don't hard code platform-specific limitations-jni/java part" 2011-07-21 11:13:43 -07:00
Huahui Wu
6fc301bcae Merge "b/4070489 Jumpy motion when switching fingers during zoom gesture." 2011-07-21 11:08:55 -07:00
The Android Open Source Project
6988e16f23 Reconcile with gingerbread-mr4-release
Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a
2011-07-21 07:24:01 -07:00
Narayan Kamath
9b44d1bebb Merge "Fix some AudioTrack related issues." 2011-07-21 05:12:34 -07:00
Martijn Coenen
ce7b501a0a Merge "Support for getTimeout() (API)." 2011-07-21 00:32:11 -07:00
Jeff Hamilton
23f6387aa2 Merge "Remove the hidden My Tag APIs." 2011-07-20 21:54:15 -07:00
Eric Laurent
bbb29412b7 Merge "AudioRecord JAVA: expose audio session Id" 2011-07-20 19:25:34 -07:00
Matthew Xie
97532391ed Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled" 2011-07-20 19:08:38 -07:00
Xavier Ducrohet
f00da3b63a am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
* commit 'b3ab070edb17f00a4b2d0f511ca539c885b28b6f':
  Fix to compile for windows
2011-07-20 18:56:52 -07:00
Xavier Ducrohet
3578bb1b76 am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
  Fix to compile for windows
2011-07-20 18:55:21 -07:00
Xavier Ducrohet
656ddbeb6e am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
  Fix to compile for windows
2011-07-20 18:53:08 -07:00
Mathias Agopian
aa5e671921 Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp" 2011-07-20 18:52:51 -07:00
Mathias Agopian
b4580d051f Merge "silence sensorservice when it's dropping events" 2011-07-20 18:52:21 -07:00
Xavier Ducrohet
029c3152d1 am 9bac0a9f: Merge "Fix to compile for windows"
* commit '9bac0a9f93976ff341fc9c46b3a85be767119a88':
  Fix to compile for windows
2011-07-20 18:49:46 -07:00
Romain Guy
84a6b64982 Merge "Convert looper traces to traceview traces" 2011-07-20 18:47:49 -07:00
Xavier Ducrohet
dd6656872a Merge "Fix to compile for windows" 2011-07-20 18:35:35 -07:00
Dirk Dougherty
772d47b009 Merge "Cherrypick from hcmr2: doc change: fix typo in reference to new uses-feature constant." 2011-07-20 18:05:56 -07:00
Jeff Brown
05655c9c59 Merge "Untangle MediaScanner error handling. Bug: 5056917" 2011-07-20 18:03:47 -07:00
Gilles Debunne
50ea211fbc Merge "Suggestions are dismissed by back key" 2011-07-20 17:51:36 -07:00
Xavier Ducrohet
63c71e2536 am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
  Added Caching for PreProcessed PNGs
2011-07-20 17:49:26 -07:00
Eric Laurent
abe4fd279b Merge "Audio framework: support for audio pre processing" 2011-07-20 17:45:37 -07:00
Xavier Ducrohet
29c732154d resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
2011-07-20 17:45:11 -07:00