OSDN Git Service
Scott Main [Thu, 15 Dec 2011 23:58:33 +0000 (15:58 -0800)]
am
19552e95: am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
19552e95db26d96977daa42cda4de8e58c6feb0a':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 23:55:31 +0000 (15:55 -0800)]
am
d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '
d25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 21:14:41 +0000 (13:14 -0800)]
am
43834487: docs: remove some "new" tags from side navs
* commit '
43834487a183b69783b0de270f9b761f3afffdc1':
docs: remove some "new" tags from side navs
Scott Main [Thu, 15 Dec 2011 19:11:39 +0000 (11:11 -0800)]
am
481cd5a8: am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
Android U Class: Monetization / Ads without Compromising User Experience
Scott Main [Thu, 15 Dec 2011 19:08:51 +0000 (11:08 -0800)]
am
3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '
3d672e1e789e171e913605945efe95a477ab0505':
Android U Class: Monetization / Ads without Compromising User Experience
Scott Main [Thu, 15 Dec 2011 18:43:46 +0000 (10:43 -0800)]
am
cf927f22: am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
cf927f229f55849caf3461621023b5bd61908334':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Scott Main [Thu, 15 Dec 2011 18:41:18 +0000 (10:41 -0800)]
am
aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit '
aed4ced6556383483209f454c9e4872e8ad28ebf':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
Scott Main [Thu, 15 Dec 2011 18:15:21 +0000 (10:15 -0800)]
am
e4e6c066: am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
Docs: Training class on Identifying and Authenticating Users.
Scott Main [Thu, 15 Dec 2011 18:13:07 +0000 (10:13 -0800)]
am
f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit '
f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
Docs: Training class on Identifying and Authenticating Users.
Dianne Hackborn [Thu, 15 Dec 2011 02:19:42 +0000 (18:19 -0800)]
am
399f1df3: Merge "Fix some java docs." into ics-mr1
* commit '
399f1df38594ea8bc927ad23bfbde996a9dc161d':
Fix some java docs.
Dianne Hackborn [Thu, 15 Dec 2011 02:18:29 +0000 (18:18 -0800)]
Merge "Fix some java docs." into ics-mr1
Dirk Dougherty [Thu, 15 Dec 2011 01:22:59 +0000 (17:22 -0800)]
am
26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
* commit '
26bd66df4fc8caa7885fe3a4e78e379389a24a94':
Doc change: add MR1 API summary and updated highlights.
Dirk Dougherty [Thu, 15 Dec 2011 01:21:13 +0000 (17:21 -0800)]
Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
The Android Open Source Project [Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
Scott Main [Wed, 14 Dec 2011 22:58:02 +0000 (14:58 -0800)]
am
d1f2b7cc: am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
d1f2b7ccb7e8672f0af9f940864111c8dbe1ff80':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:56:02 +0000 (14:56 -0800)]
am
b8ea1f93: am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
b8ea1f93bb97c2aa0a3fffaa12aaaa8923449b4c':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:55:44 +0000 (14:55 -0800)]
am
56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '
56a3e326192c7496b67666b29071dc9f38c59da9':
docs: add Android U class for "Improving Performance of Layouts"
Scott Main [Wed, 14 Dec 2011 22:53:40 +0000 (14:53 -0800)]
am
4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '
4dc763c700f79e33030e96eefabf8e5047cb9cb1':
doc change: Android U lessons for audio and battery
Scott Main [Wed, 14 Dec 2011 22:53:04 +0000 (14:53 -0800)]
Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
Scott Main [Wed, 14 Dec 2011 22:51:30 +0000 (14:51 -0800)]
Merge "doc change: Android U lessons for audio and battery" into ics-mr0
Scott Main [Wed, 14 Dec 2011 22:42:57 +0000 (14:42 -0800)]
am
691fea72: am
70645e36: Docs: Add class for Sharing Content
* commit '
691fea726dbefe2a7142b403bfc47f5c9029f61a':
Docs: Add class for Sharing Content
Scott Main [Wed, 14 Dec 2011 22:40:19 +0000 (14:40 -0800)]
am
70645e36: Docs: Add class for Sharing Content
* commit '
70645e363e8601550468b726251f4f52f383b9fc':
Docs: Add class for Sharing Content
James Dong [Wed, 14 Dec 2011 21:50:08 +0000 (13:50 -0800)]
am
d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit '
d70c64db9f67dbe8f888de6b1bdcc835226ec526':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
The Android Open Source Project [Wed, 14 Dec 2011 03:10:19 +0000 (19:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
Dirk Dougherty [Wed, 14 Dec 2011 02:35:10 +0000 (18:35 -0800)]
am
2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1
* commit '
2e335cb02891d3653b938340a11698844e2c3d6d':
Doc change: API diff report for 15.
Dirk Dougherty [Wed, 14 Dec 2011 02:33:04 +0000 (18:33 -0800)]
Merge "Doc change: API diff report for 15." into ics-mr1
The Android Automerger [Wed, 14 Dec 2011 00:03:26 +0000 (16:03 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 23:41:54 +0000 (15:41 -0800)]
am
caa8e69a: Merge "Fix issue #
5756204: Crespo IME briefly appears shortened when..." into ics-mr1
* commit '
caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
Fix issue #
5756204: Crespo IME briefly appears shortened when...
Dianne Hackborn [Tue, 13 Dec 2011 23:40:18 +0000 (15:40 -0800)]
Merge "Fix issue #
5756204: Crespo IME briefly appears shortened when..." into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 23:38:43 +0000 (15:38 -0800)]
am
19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
* commit '
19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
Do not spell check the foreground ExtractEditText.
Gilles Debunne [Tue, 13 Dec 2011 23:36:48 +0000 (15:36 -0800)]
Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 21:42:07 +0000 (13:42 -0800)]
am
19a06fe9: Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '
19a06fe93cccb4b1dd224b8456969821a19b07ef':
Fix issue #
5755172: Soft menu key disappears when menu is open
Gilles Debunne [Tue, 13 Dec 2011 21:40:00 +0000 (13:40 -0800)]
am
67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
* commit '
67d54ac017494229eed27a184159461d63201a9f':
NPE in GMail / TextLine
Dianne Hackborn [Tue, 13 Dec 2011 21:38:56 +0000 (13:38 -0800)]
Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 21:37:29 +0000 (13:37 -0800)]
Merge "NPE in GMail / TextLine" into ics-mr1
Scott Main [Tue, 13 Dec 2011 21:13:15 +0000 (13:13 -0800)]
am
c9295b20: am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
c9295b2069af6530fba37a16c88757acaaff63e8':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:13:07 +0000 (13:13 -0800)]
am
37191e1d: am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
37191e1dc783a5558eb8ee4f096bd8350c34415d':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 21:10:45 +0000 (13:10 -0800)]
am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:10:42 +0000 (13:10 -0800)]
am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 20:25:38 +0000 (12:25 -0800)]
Merge "Created Android University lesson for Multiple APKs." into ics-mr0
Andreas Huber [Tue, 13 Dec 2011 20:01:46 +0000 (12:01 -0800)]
am
3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '
3ab630084071eb5dc7f92b4a8a617f8cef10c514':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
Andreas Huber [Tue, 13 Dec 2011 19:59:50 +0000 (11:59 -0800)]
Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
The Android Open Source Project [Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
The Android Automerger [Tue, 13 Dec 2011 06:08:59 +0000 (22:08 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Sharkey [Tue, 13 Dec 2011 04:21:34 +0000 (20:21 -0800)]
am
f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit '
f0bbc494d638f4c77e688bf9410027f453301559':
Avoid NPE when missing network stats.
Jeff Sharkey [Tue, 13 Dec 2011 04:19:27 +0000 (20:19 -0800)]
Merge "Avoid NPE when missing network stats." into ics-mr1
Mike Cleron [Tue, 13 Dec 2011 02:17:46 +0000 (18:17 -0800)]
am
840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
* commit '
840201d6e2d7d53e42a31ffeb2ef454982882d12':
Update VIBRATE_ON to a supported value when upgrading from GB.
Mike Cleron [Tue, 13 Dec 2011 02:15:59 +0000 (18:15 -0800)]
Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 01:04:04 +0000 (17:04 -0800)]
Dianne Hackborn [Tue, 13 Dec 2011 00:12:40 +0000 (16:12 -0800)]
am
a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
* commit '
a1279586dd1a866dd58d669aa0980d71f6c589d9':
SDK only: now that support lib is in SDK, we can link to it.
Dianne Hackborn [Tue, 13 Dec 2011 00:09:54 +0000 (16:09 -0800)]
Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:56:33 +0000 (15:56 -0800)]
am
a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1
* commit '
a1277de3c393fb0861d26ec5551ae4247e32dee4':
Prevent a memory leak in TextLine.
Gilles Debunne [Mon, 12 Dec 2011 23:54:38 +0000 (15:54 -0800)]
am
1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1
* commit '
1fb90497b73b1560c55f1cb73cd394c3b8714212':
Text blinking cursor hard to see.
Gilles Debunne [Mon, 12 Dec 2011 23:53:25 +0000 (15:53 -0800)]
Merge "Prevent a memory leak in TextLine." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:52:39 +0000 (15:52 -0800)]
Merge "Text blinking cursor hard to see." into ics-mr1
Adam Powell [Mon, 12 Dec 2011 23:42:22 +0000 (15:42 -0800)]
am
9c92fcd9: Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
* commit '
9c92fcd91c67a98f3a767255e7d3748bca3ef751':
Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
Adam Powell [Mon, 12 Dec 2011 23:40:00 +0000 (15:40 -0800)]
Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
Jamie Gennis [Mon, 12 Dec 2011 22:12:33 +0000 (14:12 -0800)]
am
a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
* commit '
a1dee3f500eccedbf5e50d466315fb28ba812cfc':
SurfaceTexture: fix a verbose-log compile error
Jamie Gennis [Mon, 12 Dec 2011 22:10:04 +0000 (14:10 -0800)]
Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
Raphael [Mon, 12 Dec 2011 21:16:35 +0000 (13:16 -0800)]
am
2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit '
2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
Raphael [Mon, 12 Dec 2011 21:14:12 +0000 (13:14 -0800)]
Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
Matthew Xie [Mon, 12 Dec 2011 20:09:13 +0000 (12:09 -0800)]
am
ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
* commit '
ed0830c502d7403d69abfd8247c046ac2746ac8c':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
Matthew Xie [Mon, 12 Dec 2011 20:07:39 +0000 (12:07 -0800)]
Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
Eric Fischer [Mon, 12 Dec 2011 19:06:38 +0000 (11:06 -0800)]
am
386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
386f208489d85d81755b64e92a84290953accfc0':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 12 Dec 2011 19:04:39 +0000 (11:04 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Open Source Project [Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
The Android Open Source Project [Mon, 12 Dec 2011 15:47:34 +0000 (07:47 -0800)]
Merge from ics-mr1
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
The Android Automerger [Sat, 10 Dec 2011 00:17:04 +0000 (16:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Fri, 9 Dec 2011 23:43:48 +0000 (15:43 -0800)]
am
1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
* commit '
1cec30a182c1963beda4b6f11cfae9fa38061e68':
Quick settings icons updated to match ics style on tablet
Justin Ho [Fri, 9 Dec 2011 23:42:10 +0000 (15:42 -0800)]
Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
Jamie Gennis [Fri, 9 Dec 2011 23:07:44 +0000 (15:07 -0800)]
SurfaceTexture: fix a verbose-log compile error
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
Jeff Tinker [Fri, 9 Dec 2011 19:13:39 +0000 (11:13 -0800)]
am
ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit '
ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
Jeff Tinker [Fri, 9 Dec 2011 19:11:56 +0000 (11:11 -0800)]
Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
Joe Fernandez [Fri, 9 Dec 2011 18:47:59 +0000 (10:47 -0800)]
am
4b3227de: am
89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '
4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
Joe Fernandez [Fri, 9 Dec 2011 18:45:44 +0000 (10:45 -0800)]
am
89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '
89c3bc38421a3f01b39f0246e53884bdf8b14415':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
Joe Fernandez [Fri, 9 Dec 2011 18:43:32 +0000 (10:43 -0800)]
Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
Gilles Debunne [Fri, 9 Dec 2011 17:36:23 +0000 (09:36 -0800)]
am
caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1
* commit '
caf4ead320499cc9a7a2e3eb17beaaf92b391212':
Blinking cursor in Talk
Gilles Debunne [Fri, 9 Dec 2011 17:34:04 +0000 (09:34 -0800)]
Merge "Blinking cursor in Talk" into ics-mr1
The Android Open Source Project [Fri, 9 Dec 2011 15:11:09 +0000 (07:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
The Android Automerger [Fri, 9 Dec 2011 14:58:10 +0000 (06:58 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
James Dong [Fri, 9 Dec 2011 08:17:56 +0000 (00:17 -0800)]
am
aadbd80b: Fixed the false drm recognition.
* commit '
aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
Gilles Debunne [Fri, 9 Dec 2011 02:35:22 +0000 (18:35 -0800)]
am
be5f49fb: Performance improvements for long text edition.
* commit '
be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
Performance improvements for long text edition.
Gilles Debunne [Fri, 9 Dec 2011 02:19:57 +0000 (18:19 -0800)]
am
df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
* commit '
df3722895172e03c81787f62d922daabaad3e20b':
Fixed SpellCheckerSessions leak in TextView
Gilles Debunne [Fri, 9 Dec 2011 02:18:25 +0000 (18:18 -0800)]
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
Gilles Debunne [Fri, 9 Dec 2011 02:00:12 +0000 (18:00 -0800)]
am
316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
* commit '
316ca5059ebd7270a04da5649d25653c355e158d':
Re-use SpanSets in TextLine
Gilles Debunne [Fri, 9 Dec 2011 01:58:24 +0000 (17:58 -0800)]
Merge "Re-use SpanSets in TextLine" into ics-mr1
Joe Malin [Fri, 9 Dec 2011 01:46:44 +0000 (17:46 -0800)]
am
556e4ca5: am
0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '
556e4ca54161be17333ec98fadc113485120a6e8':
DOC CHANGE: Package text and Formatter javadoc
Joe Malin [Fri, 9 Dec 2011 01:44:34 +0000 (17:44 -0800)]
am
0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '
0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
DOC CHANGE: Package text and Formatter javadoc
Joe Malin [Fri, 9 Dec 2011 01:42:36 +0000 (17:42 -0800)]
Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
The Android Automerger [Fri, 9 Dec 2011 01:35:27 +0000 (17:35 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chia-chi Yeh [Fri, 9 Dec 2011 01:24:16 +0000 (17:24 -0800)]
am
46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
* commit '
46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
VPN: delete the "abort" file before starting VPN daemons.
Chia-chi Yeh [Fri, 9 Dec 2011 01:22:16 +0000 (17:22 -0800)]
Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
Irfan Sheriff [Fri, 9 Dec 2011 00:01:59 +0000 (16:01 -0800)]
am
97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1
* commit '
97ff7893321362020211fae3c5a52b95c3ec19e1':
Fix wifi bring up at boot up
Irfan Sheriff [Thu, 8 Dec 2011 23:59:26 +0000 (15:59 -0800)]
Merge "Fix wifi bring up at boot up" into ics-mr1
Jake Hamby [Thu, 8 Dec 2011 23:53:42 +0000 (15:53 -0800)]
am
c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
* commit '
c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
Jake Hamby [Thu, 8 Dec 2011 23:51:33 +0000 (15:51 -0800)]
Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:35:53 +0000 (13:35 -0800)]
am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
68f592a8210af27df4339089bbee47fb602cae6a':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Thu, 8 Dec 2011 21:35:51 +0000 (13:35 -0800)]
am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:06 +0000 (13:33 -0800)]
Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
OSDN Git Service
