OSDN Git Service
Jamie Gennis [Fri, 18 Nov 2011 10:42:25 +0000 (02:42 -0800)]
am
892a9d67: am
9da22d2c: am
2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '
892a9d674db33586719f98df5c9a0a44769ebd54':
SurfaceTexture: fix a bug with buffer reallocation
Jamie Gennis [Fri, 18 Nov 2011 10:42:23 +0000 (02:42 -0800)]
am
99f0528b: am
e2fca63a: am
c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit '
99f0528b5eed9de4b9c59e806df32a58954c65a9':
EGL: fix blob cache extension detection
David Brown [Fri, 18 Nov 2011 10:42:21 +0000 (02:42 -0800)]
am
7476ea58: am
7d22534b: am
3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '
7476ea58f79ede45dddc4b6f05b14e175e0df939':
Fix a crash caused by SIP addresses containing "%40" instead of "@"
Jamie Gennis [Fri, 18 Nov 2011 10:42:19 +0000 (02:42 -0800)]
am
fa1a6eb5: am
0272e600: am
a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '
fa1a6eb584dde49d424fa53a995a6d0dbd45155c':
GLES: add image external enums
The Android Open Source Project [Fri, 18 Nov 2011 10:42:17 +0000 (02:42 -0800)]
Jamie Gennis [Fri, 18 Nov 2011 10:37:41 +0000 (02:37 -0800)]
am
9da22d2c: am
2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '
9da22d2cc31069d86a92021d8540bb5a77c9591b':
SurfaceTexture: fix a bug with buffer reallocation
Jamie Gennis [Fri, 18 Nov 2011 10:37:39 +0000 (02:37 -0800)]
am
e2fca63a: am
c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit '
e2fca63a18c7bd3fb0c14e1c5dc391cd699cea9f':
EGL: fix blob cache extension detection
David Brown [Fri, 18 Nov 2011 10:37:28 +0000 (02:37 -0800)]
am
7d22534b: am
3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '
7d22534b4cba49b1bd9d88969c3189a2c6fecf55':
Fix a crash caused by SIP addresses containing "%40" instead of "@"
Jamie Gennis [Fri, 18 Nov 2011 10:37:22 +0000 (02:37 -0800)]
am
0272e600: am
a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '
0272e60060162d2c32aec02d9cd1414dbbe14782':
GLES: add image external enums
The Android Open Source Project [Fri, 18 Nov 2011 10:37:17 +0000 (02:37 -0800)]
Jamie Gennis [Fri, 18 Nov 2011 01:11:59 +0000 (17:11 -0800)]
am
2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
* commit '
2ba13186b268de3527af6da1933a4b65877548d9':
SurfaceTexture: fix a bug with buffer reallocation
Jamie Gennis [Fri, 18 Nov 2011 01:11:57 +0000 (17:11 -0800)]
am
c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1
* commit '
c8fd6e3057a98a992b96c2bce3fa2a981c6e45c0':
EGL: fix blob cache extension detection
Jamie Gennis [Fri, 18 Nov 2011 01:10:47 +0000 (17:10 -0800)]
Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
Jamie Gennis [Fri, 18 Nov 2011 01:10:32 +0000 (17:10 -0800)]
Merge "EGL: fix blob cache extension detection" into ics-mr1
David Brown [Fri, 18 Nov 2011 00:32:52 +0000 (16:32 -0800)]
am
3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
* commit '
3f51f954948caf1fe5b3f175f7e8523f2ba58f58':
Fix a crash caused by SIP addresses containing "%40" instead of "@"
David Brown [Fri, 18 Nov 2011 00:31:10 +0000 (16:31 -0800)]
Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1
Jamie Gennis [Fri, 18 Nov 2011 00:00:44 +0000 (16:00 -0800)]
SurfaceTexture: fix a bug with buffer reallocation
This change fixes an issue involving buffer reallocation and the
ALLOW_DEQUEUE_CURRENT_BUFFER mode in SurfaceTexture. The bug happened
when the buffer slot currently attached to the GL texture was selected
for dequeuing, but the dequeue operation caused the buffer to be
reallocated. Because the buffer is new, the image producer could fill
the buffer and queue it before an updateTexImage call, which would
result in the "slot %d is current" error in queueBuffer.
Bug:
5631630
Change-Id: Icdd8bc5cad3c7db43953446d9be2603aaea11a8d
Scott Main [Fri, 18 Nov 2011 00:00:13 +0000 (16:00 -0800)]
am
fbd85491: am
ff31a5b1: am
85c73948: am
08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action i
* commit '
fbd85491121c9e94764a5c1b7916e33071805996':
docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:
4726917
Bill Gruber [Fri, 18 Nov 2011 00:00:11 +0000 (16:00 -0800)]
am
b14cf8af: am
dbda791f: am
be0dab48: am
69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug
2900690" into ics-mr0
* commit '
b14cf8af500872e4658a18e78bfd898a2fca7dfe':
Licensing docs: clarifies server response for draft apps Bug
2900690
Bill Gruber [Fri, 18 Nov 2011 00:00:09 +0000 (16:00 -0800)]
am
289242ed: am
50c6dd0f: am
9d3dffc7: am
ef20eb25: Merge "Filters docs: removes references to forward-locking Bug
3055286" into ics-mr0
* commit '
289242ed9786774e0cc2451a735aaf112c2ba85f':
Filters docs: removes references to forward-locking Bug
3055286
Scott Main [Fri, 18 Nov 2011 00:00:00 +0000 (16:00 -0800)]
am
47df7ee8: am
309643d9: am
fa847110: am
7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '
47df7ee84c0259980a896cd4ac28f14171b0ea9e':
docs: add sums/sizes for adt 15.0.1
Fred Chung [Thu, 17 Nov 2011 23:59:59 +0000 (15:59 -0800)]
am
fb7dca80: am
7f9c1c67: (-s ours) am
c2c77700: am
4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
* commit '
fb7dca80a58ff6a444f44f315f0376fae474224d':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
Robert Ly [Thu, 17 Nov 2011 23:59:56 +0000 (15:59 -0800)]
am
57ce9804: am
57e16ed5: am
0a2da863: am
4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '
57ce98045947bcc871128f721dd9b4eed189a4fe':
docs: adt 15.0.1 rel notes
Christopher Tate [Thu, 17 Nov 2011 23:59:54 +0000 (15:59 -0800)]
am
7c37ce8b: am
7d997121: am
4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
* commit '
7c37ce8b0141fd41e3946a3fa409bb863fa309f7':
Add a few GC-flexing microbenchmark tests
Jake Hamby [Thu, 17 Nov 2011 23:59:52 +0000 (15:59 -0800)]
am
a4d76b81: am
2084d206: am
0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '
a4d76b81a57577d7dded9ff58d97c4fcbe09e78e':
Re-enable vril-dump for adb bugreport.
Scott Main [Thu, 17 Nov 2011 23:56:43 +0000 (15:56 -0800)]
am
ff31a5b1: am
85c73948: am
08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised
* commit '
ff31a5b1566a7a3eaaf75fa67db11b8cadacf453':
docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:
4726917
Bill Gruber [Thu, 17 Nov 2011 23:56:41 +0000 (15:56 -0800)]
am
dbda791f: am
be0dab48: am
69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug
2900690" into ics-mr0
* commit '
dbda791f3a77449b023fe0062895510e95da73dd':
Licensing docs: clarifies server response for draft apps Bug
2900690
Bill Gruber [Thu, 17 Nov 2011 23:56:39 +0000 (15:56 -0800)]
am
50c6dd0f: am
9d3dffc7: am
ef20eb25: Merge "Filters docs: removes references to forward-locking Bug
3055286" into ics-mr0
* commit '
50c6dd0fd5f7842bfbdc54ddbb134be883b52c41':
Filters docs: removes references to forward-locking Bug
3055286
Scott Main [Thu, 17 Nov 2011 23:56:37 +0000 (15:56 -0800)]
am
309643d9: am
fa847110: am
7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '
309643d93afd877b279acbe298b2258b62f67f53':
docs: add sums/sizes for adt 15.0.1
Fred Chung [Thu, 17 Nov 2011 23:56:36 +0000 (15:56 -0800)]
am
7f9c1c67: (-s ours) am
c2c77700: am
4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
* commit '
7f9c1c67ef135a5e7b8226a0003df525adc2593c':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
Robert Ly [Thu, 17 Nov 2011 23:56:34 +0000 (15:56 -0800)]
am
57e16ed5: am
0a2da863: am
4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '
57e16ed5f6c254b8b59d1effec2c4a8f3f43eac8':
docs: adt 15.0.1 rel notes
Christopher Tate [Thu, 17 Nov 2011 23:56:28 +0000 (15:56 -0800)]
am
7d997121: am
4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
* commit '
7d9971213ff8fbfd41fa7039300ac28f555f43be':
Add a few GC-flexing microbenchmark tests
Jake Hamby [Thu, 17 Nov 2011 23:56:25 +0000 (15:56 -0800)]
am
2084d206: am
0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '
2084d20668a79e5a31ec7365652434ec943503ef':
Re-enable vril-dump for adb bugreport.
Jamie Gennis [Thu, 17 Nov 2011 23:49:45 +0000 (15:49 -0800)]
am
a37a78e2: Merge "GLES: add image external enums" into ics-mr1
* commit '
a37a78e2efe54892a744adfc6330c2d2179dee21':
GLES: add image external enums
Jamie Gennis [Thu, 17 Nov 2011 23:47:28 +0000 (15:47 -0800)]
Merge "GLES: add image external enums" into ics-mr1
The Android Open Source Project [Thu, 17 Nov 2011 23:41:03 +0000 (15:41 -0800)]
am
31b0c687: Reconcile with ics-mr0-release
* commit '
31b0c6872dcec0759ff0dbbcfc6bf1e51d3e0f12':
The Android Open Source Project [Thu, 17 Nov 2011 23:36:52 +0000 (15:36 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8
Nick Kralevich [Thu, 17 Nov 2011 23:33:07 +0000 (15:33 -0800)]
am
8549aeea: Merge "Rename EntropyService to EntropyMixer"
* commit '
8549aeea0af63810bd5a661a23079d6554e4717b':
Rename EntropyService to EntropyMixer
Nick Kralevich [Thu, 17 Nov 2011 23:30:46 +0000 (15:30 -0800)]
Merge "Rename EntropyService to EntropyMixer"
Matthew Xie [Thu, 17 Nov 2011 23:17:53 +0000 (15:17 -0800)]
am
a5ca41e9: am
a4f5c425: am
2b9af44e: am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
a5ca41e9cc82628a8776d8dd78f0ec270d69dda4':
Check the bluetooth state for getUuid call
Nick Pelly [Thu, 17 Nov 2011 23:17:51 +0000 (15:17 -0800)]
am
f955d057: am
c6a0277b: am
63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit '
f955d057ddd232af4bd4a74075838dae298c7365':
Fix NPE on devices that don't have NFC.
David Brown [Thu, 17 Nov 2011 23:17:49 +0000 (15:17 -0800)]
am
85a80ba8: am
19a57bde: am
1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '
85a80ba8cd92fd0a7f7e4a899e772b0f6a50a9d7':
SIP addresses containing "911" shouldn't be considered emergency calls
Dave Santoro [Thu, 17 Nov 2011 23:17:47 +0000 (15:17 -0800)]
am
c5b057f4: am
60e345a9: am
9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '
c5b057f42372e7a3b0560afe88a243378255c2e2':
Unhide social stream permissions.
Michael Kolb [Thu, 17 Nov 2011 23:17:45 +0000 (15:17 -0800)]
am
778f146c: am
5397bb52: am
852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '
778f146cf422edabf140a18afa8746e542a49ebd':
Draw input field focus ring in WebTextView
Jeff Sharkey [Thu, 17 Nov 2011 23:17:43 +0000 (15:17 -0800)]
am
f0c22dc4: am
7892cbff: am
8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '
f0c22dc4a043264a2b15d225fd97909b403c02cf':
Only write network stats when already loaded.
Matthew Xie [Thu, 17 Nov 2011 23:13:03 +0000 (15:13 -0800)]
am
a4f5c425: am
2b9af44e: am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
a4f5c425b822a46fc49bc87bba82688570584ff1':
Check the bluetooth state for getUuid call
Nick Pelly [Thu, 17 Nov 2011 23:12:56 +0000 (15:12 -0800)]
am
c6a0277b: am
63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit '
c6a0277bca29359ec1aee123495065982d2eea7a':
Fix NPE on devices that don't have NFC.
David Brown [Thu, 17 Nov 2011 23:12:54 +0000 (15:12 -0800)]
am
19a57bde: am
1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '
19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81':
SIP addresses containing "911" shouldn't be considered emergency calls
Dave Santoro [Thu, 17 Nov 2011 23:12:52 +0000 (15:12 -0800)]
am
60e345a9: am
9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '
60e345a9a95a0f24804f729eeb5216012d1bcbac':
Unhide social stream permissions.
Michael Kolb [Thu, 17 Nov 2011 23:12:49 +0000 (15:12 -0800)]
am
5397bb52: am
852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '
5397bb52fba04e8dc8496d731611210213847308':
Draw input field focus ring in WebTextView
Jeff Sharkey [Thu, 17 Nov 2011 23:12:45 +0000 (15:12 -0800)]
am
7892cbff: am
8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '
7892cbffbeffb6e73f4c88e9965064b3985971c2':
Only write network stats when already loaded.
Alex Sakhartchouk [Thu, 17 Nov 2011 22:54:43 +0000 (14:54 -0800)]
am
94b064e1: Merge "adding benchmark single test"
* commit '
94b064e11216310c813e72459bc89aa962263ab6':
adding benchmark single test
Scott Main [Thu, 17 Nov 2011 22:53:51 +0000 (14:53 -0800)]
am
85c73948: am
08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code
* commit '
85c7394836843b2cbfa2b51504448794a6071b3a':
docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:
4726917
Bill Gruber [Thu, 17 Nov 2011 22:53:50 +0000 (14:53 -0800)]
am
be0dab48: am
69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug
2900690" into ics-mr0
* commit '
be0dab485680fb264458f8192b3759b002450102':
Licensing docs: clarifies server response for draft apps Bug
2900690
Bill Gruber [Thu, 17 Nov 2011 22:53:48 +0000 (14:53 -0800)]
am
9d3dffc7: am
ef20eb25: Merge "Filters docs: removes references to forward-locking Bug
3055286" into ics-mr0
* commit '
9d3dffc7b05dbbad4a5e597fa964398b827ba945':
Filters docs: removes references to forward-locking Bug
3055286
Scott Main [Thu, 17 Nov 2011 22:53:46 +0000 (14:53 -0800)]
am
fa847110: am
7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '
fa847110524512b4bb1cb8e655471d324aba69ff':
docs: add sums/sizes for adt 15.0.1
Fred Chung [Thu, 17 Nov 2011 22:53:45 +0000 (14:53 -0800)]
am
c2c77700: am
4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
* commit '
c2c77700fbab25bc48002a46a6c0d8a81008030c':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
Robert Ly [Thu, 17 Nov 2011 22:53:43 +0000 (14:53 -0800)]
am
0a2da863: am
4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '
0a2da86346f1f74b66425565e783efb2d5239f25':
docs: adt 15.0.1 rel notes
Alex Sakhartchouk [Thu, 17 Nov 2011 22:52:23 +0000 (14:52 -0800)]
Merge "adding benchmark single test"
Scott Main [Thu, 17 Nov 2011 22:49:36 +0000 (14:49 -0800)]
am
08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio
* commit '
08d40d71806d482fa92f6a9b952487c3ccc63bb3':
docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:
4726917
Bill Gruber [Thu, 17 Nov 2011 22:49:33 +0000 (14:49 -0800)]
am
69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug
2900690" into ics-mr0
* commit '
69e24843fc89dcdd35802dbb6a2b693650ec8a41':
Licensing docs: clarifies server response for draft apps Bug
2900690
Bill Gruber [Thu, 17 Nov 2011 22:49:32 +0000 (14:49 -0800)]
am
ef20eb25: Merge "Filters docs: removes references to forward-locking Bug
3055286" into ics-mr0
* commit '
ef20eb2595d0c74eabbcafe6ec50387de37e18de':
Filters docs: removes references to forward-locking Bug
3055286
Scott Main [Thu, 17 Nov 2011 22:49:28 +0000 (14:49 -0800)]
am
7d4c4721: docs: add sums/sizes for adt 15.0.1
* commit '
7d4c4721c6dd5473464d4620749b302a413c7ebd':
docs: add sums/sizes for adt 15.0.1
Fred Chung [Thu, 17 Nov 2011 22:49:26 +0000 (14:49 -0800)]
am
4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
* commit '
4750cbd9311b763265f8ab6ddee187e0c9a71665':
DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
Robert Ly [Thu, 17 Nov 2011 22:49:21 +0000 (14:49 -0800)]
am
4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
* commit '
4f361741185d523b5469a264521eeeb4eee9344d':
docs: adt 15.0.1 rel notes
Christopher Tate [Thu, 17 Nov 2011 22:45:26 +0000 (14:45 -0800)]
am
4cf1656e: Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
* commit '
4cf1656e10514d0575304d5a8108bc7a0b7384ed':
Add a few GC-flexing microbenchmark tests
Christopher Tate [Thu, 17 Nov 2011 22:43:17 +0000 (14:43 -0800)]
Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1
Glenn Kasten [Thu, 17 Nov 2011 22:10:50 +0000 (14:10 -0800)]
am
aba3d10f: Merge "Bug
5522189 re-enable ARM opts but disable inline"
* commit '
aba3d10f376dc7b64fc66e669f16202750958f20':
Bug
5522189 re-enable ARM opts but disable inline
Glenn Kasten [Thu, 17 Nov 2011 22:08:31 +0000 (14:08 -0800)]
Merge "Bug
5522189 re-enable ARM opts but disable inline"
Jamie Gennis [Thu, 17 Nov 2011 05:45:30 +0000 (21:45 -0800)]
EGL: fix blob cache extension detection
Bug:
5474671
Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18
Jake Hamby [Thu, 17 Nov 2011 21:55:29 +0000 (13:55 -0800)]
am
0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '
0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
Re-enable vril-dump for adb bugreport.
Jake Hamby [Thu, 17 Nov 2011 21:53:17 +0000 (13:53 -0800)]
Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
Amith Yamasani [Thu, 17 Nov 2011 21:23:17 +0000 (13:23 -0800)]
am
16991b14: am
664bb774: am
aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit '
16991b1438ced6fb6cb482bd04b03744ecf34d83':
Don't upgrade some settings from GB to ICS.
Fred Chung [Thu, 17 Nov 2011 21:23:16 +0000 (13:23 -0800)]
am
66f5cf4d: am
a8f7b7c4: am
3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1
* commit '
66f5cf4d29cf06f241462b3cec2878b07ca23985':
Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
Andreas Huber [Thu, 17 Nov 2011 21:23:14 +0000 (13:23 -0800)]
am
aa257611: am
624efe45: am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
aa25761114b143ed3182d97004ec1366c2ae850e':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
John Reck [Thu, 17 Nov 2011 21:23:12 +0000 (13:23 -0800)]
am
a93a7d6d: am
0551287f: am
775e986e: Merge "Fix add single character check" into ics-mr1
* commit '
a93a7d6d15295e36b54b928bc57f0b5ca239714a':
Fix add single character check
John Reck [Thu, 17 Nov 2011 21:23:09 +0000 (13:23 -0800)]
am
6810017f: am
2c6afef8: am
1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
* commit '
6810017f6a7108449a8c08fcf15e1305dcba96f3':
Undeprecate LayoutAlgorithm
Amith Yamasani [Thu, 17 Nov 2011 21:20:22 +0000 (13:20 -0800)]
am
664bb774: am
aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit '
664bb774f528fead63d7c0e62b533da66390b246':
Don't upgrade some settings from GB to ICS.
Fred Chung [Thu, 17 Nov 2011 21:20:19 +0000 (13:20 -0800)]
am
a8f7b7c4: am
3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1
* commit '
a8f7b7c4794d62df4b3cec67dee1a9887afb53a4':
Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
Andreas Huber [Thu, 17 Nov 2011 21:20:16 +0000 (13:20 -0800)]
am
624efe45: am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
624efe45671131903fb5165f6133ba39486092ab':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
John Reck [Thu, 17 Nov 2011 21:20:15 +0000 (13:20 -0800)]
am
0551287f: am
775e986e: Merge "Fix add single character check" into ics-mr1
* commit '
0551287f6ed06511feae2a6b3700a9bca4cfc3cd':
Fix add single character check
John Reck [Thu, 17 Nov 2011 21:20:12 +0000 (13:20 -0800)]
am
2c6afef8: am
1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1
* commit '
2c6afef8766371bf933f8675c80687802ce045e0':
Undeprecate LayoutAlgorithm
Matthew Xie [Thu, 17 Nov 2011 21:12:39 +0000 (13:12 -0800)]
am
2b9af44e: am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
2b9af44e401d884469869a4ac0933bfa727d3135':
Check the bluetooth state for getUuid call
Matthew Xie [Thu, 17 Nov 2011 21:10:14 +0000 (13:10 -0800)]
am
6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '
6da97a24e329851888890d4e380066037d08bcd7':
Check the bluetooth state for getUuid call
Nick Pelly [Thu, 17 Nov 2011 20:51:18 +0000 (12:51 -0800)]
am
63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit '
63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
Fix NPE on devices that don't have NFC.
Nick Pelly [Thu, 17 Nov 2011 20:48:48 +0000 (12:48 -0800)]
Merge "Fix NPE on devices that don't have NFC." into ics-mr1
David Brown [Thu, 17 Nov 2011 20:35:26 +0000 (12:35 -0800)]
am
1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1
* commit '
1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2':
SIP addresses containing "911" shouldn't be considered emergency calls
David Brown [Thu, 17 Nov 2011 20:33:00 +0000 (12:33 -0800)]
Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1
Scott Main [Thu, 17 Nov 2011 20:32:11 +0000 (12:32 -0800)]
Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:
4726917" into ics-mr0
Dave Santoro [Thu, 17 Nov 2011 20:27:44 +0000 (12:27 -0800)]
am
9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '
9be4962060ca67c4fe9bfc391043f6d2829cf720':
Unhide social stream permissions.
Dave Santoro [Thu, 17 Nov 2011 20:26:17 +0000 (12:26 -0800)]
Merge "Unhide social stream permissions." into ics-mr1
Michael Kolb [Thu, 17 Nov 2011 20:25:06 +0000 (12:25 -0800)]
am
852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1
* commit '
852585c034d383ea6afe1b484afa57cbf4d04f95':
Draw input field focus ring in WebTextView
Michael Kolb [Thu, 17 Nov 2011 20:22:58 +0000 (12:22 -0800)]
Merge "Draw input field focus ring in WebTextView" into ics-mr1
Jeff Sharkey [Thu, 17 Nov 2011 20:11:47 +0000 (12:11 -0800)]
am
8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '
8ac35e30b29f3a3e81ed722621bf7f1de708455f':
Only write network stats when already loaded.
Jeff Sharkey [Thu, 17 Nov 2011 20:10:02 +0000 (12:10 -0800)]
Merge "Only write network stats when already loaded." into ics-mr1
Ben Murdoch [Thu, 17 Nov 2011 19:49:14 +0000 (11:49 -0800)]
am
131ed03f: am
e6269f79: am
fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
* commit '
131ed03f30ff85b00ee4f3cd01108f9742c356c2':
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
Jeff Sharkey [Thu, 17 Nov 2011 19:49:12 +0000 (11:49 -0800)]
am
ee737d9e: am
66b570c7: am
b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit '
ee737d9e44e14e51b484defe34316cdead08e735':
Update NTP outside locks, log large trim events.
Daniel Sandler [Thu, 17 Nov 2011 19:49:08 +0000 (11:49 -0800)]
am
470dfcd0: am
a092482c: am
293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit '
470dfcd03028aa1cb63448314f0e96d86a46f997':
Activate Dreams (screen saver) when desk-docked.
Daniel Sandler [Thu, 17 Nov 2011 19:49:06 +0000 (11:49 -0800)]
am
f27e94ce: am
7fd3ba91: am
d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit '
f27e94ce9db83f01a98eefd0add04e7a19dde60d':
Disable desk dock apps.
Mathias Agopian [Thu, 17 Nov 2011 19:49:03 +0000 (11:49 -0800)]
am
ce51c10f: am
2030d78d: am
8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1
* commit '
ce51c10fc139c9383229ff21698bdc72fe83c8d0':
be a bit more defensive when parsing extension strings
OSDN Git Service
