git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Dan Sandler [Tue, 9 Dec 2014 15:40:28 +0000 (15:40 +0000)]

am 139619b7: am e912c9cc: Repair wifi/cellular kerning.

* commit '139619b753e906c33ece2f1fc040ddd118980d8c':
Repair wifi/cellular kerning.

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 15:03:12 +0000 (15:03 +0000)]

am 7a811fc7: (-s ours) am fb5c932d: Merge "Add more -d dalvik details to dumpsys"

* commit '7a811fc7f23e4375a29ac5e7cfaf88efd657c33f':
Add more -d dalvik details to dumpsys

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 14:45:19 +0000 (14:45 +0000)]

am e912c9cc: Repair wifi/cellular kerning.

* commit 'e912c9cc39807f95815400981ed27d121e8b293a':
Repair wifi/cellular kerning.

commit | commitdiff | tree

Dmitriy Ivanov [Tue, 9 Dec 2014 14:40:56 +0000 (14:40 +0000)]

am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator"

* commit '4fed05b4e679276050b5eaad51ce96848ddc561e':
Remove unsed check for simulator

commit | commitdiff | tree

Dan Sandler [Mon, 8 Dec 2014 20:00:09 +0000 (15:00 -0500)]

Repair wifi/cellular kerning.

The wifi spacer should only be shown if the first mobile
network has a data type indicator.

Bug: 18665813
Change-Id: Ifcd3a61ebc8cdb76d134baa23b22f1291edadd28

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 11:25:28 +0000 (11:25 +0000)]

am 3547de2f: am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate"

* commit '3547de2f15310c266ab0cc35736cfc5a11950f60':
media: fix isSupportedFormat for integer frame rate

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 11:25:22 +0000 (11:25 +0000)]

am f5375fbd: am 38935e6e: Merge "media: allow full range of Vorbis sampling rates"

* commit 'f5375fbd8ef47f9c285ec2ccf857d673ed15d30d':
media: allow full range of Vorbis sampling rates

commit | commitdiff | tree

Narayan Kamath [Tue, 9 Dec 2014 11:25:04 +0000 (11:25 +0000)]

am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
Fix PhoneStateListener constructor javadoc.

commit | commitdiff | tree

Sebastien Hertz [Tue, 9 Dec 2014 08:07:25 +0000 (09:07 +0100)]

resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp

Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 02:25:45 +0000 (02:25 +0000)]

am fb5c932d: Merge "Add more -d dalvik details to dumpsys"

* commit 'fb5c932dbbe2e7fc3ed4f0af71dc8ac76f22df57':
Add more -d dalvik details to dumpsys

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 02:05:44 +0000 (02:05 +0000)]

Merge "Add more -d dalvik details to dumpsys"

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 01:57:26 +0000 (01:57 +0000)]

am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev

* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
Work on issue #18640385: Add procstats test mode

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 01:53:35 +0000 (01:53 +0000)]

Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 01:43:31 +0000 (17:43 -0800)]

Work on issue #18640385: Add procstats test mode

You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 01:43:00 +0000 (01:43 +0000)]

am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev

* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
Add more -d dalvik details to dumpsys

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 9 Dec 2014 01:42:53 +0000 (01:42 +0000)]

am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev

* commit 'c67da06df74095e44ecf9449216563b622927463':
IMS: start and stop dtmf tones.

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 00:20:26 +0000 (16:20 -0800)]

Add more -d dalvik details to dumpsys

Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
.IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 01:31:11 +0000 (01:31 +0000)]

am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev

* commit '52070f81f2c4c41ffe74adcabda64c2b0349c62d':
Add more -d dalvik details to dumpsys

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 9 Dec 2014 01:31:05 +0000 (01:31 +0000)]

am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev

* commit '0f78ad87f09b2230fc9e472a6cb412c560bdbd4f':
IMS: start and stop dtmf tones.

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 01:24:49 +0000 (01:24 +0000)]

Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 9 Dec 2014 01:24:44 +0000 (01:24 +0000)]

Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Tue, 9 Dec 2014 00:43:14 +0000 (00:43 +0000)]

am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

* commit 'c765655ae1ae35f9d5f0958295f0b71270132ca7':
AAPT: Dump status of required flag for uses-feature

commit | commitdiff | tree

Mathieu Chartier [Tue, 9 Dec 2014 00:20:26 +0000 (16:20 -0800)]

commit | commitdiff | tree

Adam Lesinski [Tue, 9 Dec 2014 00:37:54 +0000 (00:37 +0000)]

am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

