OSDN Git Service
Jason Sams [Wed, 13 Jul 2011 23:43:27 +0000 (16:43 -0700)]
Merge "Fix native crash when GL driver fails to initialize."
Dave Santoro [Wed, 13 Jul 2011 23:23:44 +0000 (16:23 -0700)]
Merge "Contacts contract update for display photos."
Jason Sams [Wed, 13 Jul 2011 23:09:42 +0000 (16:09 -0700)]
Fix native crash when GL driver fails to initialize.
Change-Id: I85714de9029285027dc75fb3b62076be41a4c985
Kenny Root [Wed, 13 Jul 2011 22:53:12 +0000 (15:53 -0700)]
Merge "Add StorageVolume list to MountService dump"
Kenny Root [Wed, 13 Jul 2011 22:53:03 +0000 (15:53 -0700)]
Merge "Fix debugging for hwui caches"
Daniel Lehmann [Wed, 13 Jul 2011 22:40:03 +0000 (15:40 -0700)]
Merge "Allow a sync adapter to provide an OPEN action for a group"
Christopher Tate [Wed, 13 Jul 2011 22:37:21 +0000 (15:37 -0700)]
Merge "Compress the backup output stream"
Daniel Lehmann [Wed, 13 Jul 2011 22:35:05 +0000 (15:35 -0700)]
Allow a sync adapter to provide an OPEN action for a group
Bug:
4413120
Change-Id: I17572204dc9fad3406d2505c83586b9dbce177b9
Christopher Tate [Mon, 11 Jul 2011 18:31:57 +0000 (11:31 -0700)]
Compress the backup output stream
Zlib compression, with a full flush between each application's
data. Encryption will be performed on the already-compressed data
once that's implemented.
On restore, the streamed data is similarly uncompressed on the fly.
Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
Jeff Sharkey [Wed, 13 Jul 2011 22:28:06 +0000 (15:28 -0700)]
Merge "Control socket tagging through Settings.Secure."
Jeff Sharkey [Wed, 13 Jul 2011 22:24:02 +0000 (15:24 -0700)]
Control socket tagging through Settings.Secure.
When NetworkManagementService starts, it determines if qtaguid
should be enabled. The changes pushes the enabled state to a system
property to control socket tagging.
Change-Id: I5697a990dbaad4b220a2fb055931b18077d07a74
Andreas Huber [Wed, 13 Jul 2011 22:19:44 +0000 (15:19 -0700)]
Merge "Remove old-style software decoders."
David 'Digit' Turner [Wed, 13 Jul 2011 21:55:20 +0000 (14:55 -0700)]
am
0814a9aa: am
db4c5f35: resolved conflicts for merge of
7816eded to gingerbread-plus-aosp
* commit '
0814a9aa0c8f89f084ba37df05b3735274d78420':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
Scott Main [Wed, 13 Jul 2011 21:55:15 +0000 (14:55 -0700)]
am
9b446cd6: am
bc047bb0: am
e32c49ab: docs: de-new sidenavs
* commit '
9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
docs: de-new sidenavs
Robert Ly [Wed, 13 Jul 2011 21:54:44 +0000 (14:54 -0700)]
am
4e400158: am
1e4cf2dd: am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
4e4001589911b971d56c72acee140526d4575dac':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Scott Main [Wed, 13 Jul 2011 21:54:24 +0000 (14:54 -0700)]
am
22f4e8f6: am
56a085c9: am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
22f4e8f627e3f54b418da422eadcf0c43caa3499':
docs: fix date on opengl dashboard
Xavier Ducrohet [Wed, 13 Jul 2011 21:53:54 +0000 (14:53 -0700)]
Dave Santoro [Wed, 29 Jun 2011 07:25:16 +0000 (00:25 -0700)]
Contacts contract update for display photos.
This adds support for storing larger, hi-res photos in the contacts
system. Thumbnails continue to be stored in the Photo.PHOTO column
as BLOBs, while hi-res versions of the photos are stored in the file
system and referenced via a photo file ID (with metadata stored in
a new table).
See go/large-photo-design for details.
Change-Id: Ie182eaa6a0330e2eca0a732f201f20a91e4dc584
Mike Lockwood [Wed, 13 Jul 2011 21:33:13 +0000 (14:33 -0700)]
Merge "MediaScanner: fix breakage in updates"
Robert Ly [Wed, 13 Jul 2011 21:28:52 +0000 (14:28 -0700)]
Merge "docs: fix for bug
3186839"
Robert Ly [Wed, 13 Jul 2011 21:25:52 +0000 (14:25 -0700)]
docs: fix for bug
3186839
Change-Id: I28305b73f0fe02593e072d690471a1448eb4c675
Svetoslav Ganov [Wed, 13 Jul 2011 21:19:33 +0000 (14:19 -0700)]
Merge "Polish of the ActivityChooserView and ShareActionProvider."
Andreas Huber [Wed, 13 Jul 2011 19:38:46 +0000 (12:38 -0700)]
Remove old-style software decoders.
Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
repo sync [Wed, 13 Jul 2011 21:09:33 +0000 (14:09 -0700)]
Merge "Add REFER handling."
Chris Craik [Wed, 13 Jul 2011 21:08:11 +0000 (14:08 -0700)]
Merge "Tile profiling interface"
Mathias Agopian [Wed, 13 Jul 2011 21:07:01 +0000 (14:07 -0700)]
Merge "get rid of overlay HAL"
Svetoslav Ganov [Thu, 7 Jul 2011 00:17:52 +0000 (17:17 -0700)]
Polish of the ActivityChooserView and ShareActionProvider.
1. Addressed the UX comments: ActivityChooserView's default selection
popup no longer shows a message, rather hightlights the default
action which now it displays. Alignemnt of the UI.
2. The ShareActionProvider shows a sub-menu if the host item goes
on the overflow menu.
3. Now the heade layout of the activity chooser view is not needed hence
dropped and the item and footer ones are merged.
Change-Id: I0b3de623e4c0a805be9ed73a8541e66b8c00e2d2
Mike Lockwood [Wed, 13 Jul 2011 20:50:29 +0000 (16:50 -0400)]
MediaScanner: fix breakage in updates
To facilitate bulk inserts, we changed the media scanner to use the file URI
instead of the audio, video or image media URIs.
However we should still use the media URIs for updating existing records
Bug:
5021925
Change-Id: I6143dc1d00350192170428a5e951b52ef9223734
Signed-off-by: Mike Lockwood <lockwood@android.com>
Chris Craik [Wed, 13 Jul 2011 20:19:37 +0000 (13:19 -0700)]
Tile profiling interface
Allows access to underlying WebView benchmarking calls.
Uses C++ backend from the following CL:
https://android-git.corp.google.com/g/#change,121035
Change-Id: Ib205340451aadfd40425f492afa4f2e46d314ebc
Jeff Brown [Wed, 13 Jul 2011 20:00:38 +0000 (13:00 -0700)]
Merge "Revert "fix a weird use of Vector::appendVector()""
Jeff Brown [Wed, 13 Jul 2011 19:51:11 +0000 (12:51 -0700)]
Revert "fix a weird use of Vector::appendVector()"
This reverts commit
198fd888add624cf9e53ce31b776568a5d069916
This change seems to have exposed some other bugs.
Bug:
5026631
Jason Sams [Wed, 13 Jul 2011 19:28:38 +0000 (12:28 -0700)]
Merge "Add slot number to forEach hal."
Jason Sams [Wed, 13 Jul 2011 18:26:26 +0000 (11:26 -0700)]
Add slot number to forEach hal.
Change-Id: I0f2992d5f4128422d07f897b335c219cc7f1d02c
Kenny Root [Wed, 13 Jul 2011 16:49:43 +0000 (09:49 -0700)]
Fix debugging for hwui caches
Debugging code attempted to delete a stack item.
Also, the flag fields weren't exactly clear, so rewrite it so it's
clear that kDebugMoreCaches is a combined flag.
Change-Id: If42b7f0f754919343301da5656aee5943cc9bd4a
Kenny Root [Wed, 13 Jul 2011 16:48:33 +0000 (09:48 -0700)]
Add StorageVolume list to MountService dump
Change-Id: If2be6e420d9671032d2e7a66c71a6733e6e48ac8
Andreas Huber [Wed, 13 Jul 2011 16:36:11 +0000 (09:36 -0700)]
Enable signalling of a stream discontinuity involving a format-change
through IStreamListener.
Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a
related-to-bug:
5022434
Mike Lockwood [Wed, 13 Jul 2011 15:07:59 +0000 (08:07 -0700)]
Merge "MTP: Clean up MtpServer initialization and threading:"
Mike Lockwood [Wed, 13 Jul 2011 14:34:29 +0000 (07:34 -0700)]
Merge "UsbDeviceManager: clean up HandlerThread creation"
Narayan Kamath [Wed, 13 Jul 2011 14:30:27 +0000 (07:30 -0700)]
Merge "Wait until the audio track finishes playing before releasing it."
Mike Lockwood [Mon, 11 Jul 2011 19:04:38 +0000 (15:04 -0400)]
MTP: Clean up MtpServer initialization and threading:
Move thread from native to Java code
Remove the stop() method (the thread will exit on its own)
Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
Mike Lockwood [Wed, 13 Jul 2011 13:23:45 +0000 (09:23 -0400)]
UsbDeviceManager: clean up HandlerThread creation
Change-Id: I84683b1753fcf3c3b501f8a506d6d890edf2eb37
Signed-off-by: Mike Lockwood <lockwood@android.com>
Narayan Kamath [Wed, 13 Jul 2011 12:59:45 +0000 (13:59 +0100)]
Wait until the audio track finishes playing before releasing it.
Release calls stop, which causes truncation of playback.
bug:
5021056
Change-Id: I8eadcbf5622dab83be3c4dabfcc06629398f27ab
Jeff Sharkey [Wed, 13 Jul 2011 03:23:03 +0000 (20:23 -0700)]
Merge "Include full network history around current time."
Jeff Sharkey [Wed, 13 Jul 2011 03:20:56 +0000 (20:20 -0700)]
Include full network history around current time.
When requesting historical values with time ranges, always include
full values for buckets that span current time. (It doesn't make
sense to interpolate partial data.) Move getTotalData() to return
full Entry objects to prepare for packet counts.
Bug:
4691901
Change-Id: I717bd721be9f1d4a47c4121e46e07a56cb15bbf1
Romain Guy [Wed, 13 Jul 2011 02:10:22 +0000 (19:10 -0700)]
Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant.""
Romain Guy [Wed, 13 Jul 2011 02:09:03 +0000 (19:09 -0700)]
Revert "Don't preload HardwareRenderer, its static initialization is process dependant."
This reverts commit
821e24336b3ab1f902fc3ee8da423226f50b540c.
Fabrice Di Meglio [Wed, 13 Jul 2011 01:24:27 +0000 (18:24 -0700)]
Merge "Introduce TextView drawableStart and drawableEnd"
Romain Guy [Wed, 13 Jul 2011 01:18:11 +0000 (18:18 -0700)]
Merge "Don't preload HardwareRenderer, its static initialization is process dependant."
Romain Guy [Wed, 13 Jul 2011 01:16:35 +0000 (18:16 -0700)]
Don't preload HardwareRenderer, its static initialization is process dependant.
Change-Id: I229357aaaa10b19209983c122f98dd3c07e01d7f
Iliyan Malchev [Wed, 13 Jul 2011 00:40:25 +0000 (17:40 -0700)]
Merge "Add support for TI H264 encoder"
Mathias Agopian [Wed, 13 Jul 2011 00:36:22 +0000 (17:36 -0700)]
Merge "take the state transform into account with h/w composer hal"
Chia-chi Yeh [Tue, 12 Jul 2011 23:58:45 +0000 (16:58 -0700)]
am
3b219a51: (-s ours) am
4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '
3b219a51a9d692807d3fb0f516df81609ca6e4fc':
VpnService: stop VPN when unknown DNS servers show up.
Elliott Hughes [Tue, 12 Jul 2011 23:58:18 +0000 (16:58 -0700)]
Merge "Fix typo in AndroidHttpClient JavaDoc."
Gilles Debunne [Tue, 12 Jul 2011 23:38:51 +0000 (16:38 -0700)]
Merge "Refactored TextView selectable state methods."
Wink Saville [Tue, 12 Jul 2011 23:38:22 +0000 (16:38 -0700)]
am
0ddd9960: am
12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
* commit '
0ddd99600675aaf5f514ac6bb30d345c4b66f8c2':
Add a property so that CSIM provision check can be bypassed
Alex Sakhartchouk [Tue, 12 Jul 2011 23:27:09 +0000 (16:27 -0700)]
Merge "Fix for the renderscript ref counting bug."
Mathias Agopian [Tue, 12 Jul 2011 23:02:46 +0000 (16:02 -0700)]
get rid of overlay HAL
Change-Id: I461f633d172ab10e05326ef10544c67dea664c0e
Elliott Hughes [Tue, 12 Jul 2011 23:02:50 +0000 (16:02 -0700)]
Fix typo in AndroidHttpClient JavaDoc.
Bug: http://code.google.com/p/android/issues/detail?id=14788
Change-Id: I7465c6c42e7b208efc9c954ac46c1b683676106e
Jaikumar Ganesh [Tue, 12 Jul 2011 22:54:50 +0000 (15:54 -0700)]
Merge "Add REGISTERED_BEFORE_BOOT flag to intent."
Dandawate Saket [Tue, 12 Jul 2011 02:12:57 +0000 (19:12 -0700)]
Add support for TI H264 encoder
Add support for TI H264 encoder and quirks for buffer allocation.
Temporary switching to baseline profile till ctts patch is defaulted
as per profile detection.
Change-Id: I1d56184b9c5d5f00d6c63aef7e058f3d56b84cef
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Jeff Sharkey [Tue, 12 Jul 2011 22:19:31 +0000 (15:19 -0700)]
Merge "Hide NetworkStatsHistory internals."
Jeff Sharkey [Tue, 12 Jul 2011 22:18:41 +0000 (15:18 -0700)]
Merge "Watch for external Secure.DATA_ROAMING changes."
Adam Powell [Tue, 12 Jul 2011 22:08:37 +0000 (15:08 -0700)]
Merge "Update ActionProvider to support dynamically building submenus."
Kazuhiro Ondo [Tue, 12 Jul 2011 21:56:59 +0000 (14:56 -0700)]
am
a9e00a4a: am
89799e72: Fix incorrect ERI banner format
* commit '
a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
Fix incorrect ERI banner format
Mathias Agopian [Tue, 12 Jul 2011 21:51:45 +0000 (14:51 -0700)]
take the state transform into account with h/w composer hal
if the state transform didn't preserve rectangles, we
would still try to use h/w composer hal using the bounds
of the transformed rect, which isn't correct.
now we correctly fall back to composition.
Change-Id: Iff78f4339ece415d4987e95a5717b04934d370ab
Wink Saville [Tue, 12 Jul 2011 21:46:02 +0000 (14:46 -0700)]
Merge "resolved conflicts for merge of
99cd6671 to master"
Adam Powell [Tue, 12 Jul 2011 21:25:23 +0000 (14:25 -0700)]
Update ActionProvider to support dynamically building submenus.
Stub out ShareActionProvider for building a submenu of activities to
choose from.
Change-Id: Ibd9ada77a455ed1a296c87b6d967073ca0f676c2
James Dong [Tue, 12 Jul 2011 21:43:34 +0000 (14:43 -0700)]
Merge "Make MetadataBufferType.h C-friendly"
Svetoslav Ganov [Tue, 12 Jul 2011 21:39:07 +0000 (14:39 -0700)]
Merge "Date/time pickers and calendar view not handling locale change."
Jaikumar Ganesh [Tue, 12 Jul 2011 21:14:49 +0000 (14:14 -0700)]
Add REGISTERED_BEFORE_BOOT flag to intent.
Add the flag to Connection state changed intent because
external devices can get connected before booting is complete.
Change-Id: I5bed7a4aa75a42d6facc16aac4f2734e4b5fe246
Svetoslav Ganov [Tue, 12 Jul 2011 19:26:20 +0000 (12:26 -0700)]
Date/time pickers and calendar view not handling locale change.
1. The data/time pickers and calendar view do not handle locale
change properly since they use cached Calendar instances to
limit the GC but fail to update them when the local changes.
Change-Id: I2a92d7f4e0f2798422843123e5aa483f8044bbed
Mathias Agopian [Tue, 12 Jul 2011 21:11:57 +0000 (14:11 -0700)]
Merge "fix typo in a comment"
Mathias Agopian [Tue, 12 Jul 2011 21:11:07 +0000 (14:11 -0700)]
fix typo in a comment
Change-Id: If913611a65e8b578021e9f9a9546f05e0ce6ef44
Fabrice Di Meglio [Wed, 29 Jun 2011 23:44:43 +0000 (16:44 -0700)]
Introduce TextView drawableStart and drawableEnd
- update also unit tests
Change-Id: I20b82f5fea2cc48c93fd9e26eb03290ad730c08a
Jeff Sharkey [Tue, 12 Jul 2011 20:57:00 +0000 (13:57 -0700)]
Hide NetworkStatsHistory internals.
Instead of exposing internal storage details, offer getValues()
accessor which populates values into a recycled structure.
Change-Id: I5228d7099a8f61b2018a435a813435a67dae49b4
Wink Saville [Tue, 12 Jul 2011 20:56:05 +0000 (13:56 -0700)]
resolved conflicts for merge of
99cd6671 to master
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
Xavier Ducrohet [Tue, 12 Jul 2011 20:39:33 +0000 (13:39 -0700)]
Merge "LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager"
Alex Sakhartchouk [Tue, 12 Jul 2011 20:25:14 +0000 (13:25 -0700)]
Fix for the renderscript ref counting bug.
This only manifested itself in the situations where elements containing multiple ref counted objects were copied from Java.
Change-Id: I2c1cc89fe7f792259b3f033674142eb33d17a507
repo sync [Tue, 12 Jul 2011 00:30:20 +0000 (08:30 +0800)]
Add REFER handling.
Handle REFER requests including REFER with Replaces header.
bug:
4958680
Change-Id: I96df95097b78bed67ab8abd309a1e57a45c6bc2f
Xavier Ducrohet [Tue, 12 Jul 2011 19:35:50 +0000 (12:35 -0700)]
LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager
We had replaced the accessibility Manager but it lacked some new API. Obvisouly
this is fragile and should be fixed, but this works for now.
After fixing this there was another issue with the lack of InputMethodManager.
To fix this I had to create an implementation of IInputMethodManager which
normally comes from a binder object.
I may want to do a similar trick with the accessibility manager later.
Change-Id: I28c6494e333f39072f348d0199124efac93256a5
Gilles Debunne [Tue, 12 Jul 2011 01:26:19 +0000 (18:26 -0700)]
Refactored TextView selectable state methods.
There were inconsistencies across methods on how to decide if text is selectable.
Fleshed up textCanBeSelected to support all cases (including non editable textIsSelectable).
onTouchEvent removed from CursorController, test in SelectionModifierCursorController for
editable text is not needed since it is conditionned by an hasSelectionController().
Bug
5016955: protection in offset for text selection
Change-Id: I1e39f7c4a859476e0220e72a4e490b43e60b4a9a
Jeff Brown [Tue, 12 Jul 2011 19:15:07 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Romain Guy [Tue, 12 Jul 2011 19:14:11 +0000 (12:14 -0700)]
Merge "Add test for bug #
4970944"
Xavier Ducrohet [Tue, 12 Jul 2011 19:03:23 +0000 (12:03 -0700)]
Merge "LayoutLib: Delegate for Display and IWindowManager implementation."
Chet Haase [Tue, 12 Jul 2011 18:58:58 +0000 (11:58 -0700)]
Merge "Fix Animator cancel() behavior"
Chet Haase [Tue, 12 Jul 2011 00:01:56 +0000 (17:01 -0700)]
Fix Animator cancel() behavior
Previously, calling cancel() on an Animator would cause onAnimationCancel
events to be sent to all listeners. This was confusing for listeners
that were keying off this event for performing other actions, when the original
animator wasn't truly canceled (because it wasn't even running, or had already
been canceled earlier). This change hinges listener notification on
the animator actually running; no events are sent otherwise.
Also added the first set of Animator tests to verify that this behavior
is correct.
Change-Id: I81ab56559b5c0343c8dc7880e1c8235f3020975b
Xavier Ducrohet [Tue, 12 Jul 2011 18:50:07 +0000 (11:50 -0700)]
Merge "new button graphics for layoutlib."
Xavier Ducrohet [Tue, 12 Jul 2011 18:39:27 +0000 (11:39 -0700)]
LayoutLib: Delegate for Display and IWindowManager implementation.
This allows ViewConfiguration to be properly implemented which is now
required for the rendering to happen.
Change-Id: I55629689fa8f5f874b43fcac2aa0789ce02d58f4
Dave Santoro [Tue, 12 Jul 2011 18:39:09 +0000 (11:39 -0700)]
Merge "Add data_set column for raw contacts and groups."
Adam Powell [Tue, 12 Jul 2011 18:36:43 +0000 (11:36 -0700)]
Merge "Fix bugs around restoring submenu state after activity teardown/restore"
Adam Powell [Tue, 12 Jul 2011 04:19:59 +0000 (21:19 -0700)]
Fix bugs around restoring submenu state after activity teardown/restore
Change-Id: I6cb5b3cad39b141dff84b8e0ca62f8f0a76a03b1
Jeff Sharkey [Tue, 12 Jul 2011 18:09:09 +0000 (11:09 -0700)]
Merge "Return stats from inactive ifaces, packet counts."
Fabrice Di Meglio [Tue, 12 Jul 2011 16:39:18 +0000 (09:39 -0700)]
Merge "Fix scrolling bug causing centered cursor."
James Dong [Tue, 12 Jul 2011 16:28:17 +0000 (09:28 -0700)]
Make MetadataBufferType.h C-friendly
Change-Id: I4388d8f6cf30f08858aec73aa971647feae4a5e3
Ben Murdoch [Tue, 12 Jul 2011 15:51:23 +0000 (08:51 -0700)]
Merge changes I829b5d24,I521c0989
* changes:
Add missing auto-fill strings.
Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
Ben Murdoch [Mon, 11 Jul 2011 10:17:10 +0000 (11:17 +0100)]
Add missing auto-fill strings.
These strings had a defintion native side, but no corresponding
definition java side which would lead to a crash. Strings taken from
chrome/app/generated_resources.grd - see
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?r1=75912&r2=76117&pathrev=88489
Also note that credit_card_number_preview_format is no longer needed.
See also change Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2
Change-Id: I829b5d24e6f9a04211ee91c3f670c8659c004cd9
Ben Murdoch [Tue, 12 Jul 2011 13:20:12 +0000 (14:20 +0100)]
Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
See diff from last update here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=75368&r2=82248
Change-Id: I521c098932dfcfcb728ed2d96afd22b7926e88e9
Mark Brophy [Tue, 12 Jul 2011 09:57:16 +0000 (02:57 -0700)]
Merge "Expose app resume times to the ApplicationProvider."
satok [Tue, 12 Jul 2011 05:12:59 +0000 (22:12 -0700)]
Merge "Change IME picker dialog from Activity to Broadcast"
Jeff Brown [Tue, 12 Jul 2011 05:12:16 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8