Robert Ly
|
fd6d9a0309
|
Merge "docs: tools and adt notes"
|
2011-10-06 13:54:42 -07:00 |
|
Christopher Tate
|
00d87d6040
|
Merge "Disable db_sample logging"
|
2011-10-06 13:09:58 -07:00 |
|
Christopher Tate
|
06877a7b5c
|
Merge "Prevent concurrent backup operations"
|
2011-10-06 13:09:52 -07:00 |
|
Xavier Ducrohet
|
1b22b98a43
|
Merge "Update dev guide for new build system and new lib system."
|
2011-10-06 12:56:58 -07:00 |
|
Irfan Sheriff
|
e156080204
|
Merge "Mobile hotspot provision string"
|
2011-10-06 12:42:48 -07:00 |
|
Daniel Sandler
|
f6dd719953
|
Merge "Cascading clear-all in the phone notifications panel."
|
2011-10-06 12:40:53 -07:00 |
|
Chet Haase
|
7b4bdab36e
|
Merge "Fix issue #5384631: hw windows not resizing correctly"
|
2011-10-06 12:14:26 -07:00 |
|
Jeff Sharkey
|
fdc6ca5527
|
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
* commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf':
Hide quota APIs until finalized.
|
2011-10-06 11:22:40 -07:00 |
|
Jeff Sharkey
|
a12e2cc771
|
Merge "Hide quota APIs until finalized." into ics-factoryrom
|
2011-10-06 11:19:29 -07:00 |
|
Scott Main
|
be9758fea5
|
Merge "docs: add new action item and state list drawable resource attributes"
|
2011-10-06 11:19:25 -07:00 |
|
Eric Fischer
|
402cd45604
|
am 2fc826ec: (-s ours) Import translations for late permission additions.
* commit '2fc826ec944cf85d1c3e65011091c58dc94110c0':
Import translations for late permission additions.
|
2011-10-06 11:03:18 -07:00 |
|
Wink Saville
|
b2c098a902
|
Merge "Set mGotCountryCode properly."
|
2011-10-06 10:52:13 -07:00 |
|
Steve Block
|
378903492e
|
Merge "Improve a warning message in WebViewCore's EventHub"
|
2011-10-06 10:35:33 -07:00 |
|
Ben Murdoch
|
b8cafd85c6
|
Merge "Pass correct units for text size in autocomplete drop down."
|
2011-10-06 10:23:20 -07:00 |
|
John Reck
|
42101dbaec
|
Merge "Prevent adapter flickering"
|
2011-10-06 10:22:03 -07:00 |
|
Roman Nurik
|
b670684013
|
Merge "Mark random music player sample as updated in the resource TOC"
|
2011-10-06 10:11:32 -07:00 |
|
Andreas Huber
|
0062eff837
|
Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."
|
2011-10-06 09:17:14 -07:00 |
|
Steve Block
|
3b00604f35
|
Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty"
|
2011-10-06 08:48:52 -07:00 |
|
Justin Ho
|
a7163253f1
|
Merge "primary progress updated to fix clipping problem"
|
2011-10-06 07:39:11 -07:00 |
|
Justin Ho
|
554be3acde
|
Merge "scrubber assets updated to larger size"
|
2011-10-06 07:39:03 -07:00 |
|
Jeff Sharkey
|
fe5a88d9de
|
Merge "Refine random stats generation."
|
2011-10-05 23:38:44 -07:00 |
|
Michael Jurka
|
dc056cb5d9
|
Merge "Adding logging to debug widget deletions"
|
2011-10-05 22:11:19 -07:00 |
|
Mathias Agopian
|
0e8bbee577
|
don't log EGL errors due to unimplemented proprietary extensions
Change-Id: Icfc33d4f55d1e7fb49390ce0921ba37a438c9fc2
|
2011-10-05 19:15:32 -07:00 |
|
Jeff Brown
|
0d13e57bcf
|
Merge "Fix build."
|
2011-10-05 19:11:04 -07:00 |
|
Jim Miller
|
88d0289823
|
Merge "Fix 5396647: Move lock slider up by 10dip on lock screen."
|
2011-10-05 19:08:28 -07:00 |
|
Roman Nurik
|
368bd81bb5
|
Merge "Add ActionBarCompat sample (CL 2 of 2)"
|
2011-10-05 18:24:42 -07:00 |
|
Jeff Brown
|
1ccc6a8968
|
Merge "Fix build."
|
2011-10-05 18:09:41 -07:00 |
|
Eric Laurent
|
475a271e45
|
Merge "Fix issue 5381089: problem with A2DP music volume"
|
2011-10-05 18:02:54 -07:00 |
|
Jeff Brown
|
9f5a5e1be1
|
Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750"
|
2011-10-05 17:24:29 -07:00 |
|
Richard Ngo
|
c81cfa0c59
|
Merge "updated blue border for stackviews to new holo blue"
|
2011-10-05 17:23:33 -07:00 |
|
Fabrice Di Meglio
|
a02befe824
|
Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
|
2011-10-05 17:12:17 -07:00 |
|
Irfan Sheriff
|
68d2146f16
|
Merge "Add a time threshold for re-enabling networks"
|
2011-10-05 16:34:40 -07:00 |
|
The Android Open Source Project
|
73dcb60832
|
Reconcile with ics-factoryrom-release
Change-Id: I656e0ea68c6bf350f391a3922884216955997686
|
2011-10-05 16:16:03 -07:00 |
|
George Mount
|
0b263afd34
|
Merge "Fix monkey NullPointerException"
|
2011-10-05 15:33:46 -07:00 |
|
Mathias Agopian
|
2eaf5f53ed
|
Merge "Force a repaint when hwc invalidate hook is called"
|
2011-10-05 15:09:46 -07:00 |
|
Mathias Agopian
|
e2c2f9213f
|
Force a repaint when hwc invalidate hook is called
without this prepare() would be called but not set() since the
dirty region is empty.
Change-Id: I038acfbdad4c16015357ccde4d1949391d6f989d
|
2011-10-05 15:00:22 -07:00 |
|
Steve Block
|
a9c3a5f3f2
|
Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision"
|
2011-10-05 14:56:21 -07:00 |
|
Dirk Dougherty
|
f960450aeb
|
Merge "Doc change: add diffs for API level 14."
|
2011-10-05 14:09:49 -07:00 |
|
Brian Colonna
|
9af6198b38
|
Merge "Added callback for Face Unlock service to poke the wakelock"
|
2011-10-05 13:58:59 -07:00 |
|
Steven Ross
|
7162b539ff
|
Merge "Killing Facelock when a phonecall comes in"
|
2011-10-05 12:46:27 -07:00 |
|
Scott Main
|
c836a957bb
|
Merge "docs: add sample spellcheckerservice to resources docs"
|
2011-10-05 12:26:31 -07:00 |
|
Jason Sams
|
badf8a55e2
|
Merge "Wrapping new API with #defines to prevent old apps from using them."
|
2011-10-05 12:01:51 -07:00 |
|
Nicolas Roard
|
d876231e77
|
Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work."
|
2011-10-05 11:35:29 -07:00 |
|
Dianne Hackborn
|
1186816d75
|
Merge "Always unfreeze display."
|
2011-10-05 11:25:19 -07:00 |
|
Dianne Hackborn
|
eafaafa724
|
Merge "Some new ICS target SDK changes."
|
2011-10-05 11:25:02 -07:00 |
|
Dianne Hackborn
|
2225e995e1
|
Merge "Fix issue #5348948: Third Party app "Byki Turkish" shows..."
|
2011-10-05 11:15:13 -07:00 |
|
Andreas Huber
|
ea42e614bf
|
Merge "Set crop params to ANative Window during Initialization."
|
2011-10-05 10:36:20 -07:00 |
|
Irfan Sheriff
|
19bc6e3877
|
Merge "Handle unexpected interface up/down events"
|
2011-10-05 10:03:54 -07:00 |
|
Steve Block
|
8ed8980188
|
Merge changes I447cd196,I0c6cdae4
* changes:
SSL-related cleanup in BrowserFrame and SslCertLookupTable
Clean up SslErrorHandlerImpl
|
2011-10-05 10:00:59 -07:00 |
|
Steve Block
|
b90050cf56
|
Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host"
|
2011-10-05 09:46:27 -07:00 |
|