* commit 'fbba9b57a35da49e592756ef86f98535280c0d09':
AAPT: Dump status of required flag for uses-feature

commit | commitdiff | tree

Adam Lesinski [Tue, 9 Dec 2014 00:31:58 +0000 (00:31 +0000)]

Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:30:49 +0000 (00:30 +0000)]

am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev

* commit '4b944f3ab8cd9959ccba3cee4cfd9fb36ab15a3a':
Fix auto-advance regression in radial time picker

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:18:40 +0000 (00:18 +0000)]

am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev

* commit '7781647aa90d7d7a070ecd79e52c2d8a11b59b5c':
Fix auto-advance regression in radial time picker

commit | commitdiff | tree

Santos Cordon [Tue, 9 Dec 2014 00:18:08 +0000 (00:18 +0000)]

am 8dd185b0: am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service

* commit '8dd185b08fae8d41bec558ab5a63012454cbb78e':
(Telecom-system part 3) Adding Telecom Loader Service

commit | commitdiff | tree

Jeff Sharkey [Tue, 9 Dec 2014 00:18:01 +0000 (00:18 +0000)]

am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev

* commit '2f1e953f8fd6d7ee32c00a680f887607f1005f62':
Direct notification of network interface changes.

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:17:56 +0000 (00:17 +0000)]

am c3e16fe3: am 3ba83288: Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev

* commit 'c3e16fe33dacd6e676c31332d0bd97de8a2d6a45':
Add focused & disabled states for spinner assets

commit | commitdiff | tree

Jinsuk Kim [Tue, 9 Dec 2014 00:17:50 +0000 (00:17 +0000)]

am 19e53e9c: am c414f466: Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev

* commit '19e53e9c55c23c1e6b56ad9496d48d36f7fe565f':
CEC: Explictly remove and add device when updating

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:17:44 +0000 (00:17 +0000)]

am 32230b2b: am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev

* commit '32230b2bdec14f33d793f8f3c89673b648139170':
Let host view handle long-press when using drag-to-open

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:17:37 +0000 (00:17 +0000)]

am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev

* commit '5a8b956fd22ffd2d4d54b47109c79748ff723d90':
Fix regression, don't NPE if Switch doesn't have a thumb set

commit | commitdiff | tree

Svet Ganov [Tue, 9 Dec 2014 00:17:31 +0000 (00:17 +0000)]

am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev

* commit '7f980d7508cab2bc9c4f84e5ea15984e284dbbb7':
When accessibility on cannot click on a view covered by a HorizontalScrollView

commit | commitdiff | tree

Svet Ganov [Tue, 9 Dec 2014 00:17:24 +0000 (00:17 +0000)]

am a91256bc: am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev

* commit 'a91256bc75e510a254d4e5c6e8d1df8391f20bba':
Clear clicked nodes from the accessibiliy cache.

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:08:00 +0000 (00:08 +0000)]

Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev

commit | commitdiff | tree

Dmitriy Ivanov [Tue, 9 Dec 2014 00:07:58 +0000 (00:07 +0000)]

am f0070999: Merge "Remove unsed check for simulator"

* commit 'f00709991dd13311054b78782de483b53941bcf8':
Remove unsed check for simulator

commit | commitdiff | tree

Santos Cordon [Tue, 9 Dec 2014 00:07:42 +0000 (00:07 +0000)]

am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service

* commit '5d2c1e69ecb851121177396ac376dee1fb41d421':
(Telecom-system part 3) Adding Telecom Loader Service

commit | commitdiff | tree

Jeff Sharkey [Tue, 9 Dec 2014 00:07:37 +0000 (00:07 +0000)]

am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev

* commit '4df65bf1eb454814954421403da9f8b5fcb82180':
Direct notification of network interface changes.

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:07:31 +0000 (00:07 +0000)]

am 3ba83288: Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev

* commit '3ba832882566891f643b25f8f89c4341f472b30d':
Add focused & disabled states for spinner assets

commit | commitdiff | tree

Jinsuk Kim [Tue, 9 Dec 2014 00:07:22 +0000 (00:07 +0000)]

am c414f466: Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev

* commit 'c414f4665fdde510f39107f05d27e5bc3fca6e75':
CEC: Explictly remove and add device when updating

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:07:17 +0000 (00:07 +0000)]

am 882a1e89: Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev

* commit '882a1e89742607a3f1fdaa8f5bbd0eb894fc0150':
Let host view handle long-press when using drag-to-open

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:07:12 +0000 (00:07 +0000)]

am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev

* commit 'db82c9e00ee9eefab68f6b8fff5db60736583490':
Fix regression, don't NPE if Switch doesn't have a thumb set

