OSDN Git Service
Jesse Wilson [Wed, 28 Dec 2011 00:42:24 +0000 (16:42 -0800)]
Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2"
Joe Fernandez [Thu, 22 Dec 2011 23:59:34 +0000 (15:59 -0800)]
am
201469f5: am
bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '
201469f54522436be79d4d6665721049bfc74320':
docs: Add developer guide cross-references, Project ACRE, round 4
Joe Fernandez [Thu, 22 Dec 2011 23:57:09 +0000 (15:57 -0800)]
am
bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '
bb7f590a5a539486de5127071c7ade8ec988d755':
docs: Add developer guide cross-references, Project ACRE, round 4
Joe Fernandez [Thu, 22 Dec 2011 23:55:00 +0000 (15:55 -0800)]
Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
Eric Laurent [Thu, 22 Dec 2011 23:54:38 +0000 (15:54 -0800)]
Merge "AudioService: simplified handler messages."
Robert Greenwalt [Thu, 22 Dec 2011 22:43:28 +0000 (14:43 -0800)]
Merge "Use shared connections over retries."
Roman Nurik [Thu, 22 Dec 2011 22:31:33 +0000 (14:31 -0800)]
am
38daf3f1: am
38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '
38daf3f122ac48b20d48779322ffc1a0fb9a3eb9':
docs: Update App Widgets dev guide size discussion
Roman Nurik [Thu, 22 Dec 2011 22:29:25 +0000 (14:29 -0800)]
am
38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '
38ee0dae2cf0ff1860973523e5cda6e38642e904':
docs: Update App Widgets dev guide size discussion
Roman Nurik [Thu, 22 Dec 2011 22:27:55 +0000 (14:27 -0800)]
Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
Jonathan Dixon [Thu, 22 Dec 2011 14:30:50 +0000 (06:30 -0800)]
Merge "Fix silly comment order error"
Irfan Sheriff [Wed, 21 Dec 2011 17:26:36 +0000 (09:26 -0800)]
Merge "p2p fixes"
Chet Haase [Wed, 21 Dec 2011 15:53:14 +0000 (07:53 -0800)]
Merge "Fix behavior of AnimationSet and fillBefore"
The Android Open Source Project [Wed, 21 Dec 2011 15:21:45 +0000 (07:21 -0800)]
am
7e4aa24c: Reconcile with ics-mr1-release
* commit '
7e4aa24c8701381f542a324df958907194285fdc':
The Android Open Source Project [Wed, 21 Dec 2011 15:19:20 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
The Android Automerger [Wed, 21 Dec 2011 01:27:07 +0000 (17:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 20 Dec 2011 21:11:53 +0000 (13:11 -0800)]
am
21cb1290: Reconcile with ics-mr1-release
* commit '
21cb1290b578a4bceac003c276c00911fcd6c9d4':
The Android Open Source Project [Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
Chet Haase [Tue, 20 Dec 2011 18:49:02 +0000 (10:49 -0800)]
Merge "Make behavior of ABSOLUTE pivot values more intuitive"
Gilles Debunne [Tue, 20 Dec 2011 18:46:42 +0000 (10:46 -0800)]
Merge "Rationalize blinking cursor test."
John Wang [Tue, 20 Dec 2011 18:45:32 +0000 (10:45 -0800)]
am
c0139281: am
c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit '
c01392816fbb16ca76c738bc801f3b2c34548c06':
Hide emergency call text if not support it.
John Wang [Tue, 20 Dec 2011 18:43:13 +0000 (10:43 -0800)]
am
c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit '
c892e177c4f7a41e910c70f68d4e213589da1396':
Hide emergency call text if not support it.
John Wang [Tue, 20 Dec 2011 18:41:08 +0000 (10:41 -0800)]
Merge "Hide emergency call text if not support it." into ics-mr1
Chet Haase [Tue, 20 Dec 2011 18:37:14 +0000 (10:37 -0800)]
Merge "Fix ViewAnimator.getDisplayedChild() bug"
Chet Haase [Tue, 20 Dec 2011 18:36:55 +0000 (10:36 -0800)]
Merge "Minor small fixes to old Animation code and docs."
Glenn Kasten [Tue, 20 Dec 2011 18:29:49 +0000 (10:29 -0800)]
Merge "Remove dead code"
Tom Taylor [Tue, 20 Dec 2011 18:15:26 +0000 (10:15 -0800)]
Merge "Received MMS is not displayed properly with 'Avea' SIM Card"
Jonathan Dixon [Tue, 20 Dec 2011 16:17:43 +0000 (08:17 -0800)]
Merge "Remove misleading API council comments"
Chet Haase [Tue, 20 Dec 2011 02:02:23 +0000 (18:02 -0800)]
Merge "Fix AnimationDrawable double-start bug"
Bill Gruber [Tue, 20 Dec 2011 01:47:21 +0000 (17:47 -0800)]
am
c296892a: am
1d56f41c: Doc Fix: Sensors and Cameras
* commit '
c296892aa2dee5f9e0fee376a2b97a4fa06f3f88':
Doc Fix: Sensors and Cameras
Bill Gruber [Tue, 20 Dec 2011 01:45:24 +0000 (17:45 -0800)]
am
1d56f41c: Doc Fix: Sensors and Cameras
* commit '
1d56f41c9d1dcccf1faef343047375cb14799678':
Doc Fix: Sensors and Cameras
Eric Laurent [Tue, 20 Dec 2011 01:26:24 +0000 (17:26 -0800)]
Merge "audio effects: rename configure command"
Nick Pelly [Mon, 19 Dec 2011 23:53:10 +0000 (15:53 -0800)]
Merge "Rewrite NDEF parsing in Java, clean-up API."
Bart Sears [Sun, 18 Dec 2011 23:38:59 +0000 (15:38 -0800)]
Merge "Add glyphs for Vertical Text"
Scott Main [Sun, 18 Dec 2011 22:05:23 +0000 (14:05 -0800)]
am
3204c523: am
8f04ae36: docs: fix sidenav typo
* commit '
3204c52377ca508709cb66b24398af58ca32efdd':
docs: fix sidenav typo
Scott Main [Sun, 18 Dec 2011 22:03:30 +0000 (14:03 -0800)]
am
8f04ae36: docs: fix sidenav typo
* commit '
8f04ae361cd34fdaea41fbedefb85cff2c684e36':
docs: fix sidenav typo
Chet Haase [Sat, 17 Dec 2011 18:20:14 +0000 (10:20 -0800)]
Merge "De-allocate caches for large glyphs when trimming memory"
Hong Teng [Fri, 16 Dec 2011 23:17:46 +0000 (15:17 -0800)]
Merge "Fix for
5754998 testPerformanceTransitionWithEffectOverlapping test failed."
Glenn Kasten [Fri, 16 Dec 2011 23:10:36 +0000 (15:10 -0800)]
Merge "Use constants for 2 and 32"
Glenn Kasten [Fri, 16 Dec 2011 23:02:30 +0000 (15:02 -0800)]
Merge "Extract out audio DSP code to utility library"
Jeff Brown [Fri, 16 Dec 2011 22:35:16 +0000 (14:35 -0800)]
Merge "Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer"
Elliott Hughes [Fri, 16 Dec 2011 22:04:51 +0000 (14:04 -0800)]
Merge "Fix the JNI documentation for ICS."
Chet Haase [Fri, 16 Dec 2011 21:59:49 +0000 (13:59 -0800)]
Merge "Make Property objects in View final"
Glenn Kasten [Fri, 16 Dec 2011 21:31:33 +0000 (13:31 -0800)]
Merge "Use switch in AudioMixer::setParameter"
Scott Main [Fri, 16 Dec 2011 20:59:03 +0000 (12:59 -0800)]
am
a2086cfc: am
df440164: docs: add driver info for Hisense
* commit '
a2086cfc12b5da29190a17eb415fc881c6adb880':
docs: add driver info for Hisense
Scott Main [Fri, 16 Dec 2011 20:56:33 +0000 (12:56 -0800)]
am
df440164: docs: add driver info for Hisense
* commit '
df440164ba09bcce8b409bb5a2d4a4ef8f704148':
docs: add driver info for Hisense
Jeff Brown [Fri, 16 Dec 2011 20:33:54 +0000 (12:33 -0800)]
Merge "Add plumbing for dumping database info using dumpsys."
Jeff Brown [Fri, 16 Dec 2011 20:33:46 +0000 (12:33 -0800)]
Merge "Make SQLiteQuery and SQLiteProgram final."
Jeff Brown [Fri, 16 Dec 2011 20:33:42 +0000 (12:33 -0800)]
Merge "Raise default connection pool size."
Dianne Hackborn [Fri, 16 Dec 2011 20:30:25 +0000 (12:30 -0800)]
Merge "Don't forget to close files."
Joe Onorato [Fri, 16 Dec 2011 20:27:03 +0000 (12:27 -0800)]
Merge "Add a new ui mode for "appliance""
Roman Nurik [Fri, 16 Dec 2011 20:09:51 +0000 (12:09 -0800)]
am
8cffc318: am
a8001e2a: am
00697a90: docs: Add missing intent flag to Android U nav class
* commit '
8cffc31810a7645c70183cfb0b43c8b78a299918':
docs: Add missing intent flag to Android U nav class
Roman Nurik [Fri, 16 Dec 2011 20:07:27 +0000 (12:07 -0800)]
am
a8001e2a: am
00697a90: docs: Add missing intent flag to Android U nav class
* commit '
a8001e2ae908c413b626a82f5ab925f18559509c':
docs: Add missing intent flag to Android U nav class
Roman Nurik [Fri, 16 Dec 2011 20:05:32 +0000 (12:05 -0800)]
am
00697a90: docs: Add missing intent flag to Android U nav class
* commit '
00697a90bec4e0536cfa0873602b64bb6785022e':
docs: Add missing intent flag to Android U nav class
The Android Automerger [Fri, 16 Dec 2011 20:01:35 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Fri, 16 Dec 2011 19:56:19 +0000 (11:56 -0800)]
am
9edb26ea: am
043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '
9edb26ea551bec24fa417a854ecec3801f15dc1d':
Cherry-picking Id45abeba and Ia065dec6 for MR1
Jeff Sharkey [Fri, 16 Dec 2011 19:56:06 +0000 (11:56 -0800)]
Merge "Include roaming in NetworkIdentity.hashCode()."
Justin Ho [Fri, 16 Dec 2011 19:54:01 +0000 (11:54 -0800)]
am
043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '
043c5f8f1d9a8e9077e1c16af28509b30f00324d':
Cherry-picking Id45abeba and Ia065dec6 for MR1
Justin Ho [Fri, 16 Dec 2011 19:52:08 +0000 (11:52 -0800)]
Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
Alexander Lucas [Fri, 16 Dec 2011 19:41:45 +0000 (11:41 -0800)]
am
f5ed1d4c: am
6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
* commit '
f5ed1d4c553de5d5e1fa1f8df52e6a2bba3ceb2e':
Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
Alexander Lucas [Fri, 16 Dec 2011 19:39:40 +0000 (11:39 -0800)]
am
6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
* commit '
6469ee8016d1e02673e05356b2590d3175dcd062':
Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
Alexander Lucas [Fri, 16 Dec 2011 19:38:05 +0000 (11:38 -0800)]
Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1
Scott Main [Fri, 16 Dec 2011 19:34:19 +0000 (11:34 -0800)]
am
5e7bed0b: am
0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '
5e7bed0b2a16c91d90bd274b4fdfe7c6718f11c2':
docs: fix whitespace in sidenav
Scott Main [Fri, 16 Dec 2011 19:32:24 +0000 (11:32 -0800)]
am
0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '
0f52d7666e83a7aa1979d65820ece865c7e1fd08':
docs: fix whitespace in sidenav
Scott Main [Fri, 16 Dec 2011 19:30:00 +0000 (11:30 -0800)]
Merge "docs: fix whitespace in sidenav" into ics-mr1
Roman Nurik [Fri, 16 Dec 2011 19:27:02 +0000 (11:27 -0800)]
am
1410f8a2: am
795c271f: am
eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '
1410f8a2a58beacc84f9e5444af6032f92ef6845':
docs: Minor link fix in Android U class
Roman Nurik [Fri, 16 Dec 2011 19:25:02 +0000 (11:25 -0800)]
am
795c271f: am
eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '
795c271f448704561cd1312dd51826dca82f392f':
docs: Minor link fix in Android U class
Roman Nurik [Fri, 16 Dec 2011 19:23:27 +0000 (11:23 -0800)]
am
eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '
eb946fbdc800d56e1cbac515a1c73de806e74711':
docs: Minor link fix in Android U class
Roman Nurik [Fri, 16 Dec 2011 19:21:59 +0000 (11:21 -0800)]
Merge "docs: Minor link fix in Android U class" into ics-mr0
Bill Gruber [Fri, 16 Dec 2011 19:17:49 +0000 (11:17 -0800)]
am
590ba7a4: am
e2a95b59: am
97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '
590ba7a4f03717ebe3171499637e3964c5860c8a':
Dev guide for sensors
Bill Gruber [Fri, 16 Dec 2011 19:15:46 +0000 (11:15 -0800)]
am
e2a95b59: am
97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '
e2a95b59f554d1d60b7e6c27d870158ec7051e31':
Dev guide for sensors
Bill Gruber [Fri, 16 Dec 2011 19:13:13 +0000 (11:13 -0800)]
am
97aafdf4: Merge "Dev guide for sensors" into ics-mr0
* commit '
97aafdf46e5007fa7b3f6eae4e54d692877ad824':
Dev guide for sensors
Bill Gruber [Fri, 16 Dec 2011 19:11:46 +0000 (11:11 -0800)]
Merge "Dev guide for sensors" into ics-mr0
Dirk Dougherty [Fri, 16 Dec 2011 19:00:49 +0000 (11:00 -0800)]
am
41a7998d: am
8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1
* commit '
41a7998df7350e27df6cfdb8683754c83552aab5':
Updated "Designing for Security" documentation
Dirk Dougherty [Fri, 16 Dec 2011 18:58:42 +0000 (10:58 -0800)]
am
8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1
* commit '
8c65ab81e84f36c311d2ae6831819a5caa404548':
Updated "Designing for Security" documentation
Dirk Dougherty [Fri, 16 Dec 2011 18:56:29 +0000 (10:56 -0800)]
Merge "Updated "Designing for Security" documentation" into ics-mr1
Scott Main [Fri, 16 Dec 2011 18:47:21 +0000 (10:47 -0800)]
Scott Main [Fri, 16 Dec 2011 18:45:22 +0000 (10:45 -0800)]
The Android Open Source Project [Fri, 16 Dec 2011 16:09:57 +0000 (08:09 -0800)]
am
57ea96a4: Reconcile with ics-mr1-release
* commit '
57ea96a4b3273aa8592873355a2f79c74b1abec1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
SurfaceMediaSource: use the HW_TEXTURE usage bit
The Android Open Source Project [Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
Jesse Wilson [Fri, 16 Dec 2011 15:37:22 +0000 (07:37 -0800)]
Merge "Give a reflection example for installing the HTTP response cache."
Jesse Wilson [Fri, 16 Dec 2011 15:36:32 +0000 (07:36 -0800)]
Merge "Track libcore tests moving from frameworks/base to libcore."
Glenn Kasten [Fri, 16 Dec 2011 15:30:14 +0000 (07:30 -0800)]
Merge "setActiveTrack and setBufferProvider can't fail"
Glenn Kasten [Fri, 16 Dec 2011 15:29:57 +0000 (07:29 -0800)]
Merge "Simplify enable/disable mixing"
Chet Haase [Fri, 16 Dec 2011 14:49:59 +0000 (06:49 -0800)]
Merge "Fix issues from recent glyph caching change"
Dirk Dougherty [Fri, 16 Dec 2011 08:27:42 +0000 (00:27 -0800)]
am
4365a486: am
8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
* commit '
4365a486126ecb20061f01d1e5c8e5f357045f18':
Doc change: edits to ICS MR1 API Overview.
Dirk Dougherty [Fri, 16 Dec 2011 08:25:06 +0000 (00:25 -0800)]
am
8b6ed2d1: Doc change: edits to ICS MR1 API Overview.
* commit '
8b6ed2d17d5e7e47944026679c9cba66611ab27f':
Doc change: edits to ICS MR1 API Overview.
Joe Fernandez [Fri, 16 Dec 2011 07:15:32 +0000 (23:15 -0800)]
am
9b06f091: am
5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit '
9b06f091c4d74415b18eb32f84ae931624b93f18':
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Joe Fernandez [Fri, 16 Dec 2011 07:12:57 +0000 (23:12 -0800)]
am
5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit '
5b18c714bbff269d7db880b42de34fd1385da9f9':
docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Joe Fernandez [Fri, 16 Dec 2011 07:11:26 +0000 (23:11 -0800)]
Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
Fred Chung [Fri, 16 Dec 2011 06:37:40 +0000 (22:37 -0800)]
am
d30167f0: am
14633f1b: am
48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '
d30167f0cda249c9a0d1d118d837d58f3c2b2c89':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Fred Chung [Fri, 16 Dec 2011 06:35:10 +0000 (22:35 -0800)]
am
14633f1b: am
48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '
14633f1b1eea585cdc094ebae75708db2293fe56':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Fred Chung [Fri, 16 Dec 2011 06:33:31 +0000 (22:33 -0800)]
am
48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '
48e0617b9e7d06da803c572d6584d68898733d37':
Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Scott Main [Fri, 16 Dec 2011 06:17:15 +0000 (22:17 -0800)]
am
ed8851a6: am
8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit '
ed8851a6f2e4d9477aaa20c333d7220901d8faeb':
docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Scott Main [Fri, 16 Dec 2011 06:14:48 +0000 (22:14 -0800)]
am
8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
* commit '
8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Scott Main [Fri, 16 Dec 2011 06:12:53 +0000 (22:12 -0800)]
Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1
Scott Main [Fri, 16 Dec 2011 06:12:08 +0000 (22:12 -0800)]
am
4faca92f: am
36c67785: docs: update homepage for 4.0.3 announcment
* commit '
4faca92faa13bcf5d6c2e76b226466066e5562a2':
docs: update homepage for 4.0.3 announcment
Scott Main [Fri, 16 Dec 2011 06:09:46 +0000 (22:09 -0800)]
am
36c67785: docs: update homepage for 4.0.3 announcment
* commit '
36c677855c0a54ede9e92aa856cb2250960e922e':
docs: update homepage for 4.0.3 announcment
The Android Automerger [Fri, 16 Dec 2011 04:50:02 +0000 (20:50 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Fri, 16 Dec 2011 04:24:47 +0000 (20:24 -0800)]
am
b193d241: am
4cb7d095: am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
b193d24145d84a1748cfdcffae56ebfe549ef940':
docs: fix encoding issue or whatever with docs (not showing titles)
Scott Main [Fri, 16 Dec 2011 04:22:39 +0000 (20:22 -0800)]
am
4cb7d095: am
98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '
4cb7d0953534587ba2051c6536fdde4b2c9539d5':
docs: fix encoding issue or whatever with docs (not showing titles)
OSDN Git Service
