John Reck
|
34b6062a7d
|
Merge "Fixup JNI" into ics-mr0
|
2011-10-14 10:10:07 -07:00 |
|
Jean-Michel Trivi
|
307ce544e6
|
am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0
* commit '9ad680ca2be19679c355de9526d79ded2887ea97':
Fix 5380695 Lockscreen transport control must reflect error state
|
2011-10-14 09:02:49 -07:00 |
|
Jean-Michel Trivi
|
8168da8612
|
Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0
|
2011-10-14 09:01:08 -07:00 |
|
Jean-Michel Trivi
|
7f197ba981
|
am b9c9cf65: Merge "Fix 5367082 correct assets for "next" and "previous" in lockscreen" into ics-mr0
* commit 'b9c9cf65308ed66ef825ecb485385d2b94e40f2c':
Fix 5367082 correct assets for "next" and "previous" in lockscreen
|
2011-10-14 08:46:09 -07:00 |
|
Jean-Michel Trivi
|
91aa8f76b8
|
am e48440d5: Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0
* commit 'e48440d59a52c0f13166da2fd32023356d9215d9':
Fix 5153611 remove remote control client/display log from AudioService
|
2011-10-14 08:46:08 -07:00 |
|
Jean-Michel Trivi
|
fa10ca926a
|
Merge "Fix 5367082 correct assets for "next" and "previous" in lockscreen" into ics-mr0
|
2011-10-14 08:44:50 -07:00 |
|
Jean-Michel Trivi
|
01a3a22f13
|
Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0
|
2011-10-14 08:44:15 -07:00 |
|
Mathew Inwood
|
5c94942890
|
Merge "Allow setting of source bounds on global search intents."
|
2011-10-14 06:35:26 -07:00 |
|
Scott Main
|
62903145b7
|
am 23b80f08: Merge "docs: add new screenshots for hc gallery sample" into ics-mr0
* commit '23b80f083b0a2ccd26f37298d4f9611de3857a31':
docs: add new screenshots for hc gallery sample
|
2011-10-14 05:01:56 -07:00 |
|
Scott Main
|
ae4757e43c
|
am 6b1531ee: Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0
* commit '6b1531eec06abebb0c786556e12411fbef5a0f62':
docs: preliminary homepage announcement (offline version)
|
2011-10-14 04:28:05 -07:00 |
|
Scott Main
|
494c27679b
|
Merge "docs: add new screenshots for hc gallery sample" into ics-mr0
|
2011-10-14 04:19:36 -07:00 |
|
Scott Main
|
07a2eef3ce
|
Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0
|
2011-10-14 04:00:03 -07:00 |
|
Scott Main
|
d24a670ac7
|
am e1e9e937: docs: revisions to ics api overview
* commit 'e1e9e9379dc1236e15bd379f2bdc871c096a882c':
docs: revisions to ics api overview
|
2011-10-14 03:49:33 -07:00 |
|
Steven Ross
|
4ffac6d06d
|
am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0
* commit '3406886939b0f28c426acefbe9dc77292210d8b4':
Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341
|
2011-10-13 21:04:15 -07:00 |
|
Steven Ross
|
5f79dbff1f
|
Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0
|
2011-10-13 21:02:15 -07:00 |
|
Brian Colonna
|
507c1f75aa
|
am 2ce6882b: Fixed problem where Face Unlock area was showing
* commit '2ce6882bb498c93af114626daa79cfa4f3f4e366':
Fixed problem where Face Unlock area was showing
|
2011-10-13 20:03:55 -07:00 |
|
Brian Colonna
|
be1ca3ed4b
|
am 3505abf3: Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0
* commit '3505abf31df8dafab2c83ceb8f85b5694cac3b78':
Fix 5451144: Poking wakelock upon fallback
|
2011-10-13 18:21:50 -07:00 |
|
Brian Colonna
|
298bced6ff
|
Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0
|
2011-10-13 18:19:30 -07:00 |
|
Wink Saville
|
8412104379
|
am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
* commit '8a058cbf12c590db810fe8d9fab6f4f614909329':
In releaseWifiLockLocked call noteReleaseWifiLock.
|
2011-10-13 17:42:58 -07:00 |
|
Wink Saville
|
df341cb7fb
|
Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
|
2011-10-13 17:40:01 -07:00 |
|
Kenny Root
|
7d285e53d5
|
am 22dad40d: Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
* commit '22dad40d3e8ce54a00f337ea06b9b0bbfbd3fd6b':
Add support for signature in getPackageArchiveInfo
|
2011-10-13 17:12:35 -07:00 |
|
Kenny Root
|
5850db5e08
|
Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
|
2011-10-13 17:10:17 -07:00 |
|
Peter Ng
|
5f03e7334b
|
am dcb4e158: (-s ours) Merge "Do Not Merge darker notification press state and divider" into ics-mr0
* commit 'dcb4e158bcddb8266afaf863ae8832b92bed62a7':
Do Not Merge darker notification press state and divider
|
2011-10-13 16:58:03 -07:00 |
|
The Android Automerger
|
3cb5b7adc7
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-10-13 16:57:44 -07:00 |
|
Peter Ng
|
b044398702
|
Merge "Do Not Merge darker notification press state and divider" into ics-mr0
|
2011-10-13 16:56:01 -07:00 |
|
Gilles Debunne
|
a8708b1188
|
Merge "Bug 5228934: added a flag to disable the display of the soft input on focus"
|
2011-10-13 16:54:23 -07:00 |
|
Martijn Coenen
|
74b810de05
|
am 19fa262c: Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0
* commit '19fa262c52ddaf0e5ec200f4f7f21bda0d4b617b':
Send ACTION_USER_PRESENT when provisioning is completed.
|
2011-10-13 16:48:58 -07:00 |
|
Martijn Coenen
|
8f96fee292
|
Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0
|
2011-10-13 16:47:02 -07:00 |
|
Dianne Hackborn
|
ea5e45e027
|
am 97e9ea98: Merge "Fix bug with CLEAR_TASK -- wouldn\'t clear the top activity." into ics-mr0
* commit '97e9ea98afac197722d7620d5fd09a8c06aafe3a':
Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
|
2011-10-13 16:45:56 -07:00 |
|
Dianne Hackborn
|
d0f7dfdfa9
|
Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0
|
2011-10-13 16:44:26 -07:00 |
|
Dave Santoro
|
3883816fd5
|
am e6063299: Merge "Add hidden API for pre-authorizing URIs." into ics-mr0
* commit 'e6063299d874cc3b9d1fa71d0c3772c6ebe62e06':
Add hidden API for pre-authorizing URIs.
|
2011-10-13 16:34:17 -07:00 |
|
Dave Santoro
|
ae600db04a
|
Merge "Add hidden API for pre-authorizing URIs." into ics-mr0
|
2011-10-13 16:32:17 -07:00 |
|
Bart Sears
|
16b442ce47
|
am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
* commit 'bcfe41529b7bd9f572a2eff31375dc9fdf35b518':
Improve JavaDoc for WebView.loadData()
|
2011-10-13 16:27:16 -07:00 |
|
Bart Sears
|
a567281674
|
Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
|
2011-10-13 16:25:29 -07:00 |
|
Jim Miller
|
f7d824e0c3
|
am 6252a8b1: Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0
* commit '6252a8b1167934d53fd76d5f0910d993390636ce':
Fix 5386408: Send accessibility event when a recent app is removed.
|
2011-10-13 16:23:28 -07:00 |
|
Jim Miller
|
276d2b76bb
|
Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0
|
2011-10-13 16:21:51 -07:00 |
|
Adam Powell
|
f33e58c69b
|
am 50b15348: Merge "Bug 5312828 - Menu button not responding" into ics-mr0
* commit '50b15348c5b61472b5ed02434968b5a035765b63':
Bug 5312828 - Menu button not responding
|
2011-10-13 16:15:17 -07:00 |
|
Adam Powell
|
8bb55b80f2
|
Merge "Bug 5312828 - Menu button not responding" into ics-mr0
|
2011-10-13 16:13:55 -07:00 |
|
Jason Sams
|
ad0c31fd6b
|
am 43b57ec4: Fix error printing if no command string is set.
* commit '43b57ec48ec7652addc11bbc9fef652c2394b7f5':
Fix error printing if no command string is set.
|
2011-10-13 16:13:07 -07:00 |
|
Justin Ho
|
31cae5952f
|
am 846601a1: Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0
* commit '846601a1627a3be8f87601c13b87a22a6dbfafb4':
Revert "Updated volume rocker assets for ring notification icon"
|
2011-10-13 15:25:17 -07:00 |
|
Justin Ho
|
a4271fd5a7
|
Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0
|
2011-10-13 15:23:20 -07:00 |
|
Justin Ho
|
afccbdd911
|
am 210ccb81: Merge "Updated wifi in range status bar notification icon" into ics-mr0
* commit '210ccb8110be9297acc94975d97156ee8ee2d61b':
Updated wifi in range status bar notification icon
|
2011-10-13 15:20:04 -07:00 |
|
Justin Ho
|
bca91030f5
|
am b5e8a295: Merge "Updated volume rocker assets for ring notification icon" into ics-mr0
* commit 'b5e8a2955a45ab9f5409a8227b96d75d01cdfa5d':
Updated volume rocker assets for ring notification icon
|
2011-10-13 15:20:02 -07:00 |
|
Justin Ho
|
3c17d07f4a
|
am 96ae383d: Merge "Updated speakerphone asset" into ics-mr0
* commit '96ae383d9efbae8eb6a28d194de20ba03cb610e8':
Updated speakerphone asset
|
2011-10-13 15:20:01 -07:00 |
|
Justin Ho
|
b399f4505c
|
am 41f45e49: Merge "Updated stat_sys wifi icons" into ics-mr0
* commit '41f45e4969565d21f7d49b2b1cf828e27af73efa':
Updated stat_sys wifi icons
|
2011-10-13 15:19:59 -07:00 |
|
Justin Ho
|
fcc8fd0894
|
Merge "Updated wifi in range status bar notification icon" into ics-mr0
|
2011-10-13 15:17:34 -07:00 |
|
Justin Ho
|
91f2cd746b
|
am 86e12a82: Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0
* commit '86e12a82d2c25b04cbd2b51fb50b900b459593cd':
Updated Systembar back and highlight assets Bug: 5411737
|
2011-10-13 15:17:26 -07:00 |
|
Justin Ho
|
1d1409ef11
|
am caea6473: Merge "Updated cut actionbar icon" into ics-mr0
* commit 'caea6473b46618040c8a8e611618e2c39d3506bf':
Updated cut actionbar icon
|
2011-10-13 15:17:25 -07:00 |
|
Justin Ho
|
ab89bee0ed
|
Merge "Updated volume rocker assets for ring notification icon" into ics-mr0
|
2011-10-13 15:17:22 -07:00 |
|
Justin Ho
|
f16510b128
|
Merge "Updated speakerphone asset" into ics-mr0
|
2011-10-13 15:16:52 -07:00 |
|