commit | commitdiff | tree

Svet Ganov [Tue, 9 Dec 2014 00:07:06 +0000 (00:07 +0000)]

am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev

* commit '381a423634a293d53f972a0ce4abd7fe7cf7d703':
When accessibility on cannot click on a view covered by a HorizontalScrollView

commit | commitdiff | tree

Svet Ganov [Tue, 9 Dec 2014 00:07:01 +0000 (00:07 +0000)]

am e232d4a6: Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev

* commit 'e232d4a6aadbd32cb80ffd0da9a5d164910b1b79':
Clear clicked nodes from the accessibiliy cache.

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 23:54:38 +0000 (15:54 -0800)]

Fix auto-advance regression in radial time picker

If autoAdvance is set, we need to always fire the listener. We should
create a separate callback for auto-advance, but this is a minimal fix.

BUG: 18654878
Change-Id: Ie7b8a3ff91761325a508f580b27fa3b08f7b4e16

commit | commitdiff | tree

Adam Lesinski [Mon, 8 Dec 2014 20:53:17 +0000 (12:53 -0800)]

AAPT: Dump status of required flag for uses-feature

Outside of a feature-group, the legacy uses-feature tag
has a boolean required flag that should be emitted in
dump badging.

Bug:17790999
Change-Id: I43023af00e9c9ed4bc35795c3a983fc719bf9b7a

commit | commitdiff | tree

Santos Cordon [Fri, 21 Nov 2014 23:20:15 +0000 (15:20 -0800)]

(Telecom-system part 3) Adding Telecom Loader Service

Bug: 18112269
Change-Id: I85ab03156bf906fdc72b459c4c68240ab3bf1894

commit | commitdiff | tree

Jeff Sharkey [Mon, 8 Dec 2014 23:12:45 +0000 (23:12 +0000)]

Merge "Direct notification of network interface changes." into lmp-mr1-dev

commit | commitdiff | tree

Uma Maheswari Ramalingam [Sat, 6 Dec 2014 00:39:57 +0000 (16:39 -0800)]

IMS: start and stop dtmf tones.

Support of start and stop dtmf tones in Imsphone

Bug: 18371919
Change-Id: I986f6b8e9aa1a5729d280eb8a5c60e129c3796cd
CRs-Fixed: 751797

commit | commitdiff | tree

Jeff Sharkey [Mon, 8 Dec 2014 22:50:12 +0000 (14:50 -0800)]

Direct notification of network interface changes.

Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes. For example, when stacked network
interfaces change for a mobile network. To ensure that we pick up
all these details, directly wire the two services together.

Also remove some unused code for split network types.

Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 22:08:05 +0000 (22:08 +0000)]

Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev

commit | commitdiff | tree

Jinsuk Kim [Mon, 8 Dec 2014 21:54:34 +0000 (21:54 +0000)]

Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev

commit | commitdiff | tree

Jinsuk Kim [Mon, 8 Dec 2014 21:48:13 +0000 (06:48 +0900)]

CEC: Explictly remove and add device when updating

Sending UPDATE_DEVICE doesn't translate remove/add devices
when its address (physical) has changed. Send expclit removal
addition event.

Bug: 18513567
Change-Id: Ibea6accf0358994b64289c1a785de21b598453f1

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 21:47:21 +0000 (13:47 -0800)]

Add focused & disabled states for spinner assets

Regression from KK. Bad copy/paste from another asset. Checked should
have been changed to focused.

BUG: 18669124
Change-Id: I0b86c0437cbe14b46b6a0b7047656ec15bf2d758

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 21:29:06 +0000 (21:29 +0000)]

Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 21:29:02 +0000 (21:29 +0000)]

Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev

commit | commitdiff | tree

Svet Ganov [Mon, 8 Dec 2014 21:28:17 +0000 (21:28 +0000)]

Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev

commit | commitdiff | tree

Dmitriy Ivanov [Mon, 8 Dec 2014 21:17:59 +0000 (21:17 +0000)]

Merge "Remove unsed check for simulator"

commit | commitdiff | tree

Svet Ganov [Mon, 8 Dec 2014 21:08:35 +0000 (21:08 +0000)]

Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 21:02:06 +0000 (13:02 -0800)]

Fix regression, don't NPE if Switch doesn't have a thumb set

BUG: 18670202
Change-Id: Iecb3498032c121c007ec87740ddebadb8e71c7a3

commit | commitdiff | tree

Alan Viverette [Wed, 3 Dec 2014 23:24:31 +0000 (15:24 -0800)]

