OSDN Git Service
Martijn Coenen [Mon, 22 Jul 2013 23:20:01 +0000 (23:20 +0000)]
Merge "First shot at (host-based) card emulation APIs."
Jean-Michel Trivi [Mon, 22 Jul 2013 23:14:26 +0000 (23:14 +0000)]
Merge "Refactor for audio focus, remote control, media button handling"
Jean-Michel Trivi [Thu, 27 Jun 2013 23:22:58 +0000 (16:22 -0700)]
Refactor for audio focus, remote control, media button handling
Extract audio focus, remote control and media button handling
outside of AudioService without any changes in functionality.
Moving logic to new class, MediaFocusControl.
Introduce interface for managing volum control logic, VolumeController.
The VolumePanel class implements this interface.
Change-Id: I72bda2e0670c26e61ff076fd729c15f9f1156dc5
Craig Mautner [Mon, 22 Jul 2013 22:54:15 +0000 (22:54 +0000)]
Merge "Add null check to StackBox containment test."
Martijn Coenen [Mon, 22 Jul 2013 22:29:21 +0000 (22:29 +0000)]
Merge "Add host-based card emu feature to PackageManager."
Romain Guy [Mon, 22 Jul 2013 22:16:03 +0000 (22:16 +0000)]
Merge "Use global indices array to draw layers"
Igor Murashkin [Mon, 22 Jul 2013 21:38:55 +0000 (21:38 +0000)]
Merge "camera2 api: marshal rect, size, string for metadata"
Romain Guy [Mon, 22 Jul 2013 20:57:50 +0000 (13:57 -0700)]
Use global indices array to draw layers
An array of indices local to a layer would only be necessary if
we changed the way we resolve T-junctions. Since we only ever
draw quads, let's just use the indices we use everywhere else.
This change also uses the global indices array to render list
of colored rectangles to save on the number of vertices generated
CPU-side.
Change-Id: Ia6d1970b0e9247805af5a114ca2a84b5d0b7c282
Michael Wright [Mon, 22 Jul 2013 21:31:05 +0000 (21:31 +0000)]
Merge "Fix swipe end location"
Michael Wright [Mon, 22 Jul 2013 21:30:02 +0000 (21:30 +0000)]
Merge "Take advantage of KeyEvent.isConfirmKey"
Joe Fernandez [Mon, 22 Jul 2013 21:07:06 +0000 (14:07 -0700)]
am
0db151ff: am
874b2ba1: am
c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit '
0db151ff1a4aef1c56096d8c325821196b61f317':
docs: Android 4.3 Platform Release Notes
Joe Fernandez [Mon, 22 Jul 2013 21:04:47 +0000 (14:04 -0700)]
am
874b2ba1: am
c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit '
874b2ba1f997401ad3dd0a5d192269ac682906a3':
docs: Android 4.3 Platform Release Notes
Joe Fernandez [Mon, 22 Jul 2013 21:01:24 +0000 (14:01 -0700)]
am
c4624d2e: Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
* commit '
c4624d2efbeab6c9ef89def696421aaa086025bd':
docs: Android 4.3 Platform Release Notes
Michael Wright [Mon, 22 Jul 2013 20:58:45 +0000 (13:58 -0700)]
Fix swipe end location
Change-Id: I997ca30dc5399b36e13516c4aeadbdf6fa357df7
Joe Fernandez [Mon, 22 Jul 2013 20:57:20 +0000 (20:57 +0000)]
Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev
Romain Guy [Mon, 22 Jul 2013 20:57:10 +0000 (20:57 +0000)]
Merge "Cache reflection lookups"
Craig Mautner [Mon, 22 Jul 2013 20:54:42 +0000 (13:54 -0700)]
Add null check to StackBox containment test.
Relies on mFirst and mSecond being non-null exactly when mStack is
null.
Fixes bug
9774735.
Change-Id: Ib0b463560b4bf69fdf05afe61ebe94ea0034a3ad
Craig Mautner [Mon, 22 Jul 2013 20:47:10 +0000 (20:47 +0000)]
Merge "Remove stopping activity from activities to stop"
Svetoslav Ganov [Mon, 22 Jul 2013 20:08:15 +0000 (20:08 +0000)]
Merge "Implement persistence/restoring of print spooler state."
Svetoslav Ganov [Mon, 22 Jul 2013 19:32:03 +0000 (12:32 -0700)]
Implement persistence/restoring of print spooler state.
1. Implemented the persistence and restoring of the print spooler state.
The print spooler state is saved as an XML on every print job change
and is restored when we bind to the spooler. The system does not
unbind from the spooler until the state persistence completes. We
are now storing the entire state, i.e. all print jobs, when a single
one changes. This is not optimal but we are not expecting to have
many such at the same time, so for now we err for simplicity of
implementation.
2. Enforcing a non-empty print job name.
3. Hidden the STATE_CREATED print job state which should never be visible to a
client since this is the state of a print job during construction, i.e. the
print dialog is up and we are doing back and forth with the app.
4. Fixed some PrintAttributes APIs that were incorrectly taking in a PackageManager
instance.
5. Updated the PrintSpooler build file due to splitting the framework into multiple
jars.
Change-Id: I52c88eaa1ec9c64920359cc143c79832a4c3d25b
Romain Guy [Mon, 22 Jul 2013 20:02:02 +0000 (13:02 -0700)]
Cache reflection lookups
This change also cleanups the code a little bit. Caching lookups
not only speed things up but it also avoids unnecessary allocations.
Change-Id: Ie3d1ae106d32b3b5f2c5d33b6318ed93cd9e27f9
Craig Mautner [Mon, 22 Jul 2013 19:57:51 +0000 (12:57 -0700)]
Remove stopping activity from activities to stop
When stopping an activity remove it from the list of activities to
be stopped when idle. Otherwise the activity gets stopped twice, at
the point of the fix here and later when idle.
Fixes bug
9755054.
Change-Id: If8d2249b75aeb9f8b6cea2d883046f3ad4c2e067
Joe Fernandez [Fri, 14 Jun 2013 18:53:33 +0000 (11:53 -0700)]
docs: Android 4.3 Platform Release Notes
In addition to platform notes, modified the SDK Manager update
warning to advise downloading of SDK Tools 22 or higher. This
dependency is based on the updating of the SDK repository
schema. The last update was repository-8 with the SDK 22.0.0
release, according to raphael@.
Change-Id: Icaaf39a6d49eccdc926aa4c4249db8a0b1d095a7
Martijn Coenen [Mon, 22 Jul 2013 19:01:19 +0000 (12:01 -0700)]
Add host-based card emu feature to PackageManager.
Change-Id: Id55025e5ab8443be1e6ac23ac5d9ab93565a53f0
Craig Mautner [Mon, 22 Jul 2013 18:13:09 +0000 (18:13 +0000)]
Merge "Restore nav bar position when wm size is reset."
Craig Mautner [Mon, 22 Jul 2013 17:37:43 +0000 (10:37 -0700)]
Restore nav bar position when wm size is reset.
The mNavigationBarCanMove variable was not reset when the dimensions
were restored using 'adb shell wm size reset'. This change restores
the correct value to it.
Fixes bug
9885741.
Change-Id: I6c9d3107fbc8a1e7acc0249691f4542cd8c07e93
Martijn Coenen [Thu, 18 Jul 2013 16:49:41 +0000 (09:49 -0700)]
First shot at (host-based) card emulation APIs.
HostApduService: convenience service class for implementing
a service that registers a set of ISO7816-4 AIDs and emulates
the corresponding application inside the service itself.
SeApduService: convenience service class for implementing
a service that registers a set of ISO7816-4 AIDs that reflect
applications installed on an embedded secure element or UICC. Contains
event hooks to allow the service to handle eSE/UICC events that
correspond to those AIDs.
Change-Id: I44191bd4abcbbe4f1fd36a9fd42639fe5c0cf496
Joe Fernandez [Mon, 22 Jul 2013 16:21:58 +0000 (09:21 -0700)]
am
d8aae485: am
abbcf372: am
60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
* commit '
d8aae485bab2e17ba1321615351840ed587a8047':
docs: NDK r9 Release Notes
Joe Fernandez [Mon, 22 Jul 2013 16:19:18 +0000 (09:19 -0700)]
am
abbcf372: am
60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
* commit '
abbcf372b8aadd8ac53de5f25d4d82b2d57eaeaf':
docs: NDK r9 Release Notes
Joe Fernandez [Mon, 22 Jul 2013 16:16:07 +0000 (09:16 -0700)]
am
60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
* commit '
60c4b16e28748d235d3b7c73906522b2c43d84a5':
docs: NDK r9 Release Notes
Joe Fernandez [Mon, 22 Jul 2013 16:13:20 +0000 (16:13 +0000)]
Merge "docs: NDK r9 Release Notes" into jb-mr2-dev
Chet Haase [Mon, 22 Jul 2013 16:05:13 +0000 (09:05 -0700)]
am
09a68ac9: am
dbc51de4: am
53771e5f: Merge "Remove useless/repetitive code"
* commit '
09a68ac943e0d21ad61a94ed4eac1d6099657602':
Remove useless/repetitive code
Chet Haase [Mon, 22 Jul 2013 16:02:06 +0000 (09:02 -0700)]
am
dbc51de4: am
53771e5f: Merge "Remove useless/repetitive code"
* commit '
dbc51de44fe4f9a7f81528204250de32ec405d39':
Remove useless/repetitive code
Chet Haase [Mon, 22 Jul 2013 15:59:30 +0000 (08:59 -0700)]
am
53771e5f: Merge "Remove useless/repetitive code"
* commit '
53771e5f955f67035cf6b6432c34171a18ab14dc':
Remove useless/repetitive code
Chet Haase [Mon, 22 Jul 2013 15:55:52 +0000 (15:55 +0000)]
Merge "Remove useless/repetitive code"
Glenn Kasten [Mon, 22 Jul 2013 15:02:29 +0000 (15:02 +0000)]
Merge "Inform AudioFlinger of device's low RAM attribute"
Guang Zhu [Sun, 21 Jul 2013 09:01:34 +0000 (02:01 -0700)]
fix build
Change-Id: Ie4bd7c3fe9320d22b7da2962e5e5a4abca510bd2
Christopher Tate [Sat, 20 Jul 2013 01:56:17 +0000 (01:56 +0000)]
Merge "Add AlarmManager.setWindow(...) for supplying an explicit delivery window"
Jim Miller [Sat, 20 Jul 2013 01:52:07 +0000 (01:52 +0000)]
Merge "Fix keyguard layout on hdpi devices"
Jim Miller [Sat, 20 Jul 2013 01:31:55 +0000 (18:31 -0700)]
Fix keyguard layout on hdpi devices
This reduces the size of the security area slightly to give
the widget more room.
Fixes bug
9642579
Change-Id: I58b861def932450901b17d6df74958dde8207769
Christopher Tate [Fri, 19 Jul 2013 23:30:43 +0000 (16:30 -0700)]
Add AlarmManager.setWindow(...) for supplying an explicit delivery window
Bug
9532215
Change-Id: I0efe32cbaaae8ce6ab223041eed116c3470a7326
Mathias Agopian [Sat, 20 Jul 2013 01:03:21 +0000 (01:03 +0000)]
Merge "update to new Consumer APIs"
Colin Cross [Sat, 20 Jul 2013 00:26:54 +0000 (17:26 -0700)]
Fix FrameworkPermissionTests build
Change-Id: I516e333ca85c0e3c08c8fffc157a9e0360af02e5
Dianne Hackborn [Fri, 19 Jul 2013 23:32:02 +0000 (16:32 -0700)]
Fix issue #
9940105: IllegalArgumentException in ArrayMap
Try to deal with unmarshalling old parcels. Turns out someone
was writing a parcel to disk storing a Bundle. Naughty, naughty.
This helps us not completely keel over.
Change-Id: Id343da2690b7bab89f6c3cb6fad1b92f270dad03
Joe Fernandez [Thu, 13 Jun 2013 21:36:37 +0000 (14:36 -0700)]
docs: NDK r9 Release Notes
Change-Id: I43cae1e306a8313ab2d003dbb762977f75bf8208
Svetoslav [Thu, 18 Jul 2013 01:37:36 +0000 (18:37 -0700)]
First pass of the print dialog UX
Change-Id: I315a16d7f68c73ca180c76e722847b4b1bdea55b
Michael Wright [Fri, 19 Jul 2013 22:55:14 +0000 (15:55 -0700)]
Take advantage of KeyEvent.isConfirmKey
Change-Id: I2925c624338a5c622a7b3fef05b62099465b6389
Michael Wright [Fri, 19 Jul 2013 23:15:04 +0000 (23:15 +0000)]
Merge "Debounce touch navigation taps and button presses"
Craig Mautner [Fri, 19 Jul 2013 23:07:51 +0000 (23:07 +0000)]
Merge "Fix home activity and user switch interactions."
Craig Mautner [Wed, 17 Jul 2013 20:24:59 +0000 (13:24 -0700)]
Fix home activity and user switch interactions.
- Make sure Home activity goes in the correct task and on the correct
stack.
- Do not allow different users to be in the same task.
- Do not set stacks aside for each user.
Fixes bug
9775492.
Change-Id: I0e7954e917aac8482a1015a36923e02914e2b692
The Android Open Source Project [Fri, 19 Jul 2013 23:02:25 +0000 (16:02 -0700)]
am
c02fcf81: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
c02fcf81462346ee6fe3fca8eb4594344b13ddf7':
Add gservices updater for carrier provisioning url
Cleaner Tejat notification in Audio Package 11
When a SIM is changed check mobile provisioning.
Fix missing lock in power manager.
Remove iterators (DO NOT MERGE)
Michael Wright [Fri, 19 Jul 2013 22:45:50 +0000 (22:45 +0000)]
Merge "Add input device property for buttons under touchpads"
Michael Wright [Fri, 19 Jul 2013 22:44:57 +0000 (22:44 +0000)]
Merge "Properly set the tap down time when entering non-tap modes"
Michael Wright [Fri, 19 Jul 2013 22:44:01 +0000 (22:44 +0000)]
Merge "Allow duration without source to be set for input commands"
Christopher Tate [Fri, 19 Jul 2013 21:54:50 +0000 (21:54 +0000)]
Merge "EWRONGVARNAME"
Christopher Tate [Fri, 19 Jul 2013 21:51:44 +0000 (14:51 -0700)]
EWRONGVARNAME
Bug
9940349
Change-Id: I60205899cd33070394752fc4b2f1e0cf6a2d9192
Joe Fernandez [Fri, 19 Jul 2013 21:40:01 +0000 (14:40 -0700)]
am
b9aa1789: am
379cb6b7: am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
b9aa1789ee221c45bd3c01bae4ae99d7965c1437':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 21:30:49 +0000 (14:30 -0700)]
resolved conflicts for merge of
f9774dc7 to master
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f
Scott Main [Fri, 19 Jul 2013 21:22:14 +0000 (14:22 -0700)]
am
8b5f79a0: am
a74517d2: am
ca3b4e9b: remove significant motion
* commit '
8b5f79a0cb72af51a057c27ca3f0511076577e1f':
remove significant motion
Scott Main [Fri, 19 Jul 2013 21:22:12 +0000 (14:22 -0700)]
am
a12d5e0d: am
52a74a21: am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
a12d5e0dcab49fb02cac3e7982f1ad0ecf170a40':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 21:22:09 +0000 (14:22 -0700)]
am
8d6d93c3: am
1cf7b4a4: am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
8d6d93c3b2ed41324d2bcf8bbfc4c5a3b5d6416e':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 21:22:06 +0000 (14:22 -0700)]
am
64127efb: am
46cc4dbb: am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
64127efbe65f73a01cf15366e08406bf7cb537d9':
Doc change: Add Colopl video to carousel and spotlight.
The Android Open Source Project [Fri, 19 Jul 2013 21:20:43 +0000 (14:20 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d
Robert Greenwalt [Fri, 19 Jul 2013 21:09:30 +0000 (14:09 -0700)]
resolved conflicts for merge of
85b5e4c4 to master
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
Jean-Michel Trivi [Fri, 19 Jul 2013 20:42:39 +0000 (13:42 -0700)]
am
a8f7659a: am
f65c9189: am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
a8f7659aba2c9233fb61ae34dfc0d7477dc0ae91':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:42:36 +0000 (13:42 -0700)]
am
b96cca27: am
df43ba82: am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
b96cca27ba15121aab2c481786a292880c007bb6':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:42:34 +0000 (13:42 -0700)]
am
388f85eb: am
a2f41b23: am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
388f85eb451bd0b61c8f48b500de5db6bca941f1':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:42:30 +0000 (13:42 -0700)]
am
d96c6956: am
0f33e44f: am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
d96c6956807ca1644079a9e92d0e3af170c51c8f':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:42:27 +0000 (13:42 -0700)]
am
7afdf7f0: am
2445880c: am
ba8a5413: Fix missing lock in power manager.
* commit '
7afdf7f0514bebe1188e0c1bc60e76f853065e82':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:42:24 +0000 (13:42 -0700)]
am
70eac41f: (-s ours) am
a64325f6: am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
70eac41f7044552305beae86eb0978cd74724ecf':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:38:02 +0000 (13:38 -0700)]
am
379cb6b7: am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
379cb6b7f0f62009caeeda00a05d3185bc06b8aa':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 20:37:58 +0000 (13:37 -0700)]
am
ddf17b5b: am
8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
* commit '
ddf17b5b82f25965502377588483abbc328c4e6d':
Make CS.isTetheringSupported dynamic
Scott Main [Fri, 19 Jul 2013 20:37:54 +0000 (13:37 -0700)]
am
a74517d2: am
ca3b4e9b: remove significant motion
* commit '
a74517d25d8258ed14d4cf4aab7cf82d6b51e729':
remove significant motion
Scott Main [Fri, 19 Jul 2013 20:37:50 +0000 (13:37 -0700)]
am
52a74a21: am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
52a74a2143274b2a3c5906cc882fa48d687b5cf8':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 20:37:47 +0000 (13:37 -0700)]
am
1cf7b4a4: am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
1cf7b4a438a01d2c018699e38332965b366f479c':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 20:37:44 +0000 (13:37 -0700)]
am
46cc4dbb: am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
46cc4dbb38968dadffcc5f78dd69d391768711e1':
Doc change: Add Colopl video to carousel and spotlight.
Robert Greenwalt [Fri, 19 Jul 2013 20:37:41 +0000 (13:37 -0700)]
am
b5bf655c: am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
b5bf655cc6cc9128aec99958cce3b054348c9273':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:37:38 +0000 (13:37 -0700)]
am
f65c9189: am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
f65c9189843ea55fc3e3c7154331c9f0ad330210':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:37:35 +0000 (13:37 -0700)]
am
df43ba82: am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
df43ba82e6c232985a95c9827f7d71dd3194e0a8':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:37:32 +0000 (13:37 -0700)]
am
a2f41b23: am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
a2f41b23b6328b0ff3bb04d4a88ccf4a84a50375':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:37:28 +0000 (13:37 -0700)]
am
0f33e44f: am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0f33e44fbc2e506fce71bf087a0b18b7979daaf9':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:37:25 +0000 (13:37 -0700)]
am
2445880c: am
ba8a5413: Fix missing lock in power manager.
* commit '
2445880c5cb6504455bd5cae38a850744f4804be':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:37:22 +0000 (13:37 -0700)]
am
a64325f6: am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
a64325f6e70569255ff395a85ec161f3230f9e35':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:34:28 +0000 (13:34 -0700)]
am
ab00d352: am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
ab00d352ffc8a60cf4811cc79dd1dc69bc8ee407':
docs: Android SDK 22.0.4 Release Notes
Robert Greenwalt [Fri, 19 Jul 2013 20:34:22 +0000 (13:34 -0700)]
am
8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
* commit '
8c87b29793da439b8718227bf2d03405c8ad264a':
Make CS.isTetheringSupported dynamic
Scott Main [Fri, 19 Jul 2013 20:34:04 +0000 (13:34 -0700)]
am
ca3b4e9b: remove significant motion
* commit '
ca3b4e9b7e5498650993dc99d70acacc1fa2d1fb':
remove significant motion
Scott Main [Fri, 19 Jul 2013 20:34:02 +0000 (13:34 -0700)]
am
1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit '
1be763494e9df0d1477dcaa4ba0163cce68f416a':
more details about account access in restricted profiles
Scott Main [Fri, 19 Jul 2013 20:33:58 +0000 (13:33 -0700)]
am
d3ed45f8: am
991487c6: am
9a1f106d: am
34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit '
d3ed45f841419b90e1d6813d9bcefbcb91554a63':
fix typo in code sample
Dirk Dougherty [Fri, 19 Jul 2013 20:33:46 +0000 (13:33 -0700)]
am
e0380d8f: resolved conflics for merge of
54201120 to jb-mr2-dev
* commit '
e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54':
Doc change: Add Colopl video to carousel and spotlight.
Robert Greenwalt [Fri, 19 Jul 2013 20:33:35 +0000 (13:33 -0700)]
am
e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit '
e874bd351f7b68cead889f55afba505fb5fac97c':
Add gservices updater for carrier provisioning url
Jean-Michel Trivi [Fri, 19 Jul 2013 20:33:30 +0000 (13:33 -0700)]
am
bbc9a62a: Cleaner Tejat notification in Audio Package 11
* commit '
bbc9a62a71dd35c30eed96db9d4e23a754b55d8d':
Cleaner Tejat notification in Audio Package 11
Wink Saville [Fri, 19 Jul 2013 20:33:19 +0000 (13:33 -0700)]
am
e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit '
e3badc10112b76db583736767849b2f82ae737fd':
When a SIM is changed check mobile provisioning.
Deepanshu Gupta [Fri, 19 Jul 2013 20:33:17 +0000 (13:33 -0700)]
am
bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev
* commit '
bf8be2eefb1f5172582f688cbc090ec04d6908f1':
Add orientation to configuration for layoutlib.
Roman Nurik [Fri, 19 Jul 2013 20:33:05 +0000 (13:33 -0700)]
am
0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev
* commit '
0987ff8768512c3d519a5d5bbe5c4eb6b54548dc':
Add Flo to device art generator.
Jeff Brown [Fri, 19 Jul 2013 20:32:48 +0000 (13:32 -0700)]
am
ba8a5413: Fix missing lock in power manager.
* commit '
ba8a54136d184d48fbed4f7b27734f645e4e8ad0':
Fix missing lock in power manager.
Craig Mautner [Fri, 19 Jul 2013 20:32:40 +0000 (13:32 -0700)]
am
7c6be10d: Remove iterators (DO NOT MERGE)
* commit '
7c6be10d314413bb7afbed41017343320319915d':
Remove iterators (DO NOT MERGE)
Joe Fernandez [Fri, 19 Jul 2013 20:05:12 +0000 (13:05 -0700)]
am
658374d5: am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
658374d56577a4f8864ba3c7ed8f2e425d13d997':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 20:02:24 +0000 (13:02 -0700)]
am
2685febd: am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
2685febd0d51bac4da755756b5348eb95c57ef73':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 19:59:11 +0000 (12:59 -0700)]
am
6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
* commit '
6f75a73c04ebd5f0ae10e6e89618f492d842ed96':
docs: Android SDK 22.0.4 Release Notes
Joe Fernandez [Fri, 19 Jul 2013 19:55:47 +0000 (19:55 +0000)]
Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev
OSDN Git Service
