OSDN Git Service
Marco Nelissen [Fri, 18 Nov 2011 23:35:00 +0000 (15:35 -0800)]
Svetoslav Ganov [Fri, 18 Nov 2011 23:23:19 +0000 (15:23 -0800)]
am
bdc2912d: am
d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
* commit '
bdc2912da64e5e6402c73997d637224d905ae825':
Text selection AccessibilityEvents are missing text.
Wei Huang [Fri, 18 Nov 2011 23:23:17 +0000 (15:23 -0800)]
am
bcedde3c: am
c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
* commit '
bcedde3cd614e2a241f4c4dad626b840fd9c2424':
Unlock camera AWB lock only when white-balance is changed.
The Android Open Source Project [Fri, 18 Nov 2011 23:23:01 +0000 (15:23 -0800)]
Mathias Agopian [Fri, 18 Nov 2011 23:22:59 +0000 (15:22 -0800)]
am
d0df44b5: am
4d71053b: Merge "attempt to fix bug
5313580" into ics-mr1
* commit '
d0df44b5c979e00a19187cea35768ba26557e447':
attempt to fix bug
5313580
Bart Sears [Fri, 18 Nov 2011 23:22:57 +0000 (15:22 -0800)]
am
cb513ba7: am
e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit '
cb513ba7f14fdf08b5729edef5baf22e302e3e08':
Content and viewport rects set in one step.
Svetoslav Ganov [Fri, 18 Nov 2011 23:22:37 +0000 (15:22 -0800)]
am
322f884d: am
0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '
322f884dfda201f7bcb5b8cbff80d0ae5122ced3':
Add the support libraries to the platform documentation (build).
Joe Fernandez [Fri, 18 Nov 2011 23:22:31 +0000 (15:22 -0800)]
am
0c778cdd: am
dea90a0e: am
366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '
0c778cdd9cfdb8007b15eef2eca91f3089590f98':
docs: Camera Features for developers
Marco Nelissen [Fri, 18 Nov 2011 23:10:54 +0000 (15:10 -0800)]
am
7ff7821a: am
d4b22ab4: status_t != bool
* commit '
7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am
d4b22ab4: status_t != bool
* commit '
d4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Scott Main [Fri, 18 Nov 2011 23:06:31 +0000 (15:06 -0800)]
am
e17a4a02: am
d353df8d: am
48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit '
e17a4a02617dbefbc870df8280ffa1cd82fff2a0':
docs: update caption for action bar figure to match new screenshot
Daniel Sandler [Fri, 18 Nov 2011 22:47:58 +0000 (14:47 -0800)]
am
2e56995e: am
da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit '
2e56995e9e19f18958167a28911120f31b096756':
Tie screen saver to the screen off timeout.
Adam Powell [Fri, 18 Nov 2011 22:47:55 +0000 (14:47 -0800)]
am
65035d2a: am
8c54182f: Merge "Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
* commit '
65035d2a72fd8c847aa9c78c0e97058535ec18a5':
Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
Jim Miller [Fri, 18 Nov 2011 22:44:50 +0000 (14:44 -0800)]
Merge "resolved conflicts for merge of
1a783be3 to master"
Svetoslav Ganov [Fri, 18 Nov 2011 22:41:29 +0000 (14:41 -0800)]
am
d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
* commit '
d8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
Text selection AccessibilityEvents are missing text.
Svetoslav Ganov [Fri, 18 Nov 2011 22:39:05 +0000 (14:39 -0800)]
Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
Wei Huang [Fri, 18 Nov 2011 22:02:44 +0000 (14:02 -0800)]
am
c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
* commit '
c2fff5ea39027d017dc15ce285961afa17a7b4a7':
Unlock camera AWB lock only when white-balance is changed.
Daisuke Miyakawa [Fri, 18 Nov 2011 22:02:28 +0000 (14:02 -0800)]
Merge "Introduce Callable URI as hidden API"
Wei Huang [Fri, 18 Nov 2011 22:00:09 +0000 (14:00 -0800)]
Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
Jeff Sharkey [Fri, 18 Nov 2011 21:57:59 +0000 (13:57 -0800)]
Merge "Clean up NMS AIDL and permissions checking."
Jim Miller [Fri, 18 Nov 2011 21:56:20 +0000 (13:56 -0800)]
resolved conflicts for merge of
1a783be3 to master
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
Marco Nelissen [Fri, 18 Nov 2011 21:52:35 +0000 (13:52 -0800)]
Merge "status_t != bool"
The Android Open Source Project [Fri, 18 Nov 2011 21:35:32 +0000 (13:35 -0800)]
am
d5280e51: Reconcile with ics-mr0-release
* commit '
d5280e51aa4578ff47bffc166f74d79c17358589':
Mathias Agopian [Fri, 18 Nov 2011 21:35:23 +0000 (13:35 -0800)]
am
4d71053b: Merge "attempt to fix bug
5313580" into ics-mr1
* commit '
4d71053b0728b248d80d7d5a098df459722e2be0':
attempt to fix bug
5313580
Bart Sears [Fri, 18 Nov 2011 21:35:14 +0000 (13:35 -0800)]
am
e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit '
e6a96560ed96e5121db2e22168698f14338c8f1d':
Content and viewport rects set in one step.
The Android Open Source Project [Fri, 18 Nov 2011 21:12:32 +0000 (13:12 -0800)]
Reconcile with ics-mr0-release
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
Mathias Agopian [Fri, 18 Nov 2011 20:11:15 +0000 (12:11 -0800)]
Merge "attempt to fix bug
5313580" into ics-mr1
Jesse Wilson [Fri, 18 Nov 2011 20:06:42 +0000 (12:06 -0800)]
Merge "Remove untrue tip about zero-length arrays."
Bart Sears [Fri, 18 Nov 2011 19:46:26 +0000 (11:46 -0800)]
Merge "Content and viewport rects set in one step." into ics-mr1
Svetoslav Ganov [Fri, 18 Nov 2011 18:14:04 +0000 (10:14 -0800)]
am
0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '
0358787f68c48fb10f2d8067fd53f0471481320a':
Add the support libraries to the platform documentation (build).
Svetoslav Ganov [Fri, 18 Nov 2011 18:11:35 +0000 (10:11 -0800)]
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
Guang Zhu [Fri, 18 Nov 2011 17:15:56 +0000 (09:15 -0800)]
am
1753fd00: am
3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '
1753fd00764614213cfb9f88b00ee16fe3c1da3e':
add a self instrumentation into framework perf app
satok [Fri, 18 Nov 2011 17:15:54 +0000 (09:15 -0800)]
am
852b589a: am
1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '
852b589a51531f8f7a166f36f7596c255896f35c':
Hide/show ime switch icon properly
Joe Fernandez [Fri, 18 Nov 2011 14:17:59 +0000 (06:17 -0800)]
am
dea90a0e: am
366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '
dea90a0e1c9c1d15657024893b6793dc21bc27ef':
docs: Camera Features for developers
Joe Fernandez [Fri, 18 Nov 2011 14:14:01 +0000 (06:14 -0800)]
am
366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '
366113fa1bea5ef39cf6557f18ff00310eb6e458':
docs: Camera Features for developers
Scott Main [Fri, 18 Nov 2011 10:53:00 +0000 (02:53 -0800)]
am
d353df8d: am
48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit '
d353df8db4f51868e1e09463b2c25e3637ad8e95':
docs: update caption for action bar figure to match new screenshot
Scott Main [Fri, 18 Nov 2011 10:49:49 +0000 (02:49 -0800)]
am
48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit '
48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
docs: update caption for action bar figure to match new screenshot
Jim Miller [Fri, 18 Nov 2011 10:37:49 +0000 (02:37 -0800)]
am
a8606cf6: am
398f80ea: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
a8606cf661fde3300165f181c5825cf0535adc66':
Fix
5620754: don't show pattern screen after SIM PUK unlock
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)]
Daniel Sandler [Fri, 18 Nov 2011 05:04:37 +0000 (21:04 -0800)]
am
da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit '
da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
Tie screen saver to the screen off timeout.
Daniel Sandler [Fri, 18 Nov 2011 05:02:40 +0000 (21:02 -0800)]
Merge "Tie screen saver to the screen off timeout." into ics-mr1
Adam Powell [Fri, 18 Nov 2011 03:46:19 +0000 (19:46 -0800)]
am
8c54182f: Merge "Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
* commit '
8c54182f0b6c706adc6247d6f1da7147b357920d':
Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
Adam Powell [Fri, 18 Nov 2011 03:44:14 +0000 (19:44 -0800)]
Merge "Fix bug
5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
Jim Miller [Fri, 18 Nov 2011 02:59:59 +0000 (18:59 -0800)]
am
70bded0a: Merge "Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
* commit '
70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels
Jim Miller [Fri, 18 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix
5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
Mathias Agopian [Fri, 18 Nov 2011 02:46:09 +0000 (18:46 -0800)]
attempt to fix bug
5313580
the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.
To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.
Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9
Guang Zhu [Fri, 18 Nov 2011 02:06:18 +0000 (18:06 -0800)]
am
3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '
3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
add a self instrumentation into framework perf app
Guang Zhu [Fri, 18 Nov 2011 02:04:23 +0000 (18:04 -0800)]
Merge "add a self instrumentation into framework perf app" into ics-mr1
satok [Fri, 18 Nov 2011 02:03:46 +0000 (18:03 -0800)]
am
1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '
1a3c051bcc787363d9154da4a8e8e562dda32926':
Hide/show ime switch icon properly
satok [Fri, 18 Nov 2011 02:02:09 +0000 (18:02 -0800)]
Merge "Hide/show ime switch icon properly" into ics-mr1
The Android Automerger [Fri, 18 Nov 2011 01:49:17 +0000 (17:49 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Jim Miller [Fri, 18 Nov 2011 01:44:37 +0000 (17:44 -0800)]
am
398f80ea: Merge "Fix
5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '
398f80eacb8e59d868f287bf273a1253fe219ce4':
Fix
5620754: don't show pattern screen after SIM PUK unlock
Jim Miller [Fri, 18 Nov 2011 01:41:50 +0000 (17:41 -0800)]
Merge "Fix
5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Joe Fernandez [Fri, 18 Nov 2011 01:34:33 +0000 (17:34 -0800)]
Merge "docs: Camera Features for developers" into ics-mr0
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 [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:30:46 +0000 (15:30 -0800)]
Merge "Rename EntropyService to EntropyMixer"
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.
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:08:31 +0000 (14:08 -0800)]
Merge "Bug
5522189 re-enable ARM opts but disable inline"