Let host view handle long-press when using drag-to-open

BUG: 18605860
Change-Id: I75850138614f17cf728d4411c142a07bdf15d085

commit | commitdiff | tree

John Spurlock [Mon, 8 Dec 2014 19:56:05 +0000 (19:56 +0000)]

am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev

* commit '967e19a402046ba771cdebe99da2488bfc1959b1':
Volume: Only play the new vibrate hint once per volume-down.

commit | commitdiff | tree

Joe Fernandez [Mon, 8 Dec 2014 19:45:34 +0000 (19:45 +0000)]

am 17ab7f49: am cdcabe4c: am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs

* commit '17ab7f4962a00542a91d0b886dc237949c568c3a':
docs: studio revision update 1.0

commit | commitdiff | tree

Rich Slogar [Mon, 8 Dec 2014 19:45:29 +0000 (19:45 +0000)]

am 53202d01: am 1dfaa3a0: am 78264a4d: am 0039a73b: am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs

* commit '53202d0129be87d0de7058ad206cec8ad392df14':
docs: skd tools revision 24.0.0

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 19:45:20 +0000 (19:45 +0000)]

am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev

* commit 'e615da7eb74907c7df993009ba8137e6ddd4ac62':
Fix hotspot coordinate propagation in ViewGroup and AbsListView

commit | commitdiff | tree

Winson Chung [Mon, 8 Dec 2014 19:45:05 +0000 (19:45 +0000)]

am 87024f73: am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev

* commit '87024f7335439511aed0da8696811c3c4944b8c2':
Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:44:50 +0000 (19:44 +0000)]

am 54403cf8: am 97afbe1e: am 39519067: am a4924046: am d48168bd: add survey link

* commit '54403cf8eb78a59b20542479d4cf542e8f63866c':
add survey link

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:44:33 +0000 (19:44 +0000)]

am d7be88dc: (-s ours) am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'd7be88dc712afbf266114d3658c34a11126f0b17':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Sharkey [Mon, 8 Dec 2014 19:44:27 +0000 (19:44 +0000)]

am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

* commit '5b41696c56c124124d48168227a83b63bd55aea7':
Offer to "merge" subscribers for data usage.

commit | commitdiff | tree

Alan Viverette [Mon, 8 Dec 2014 19:44:21 +0000 (19:44 +0000)]

am 3891784f: am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev

* commit '3891784f305edabe20f518bc43b3114e2bf38122':
Adjust edit text layout, ripple alphas to be closer to Material spec

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:44:14 +0000 (19:44 +0000)]

am 654d8805: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '654d8805b21f5551d70ea92cfefa16b5440da886':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Spurlock [Mon, 8 Dec 2014 19:43:38 +0000 (19:43 +0000)]

am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev

* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e':
Zen: New behavior for built-in downtime + nextalarm conditions.

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:43:32 +0000 (19:43 +0000)]

am fb293b9f: (-s ours) am 9eb2092e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fb293b9f9d7d7adb6936f526c4af9d20616c8f62':
Import translations. DO NOT MERGE

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:43:24 +0000 (19:43 +0000)]

am 8bd51aa5: am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step

* commit '8bd51aa52d30fc38d9f397bf74f0201633f6ff89':
fix migrate instruction step

commit | commitdiff | tree

John Spurlock [Mon, 8 Dec 2014 19:43:20 +0000 (19:43 +0000)]

am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev

* commit '2f47eaff9b4d8fdd3cba7580ebb91a87881fe25f':
Volume: Only play the new vibrate hint once per volume-down.

commit | commitdiff | tree

Jinsuk Kim [Mon, 8 Dec 2014 19:43:16 +0000 (19:43 +0000)]

am 33697d85: am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev

* commit '33697d859ff701e6aec101351b3b3a0395a6637c':
CEC: Update CEC device info properly

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:43:10 +0000 (19:43 +0000)]

am a551f6c8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit 'a551f6c8606220ec116b48f7bc4b6147324441e9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:43:04 +0000 (19:43 +0000)]

am b266393e: (-s ours) am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'b266393ecde6ec273209cfde4c062d9e267eb935':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jason Monk [Mon, 8 Dec 2014 19:42:56 +0000 (19:42 +0000)]

am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev

* commit '15a8a1531eb457a71fe2db6c6d2bde981d5d7944':
QS Wifi panel show icon on secure networks

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:42:50 +0000 (19:42 +0000)]

am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE

* commit '9c00c3d57fcbaedfab096041fee4f4c2468b3ebf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 19:42:42 +0000 (19:42 +0000)]

