Adam Powell
d8f10c3420
Merge "Fix some action bar menu layout bugs around config changes"
2012-03-06 17:43:48 -08:00
Wink Saville
05d6eab3be
Merge "Telephony: Create and use UiccController"
2012-03-06 17:13:16 -08:00
John Reck
d4c7b0eb29
Merge "Fix unhandled navigation path"
2012-03-06 17:05:48 -08:00
John Reck
f7916c684e
Merge "Fix FOCUS_BACKWARD search if view had no id"
2012-03-06 17:04:13 -08:00
Jeff Brown
ba663c4570
Merge "Don't close the database until all references released."
2012-03-06 16:51:13 -08:00
Glenn Kasten
ca84229542
Merge "Rename fields of AudioSessionRef"
2012-03-06 16:22:30 -08:00
Glenn Kasten
ed381b9e0a
Merge "Fix indentation for re-organized code"
2012-03-06 15:23:58 -08:00
Nicolas Roard
f3257bd41a
Merge "Pass the version down to native"
2012-03-06 14:13:54 -08:00
Gilles Debunne
6d5f671c83
Merge "Ellipsize avoids spaces and starts right after text"
2012-03-06 13:57:16 -08:00
Glenn Kasten
3a6a07c27f
Merge "Rename updateWaitTime since a lock is held"
2012-03-06 13:44:56 -08:00
Fabrice Di Meglio
e8f8f773e0
Merge "Fix bug #4972463 Update CTS tests for TextView textDirection"
2012-03-06 11:48:14 -08:00
Robert Greenwalt
2929bf3a9c
Merge "Make NDC not block forever and handle restart."
2012-03-06 11:30:28 -08:00
Craig Mautner
f96ce89a21
Merge "Fix deadlock by making DropBoxManager call async."
2012-03-06 11:12:40 -08:00
Eric Laurent
7411d7dccb
Merge "MediaPlayerService: fix AudioSink latency"
2012-03-06 10:53:39 -08:00
Eric Laurent
c9a7dff0c3
Merge "AudioTrack: relax check on minimum buffer size"
2012-03-06 10:52:18 -08:00
Dianne Hackborn
d8cd73942f
Merge "Fix issues #6103378 and #5959515."
2012-03-06 10:34:18 -08:00
James Dong
194774b172
Merge "Remove unused code - MediaSourceSplitter"
2012-03-06 10:23:58 -08:00
James Dong
1aef28cbf9
Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object."
2012-03-06 10:23:51 -08:00
Siva Velusamy
2178dcf149
Merge "gltrace: Send vertex attribute data after glDraw() call."
2012-03-06 08:59:32 -08:00
Alex Sakhartchouk
5100c76b46
Merge "First draft of the sample function implementation."
2012-03-06 08:31:54 -08:00
Glenn Kasten
a440dc1562
Merge "Remove obsolete references to sched_policy.h"
2012-03-06 08:17:43 -08:00
Glenn Kasten
0a57c72933
Merge "Remove references to sched_policy.h"
2012-03-06 08:17:20 -08:00
Derek Sollenberger
e58faabea5
Merge "Add missing includes for Mutex.h"
2012-03-06 05:27:31 -08:00
Daniel Sandler
706342ad42
Merge changes I8343449c,I4eaf69a1
...
* changes:
New slide-out mechanism.
Newly reimplemented PhoneStatusBar, now with fewer windows.
2012-03-06 05:18:10 -08:00
Jeff Brown
975d9cf8f0
Merge "Rename remove callback methods."
2012-03-05 20:38:12 -08:00
Mathias Agopian
757507e3a0
Merge "Add ATRACEs for Buffer indices"
2012-03-05 19:41:29 -08:00
Jeff Brown
643c1d01c9
Merge "Support posting delayed animation/draw callbacks."
2012-03-05 19:05:02 -08:00
Glenn Kasten
4bcb57502c
Remove obsolete references to sched_policy.h
...
As part of scheduling policy cleanup, remove or isolate
all references to the scheduling policy APIs.
Change-Id: Ia1ea2fe711a399039f25217309e061267744b856
2012-03-05 18:12:45 -08:00
Mathias Agopian
12649cab53
Merge "fixup include paths"
2012-03-05 16:08:26 -08:00
Mathias Agopian
622cfadc8f
fixup include paths
...
- remove unneeded include deps
- remove some hardcoded include paths
Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
2012-03-05 15:59:38 -08:00
Nick Pelly
d8b7d456f7
Merge "Clarify docs for the thread used in BroadcastReceiver.onReceive()"
2012-03-05 15:57:13 -08:00
Jeff Brown
0ecfc0387c
Merge "Change widgets to post invalidate to the animation timer."
2012-03-05 15:38:47 -08:00
Guang Zhu
ffa4467add
Merge "Update to DumpRenderTree test harness"
2012-03-05 15:35:27 -08:00
Gilles Debunne
a61754a309
Merge "EditText caches only text in its internal display list."
2012-03-05 15:22:28 -08:00
Eric Fischer
864d32780b
Merge "Import translations. DO NOT MERGE"
2012-03-05 15:18:30 -08:00
Eric Fischer
f96926f5b9
Merge "Import translations. DO NOT MERGE"
2012-03-05 15:18:20 -08:00
Jean-Michel Trivi
98805bf7ee
Merge "Add channel mask in AudioSink"
2012-03-05 14:51:54 -08:00
Tom Taylor
5ea4707939
Merge "Remove deleted pdu items from the updated cache"
2012-03-05 14:47:27 -08:00
Scott Main
cd365a8ee9
am 5186f094: am 8b0f6881: am a47d88a7: docs: dashboard update for march 5
...
* commit '5186f094ba6d37f47ae52085e34dd87267ec41d4':
docs: dashboard update for march 5
2012-03-05 14:43:11 -08:00
Fabrice Di Meglio
180d116a38
Merge "Fix bug #5815381 [DA] [Android Gallery] [Cut string in "no-response" box]"
2012-03-05 14:40:50 -08:00
Scott Main
8dfeb57ef2
am 8b0f6881: am a47d88a7: docs: dashboard update for march 5
...
* commit '8b0f688156919cec527bc60df43c527d2dd940dc':
docs: dashboard update for march 5
2012-03-05 14:39:46 -08:00
Scott Main
d4d5f8e8bb
am a47d88a7: docs: dashboard update for march 5
...
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
2012-03-05 14:36:05 -08:00
Jim Miller
013580c27c
Merge "Fix 5958806: Allow play button to be hidden in TransportControlView"
2012-03-05 13:50:48 -08:00
Romain Guy
7e17bd0760
Merge "Delete display list objects and resources on the UI thread Bug #6073717 Bug #6065504 Bug #6026515 Bug #5971725 "
2012-03-05 13:48:55 -08:00
Jeff Brown
e68e91bf1b
Merge "Make SQLiteDatabase final."
2012-03-05 13:38:59 -08:00
Jeff Brown
51c9e44bf1
Merge "Don't log SQLITE_SCHEMA errors."
2012-03-05 13:38:24 -08:00
Fabrice Di Meglio
bd41735e5d
Merge "Fix bug #6029615 Update Javadoc for onPaddingChanged()"
2012-03-05 13:36:20 -08:00
Scott Main
5e35ba5eb7
am 7342817e: am afdf856d: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit '7342817ec382ad45dffdf48ad34e0805ed026a2a':
2012-03-05 13:35:05 -08:00
Scott Main
3191c0a5e5
am afdf856d: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit 'afdf856d432fe5bae56152e42cb2c28ba63a5af0':
2012-03-05 13:32:20 -08:00
Scott Main
e44ea4edc0
am 2814c8be: am 97aa69d3: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
...
* commit '2814c8be993ddfb2c64b0dcbeb1443427b3fca3d':
docs: add note about declaring file sizes with sample app's code
2012-03-05 13:30:15 -08:00
