OSDN Git Service
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug:
5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
John Reck [Wed, 4 Jan 2012 18:52:35 +0000 (10:52 -0800)]
Merge "Fix Apache stack"
Steve Block [Wed, 4 Jan 2012 18:13:13 +0000 (10:13 -0800)]
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
Jesse Wilson [Wed, 4 Jan 2012 16:22:36 +0000 (08:22 -0800)]
Merge "Explicitly specify 'milliseconds' as alarm manager's time unit."
Steve Block [Wed, 4 Jan 2012 13:36:57 +0000 (05:36 -0800)]
Merge "Fix AppCache when either no path or an invalid path is supplied"
Elliott Hughes [Wed, 4 Jan 2012 02:54:27 +0000 (18:54 -0800)]
Merge "Fix Music import for Turkish locales."
Christopher Tate [Wed, 4 Jan 2012 01:44:09 +0000 (17:44 -0800)]
am
91582b86: am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
91582b86d918b80158654671933cf26c96c34747':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:40:53 +0000 (17:40 -0800)]
am
30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '
30ad699c0e246ef3889f691361758235ecb89895':
Tweak docs on 'adb logcat'
Christopher Tate [Wed, 4 Jan 2012 01:38:51 +0000 (17:38 -0800)]
Merge "Tweak docs on 'adb logcat'" into ics-mr1
Scott Main [Wed, 4 Jan 2012 00:00:28 +0000 (16:00 -0800)]
am
f65320a2: am
12d9954d: docs: dasboard update for 1/3/12
* commit '
f65320a2743e81ae1cb62f2dbf60b65a122b9ddb':
docs: dasboard update for 1/3/12
Scott Main [Tue, 3 Jan 2012 23:58:41 +0000 (15:58 -0800)]
am
12d9954d: docs: dasboard update for 1/3/12
* commit '
12d9954d198d29da1a15ba2c6947ce91839cbb83':
docs: dasboard update for 1/3/12
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Romain Guy [Tue, 3 Jan 2012 22:21:18 +0000 (14:21 -0800)]
Merge "Properly restore the GL scissor after a GL draw functor Bug #
5781254"
Danielle Millett [Tue, 3 Jan 2012 21:44:28 +0000 (13:44 -0800)]
Merge "Fix
5783857: Device Policy Manager doesn't allow Face Unlock"
Brian Colonna [Tue, 3 Jan 2012 21:43:07 +0000 (13:43 -0800)]
Merge "Added padding to PIN layout status and carrier text"
Brian Colonna [Tue, 3 Jan 2012 21:42:17 +0000 (13:42 -0800)]
Merge "Unbinding from FU when going to backup"
Jeff Sharkey [Tue, 3 Jan 2012 18:57:19 +0000 (10:57 -0800)]
Merge "Test the correct return code from call to cryptfs."
Dirk Dougherty [Tue, 3 Jan 2012 18:37:48 +0000 (10:37 -0800)]
am
27d2a07a: am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
27d2a07a5548e238863135280b706751764ef20f':
Doc change: fix link target for "Publish" icon.
Dirk Dougherty [Tue, 3 Jan 2012 18:35:18 +0000 (10:35 -0800)]
am
a17e100b: Doc change: fix link target for "Publish" icon.
* commit '
a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
Doc change: fix link target for "Publish" icon.
Ben Murdoch [Tue, 3 Jan 2012 10:53:58 +0000 (02:53 -0800)]
Merge "Do not allow file:// access when it is disabled."
Wink Saville [Fri, 30 Dec 2011 00:41:09 +0000 (16:41 -0800)]
Merge "Separate SIM states from Radio states"
Eric Fischer [Thu, 29 Dec 2011 22:46:50 +0000 (14:46 -0800)]
Merge "Import revised translations."
Irfan Sheriff [Thu, 29 Dec 2011 17:11:29 +0000 (09:11 -0800)]
Merge "Add multi-interface support to native calls"
Chia-chi Yeh [Wed, 28 Dec 2011 23:14:23 +0000 (15:14 -0800)]
Merge "SipService: grab Wi-Fi lock only when necessary."
Irfan Sheriff [Wed, 28 Dec 2011 21:55:19 +0000 (13:55 -0800)]
Merge "clean up jni code"
Scott Main [Wed, 28 Dec 2011 18:36:01 +0000 (10:36 -0800)]
am
e231cd0a: am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
e231cd0a0dd5fce60a0635d7a60233db432429dd':
docs: add links for Galaxy Nexus driver
Scott Main [Wed, 28 Dec 2011 18:34:03 +0000 (10:34 -0800)]
am
0582da68: docs: add links for Galaxy Nexus driver
* commit '
0582da680ed3d48bfd9d6ed550f39aa2177baf79':
docs: add links for Galaxy Nexus driver
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