am e734a86b: (-s ours) Import translations. DO NOT MERGE

* commit 'e734a86b69ca6d5a3e902f0ece0cd4ac86f6310e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 8 Dec 2014 19:42:17 +0000 (19:42 +0000)]

am f5e44c29: am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev

* commit 'f5e44c29e85681fdcc6d09bfda503af99b4da543':
When switching to default USB function set, check restriction

commit | commitdiff | tree

Jinsuk Kim [Mon, 8 Dec 2014 19:42:08 +0000 (19:42 +0000)]

am 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev

* commit '0cc53a5baefdd6b051251ec4bfeb1680e7a1c75c':
CEC: Disable debug logging

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:41:58 +0000 (19:41 +0000)]

am 937cb812: am 01a7eeba: am d9babcf0: am 5939bd03: am 35ee3018: revisions to Studio landing page

* commit '937cb812b689c9b3ee5ce9868422406c970cc4f0':
revisions to Studio landing page

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:41:52 +0000 (19:41 +0000)]

am 195a0da4: am 229f8a3c: am e0245cb5: am 1f5b2510: am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs

* commit '195a0da45777b8a2549f93f3494abc5d59d2467b':
fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:41:42 +0000 (19:41 +0000)]

am befef081: am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.

* commit 'befef081a84f1d1911906811c9afd07b8c393c1f':
misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.

commit | commitdiff | tree

Joe Fernandez [Mon, 8 Dec 2014 19:41:36 +0000 (19:41 +0000)]

am d816a983: am c4bac980: am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs

* commit 'd816a983927e382d2f6814053f339e4b59bdf871':
doc: SDK install page fix and link fixes

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:41:30 +0000 (19:41 +0000)]

am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs

* commit '42b65c6e89203bfbbc3175b4f4ff1be938aeca47':
add studio 1.0 files and reorder features list

commit | commitdiff | tree

Joe Fernandez [Mon, 8 Dec 2014 19:41:24 +0000 (19:41 +0000)]

am 5c09d4b8: am d7f9f30e: am dc842637: am ac3152ee: am 7b9ae53b: doc: fix for SDK installing page

* commit '5c09d4b8d8121514c63bd0cf72035a03d9ae8776':
doc: fix for SDK installing page

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:40:58 +0000 (19:40 +0000)]

am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP]

* commit '8804b2a6e08b46112dcf3a5993b1254bba63131d':
update studio hero image and add section about code editor [CP]

commit | commitdiff | tree

Rich Slogar [Mon, 8 Dec 2014 19:40:52 +0000 (19:40 +0000)]

am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP]

* commit '6a0e190646a6c518a017007afbfb0d918d95df37':
docs:build system updates [CP]

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:40:46 +0000 (19:40 +0000)]

am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP]

* commit '8e29e218a811237175f69b4260308fc653b77ff0':
fix migrate guide and other studio edits [CP]

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:40:22 +0000 (19:40 +0000)]

am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP]

* commit '8dac5b5e8710b9d2ff8acbee3e2de349a9518f44':
docs:sdk installing file update [CP]

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:40:16 +0000 (19:40 +0000)]

am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP]

* commit 'c5d38e7345e4185231197c2976fe2218a0547eeb':
new Android Studio download page [CP]

commit | commitdiff | tree

Rich Slogar [Mon, 8 Dec 2014 19:40:09 +0000 (19:40 +0000)]

am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP]

* commit 'd0a96b6742e03213b8d8d28f13a069029514f6f9':
docs: publishing with studio [CP]

commit | commitdiff | tree

smain@google.com [Mon, 8 Dec 2014 19:40:03 +0000 (19:40 +0000)]

am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP]

* commit 'd1ffd1e3de1590ff7330706b8c1221992f3634ec':
docs: new Eclipse menu [CP]

commit | commitdiff | tree

Rich Slogar [Mon, 8 Dec 2014 19:39:55 +0000 (19:39 +0000)]

am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP]

* commit '2e3daaa6ea3ca883b3d7c79761517dce35319d53':
docs: studio basics v2 [CP]

commit | commitdiff | tree

Rich Slogar [Mon, 8 Dec 2014 19:39:48 +0000 (19:39 +0000)]

am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP]

* commit 'e20c9496f63db7e6980e263ad884953d565ee54c':
docs:download updates for studio [CP]

commit | commitdiff | tree

Rich Slogar [Mon, 8 Dec 2014 19:39:42 +0000 (19:39 +0000)]

am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates

* commit '7593c6ce88550ee124e86ea2b2dc1caaa680ed51':
docs:revision updates

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help