OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 09:56:23 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into...
Dongwon Kang [Tue, 28 Apr 2015 09:25:49 +0000 (09:25 +0000)]
Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 08:43:47 +0000 (01:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I25003c7f81d46bc95432d22aeb7657fef7c76579
Auto-generated-cl: translation import

9 years agoTIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Dongwon Kang [Tue, 28 Apr 2015 08:24:51 +0000 (17:24 +0900)]
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.

Bug: 20509313
Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689

9 years agoMerge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
Martijn Coenen [Tue, 28 Apr 2015 07:50:12 +0000 (07:50 +0000)]
Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev

9 years agoMerge "Fix: End handle disappears when the selection is short." into mnc-dev
Keisuke Kuroyanagi [Tue, 28 Apr 2015 04:58:42 +0000 (04:58 +0000)]
Merge "Fix: End handle disappears when the selection is short." into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 04:38:29 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I56af308506de3258cefb3c96d49ca5ccaed1a57d
Auto-generated-cl: translation import

9 years agoam ff31bb4b: am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes...
Joe Fernandez [Tue, 28 Apr 2015 00:36:29 +0000 (00:36 +0000)]
am ff31bb4b: am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs

* commit 'ff31bb4bb7d46766552526f6580a76445a549339':
  docs: Add note about overriding onConnectedNodes() when listening for capability node changes.

9 years agoam 80d19484: am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfA...
Joe Fernandez [Tue, 28 Apr 2015 00:36:23 +0000 (00:36 +0000)]
am 80d19484: am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs

* commit '80d19484c109c4beb0e36b7ce0418ebe526ad300':
  docs: Update Wearable API setup to mention addApiIfAvailable().

9 years agoMerge "MediaController: workaround to disable seek" into mnc-dev
Robert Shih [Tue, 28 Apr 2015 00:30:11 +0000 (00:30 +0000)]
Merge "MediaController: workaround to disable seek" into mnc-dev

9 years agoam 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening...
Joe Fernandez [Tue, 28 Apr 2015 00:24:26 +0000 (00:24 +0000)]
am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs

* commit '68ef92871f52bad28d5aea168c0d3a4b863d282d':
  docs: Add note about overriding onConnectedNodes() when listening for capability node changes.

9 years agoam 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable...
Joe Fernandez [Tue, 28 Apr 2015 00:24:19 +0000 (00:24 +0000)]
am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs

* commit '185002bcc9b551828557ab6946fef7fef1c17d74':
  docs: Update Wearable API setup to mention addApiIfAvailable().

9 years agoMerge "docs: Add note about overriding onConnectedNodes() when listening for capabili...
Joe Fernandez [Tue, 28 Apr 2015 00:03:49 +0000 (00:03 +0000)]
Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs

9 years agoMerge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp...
Joe Fernandez [Tue, 28 Apr 2015 00:00:08 +0000 (00:00 +0000)]
Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs

9 years agoMerge "Add some missing Settings and DayNight themes" into mnc-dev
Alan Viverette [Mon, 27 Apr 2015 23:27:11 +0000 (23:27 +0000)]
Merge "Add some missing Settings and DayNight themes" into mnc-dev

9 years agoMerge "Fix view outline for shadows in LayoutLib." into mnc-dev
Deepanshu Gupta [Mon, 27 Apr 2015 23:20:34 +0000 (23:20 +0000)]
Merge "Fix view outline for shadows in LayoutLib." into mnc-dev

9 years agoAdd some missing Settings and DayNight themes
Alan Viverette [Mon, 27 Apr 2015 23:07:11 +0000 (16:07 -0700)]
Add some missing Settings and DayNight themes

Bug: 20546201
Change-Id: I1eeaf3c76c17b773bb7d9b19ad7fa84479b70f41

9 years agoMerge "Expose drawTextRun publicly" into mnc-dev
Raph Levien [Mon, 27 Apr 2015 22:50:33 +0000 (22:50 +0000)]
Merge "Expose drawTextRun publicly" into mnc-dev

9 years agoMerge "Rename setDefaultDialerApplication for consistency" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 22:49:33 +0000 (22:49 +0000)]
Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev

9 years agoExpose drawTextRun publicly
Raph Levien [Thu, 23 Apr 2015 23:12:23 +0000 (16:12 -0700)]
Expose drawTextRun publicly

For correct low-level drawing of low level text, a method that
includes context for shaping is necessary, and it's similarly useful
to provide the direction explicitly rather than running the BiDi
algorithm on the text. The drawTextRun method (in both char[] and
CharSequence variants) has provided this functionality for several
major releases but has been internal. This patch exposes the
methods publicly, and also improves the doc strings for both
the new method and some related ones.

Bug: 20193553
Change-Id: I9be33ca5ae3e7db2b69a56298400671d5ef8ad05

9 years agoRename setDefaultDialerApplication for consistency
Yorke Lee [Mon, 27 Apr 2015 22:17:50 +0000 (15:17 -0700)]
Rename setDefaultDialerApplication for consistency

Change-Id: I8227df913bdb0ed5e1b3472f9d4ebea1158b366b

9 years agoMediaController: workaround to disable seek
Robert Shih [Mon, 27 Apr 2015 19:50:39 +0000 (12:50 -0700)]
MediaController: workaround to disable seek

An example use case is live HLS streams.

Bug:19489473
Change-Id: I9c278f2875a5faaf1af092cc84888d4280a00747

9 years agoMerge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev
Cedric Ho [Mon, 27 Apr 2015 20:58:12 +0000 (20:58 +0000)]
Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev

9 years agodocs: Update Wearable API setup to mention addApiIfAvailable().
Luan Nguyen [Wed, 22 Apr 2015 21:48:46 +0000 (14:48 -0700)]
docs: Update Wearable API setup to mention addApiIfAvailable().

bug: 20486912
Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee

9 years agoresolved conflicts for merge of 0af3af03 to mnc-dev
Cedric Ho [Mon, 27 Apr 2015 20:16:18 +0000 (13:16 -0700)]
resolved conflicts for merge of 0af3af03 to mnc-dev

Change-Id: I38f423be6dcef216cf813aa0f747be38f0ad792f

9 years agoMerge "Add utility method isDefaultOrSystemDialer" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 19:56:58 +0000 (19:56 +0000)]
Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev

9 years agoAdd utility method isDefaultOrSystemDialer
Yorke Lee [Mon, 27 Apr 2015 18:18:38 +0000 (11:18 -0700)]
Add utility method isDefaultOrSystemDialer

Will be used by various system components to determine if a
given package name is a privileged Dialer

Bug: 20333102
Bug: 20304411
Change-Id: I1e5bcbde8ee9a5dc6936b118b1b78f32d97737a6

9 years agoFix vmalloc memory accounting (DO NOT MERGE).
Martijn Coenen [Thu, 23 Apr 2015 19:55:58 +0000 (21:55 +0200)]
Fix vmalloc memory accounting (DO NOT MERGE).

VmallocUsed from meminfo sums all vmalloc'd
memory areas, but it shouldn't count the areas
that were mapped with ioremap(); ioremap()'d
ranges usually map to I/O memory, not actual
physical memory.

Binder and CMA are exceptions, but in the
common case we're more accurate not counting
those regions either.

Bug: 20483106
Change-Id: I75e74d9477a30a3de84877531b6e614a71469d24
(cherry picked from commit f33b6292168ea6e90c9d52d477c922af23001f63)

9 years agoMerge "Anti-alias by default" into mnc-dev
Chris Craik [Mon, 27 Apr 2015 19:28:01 +0000 (19:28 +0000)]
Merge "Anti-alias by default" into mnc-dev

9 years agoMerge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
Chris Craik [Mon, 27 Apr 2015 19:28:44 +0000 (19:28 +0000)]
Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev

9 years agoMerge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 18:52:03 +0000 (18:52 +0000)]
Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev

9 years agoImageWriter: Change detach to sp<GraphicBuffer>
Dan Stoza [Mon, 27 Apr 2015 18:31:12 +0000 (11:31 -0700)]
ImageWriter: Change detach to sp<GraphicBuffer>

Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.

Bug: 20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736

9 years agodocs: Add note about overriding onConnectedNodes() when listening
Luan Nguyen [Thu, 23 Apr 2015 17:32:31 +0000 (10:32 -0700)]
docs: Add note about overriding onConnectedNodes() when listening
for capability node changes.

bug: 20523695
Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842

9 years agoPromote RenderProperties with an alpha to have a RenderLayer
Chris Craik [Tue, 21 Apr 2015 22:13:29 +0000 (15:13 -0700)]
Promote RenderProperties with an alpha to have a RenderLayer

bug:20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc

9 years agoAnti-alias by default
Chris Craik [Fri, 24 Apr 2015 17:46:46 +0000 (10:46 -0700)]
Anti-alias by default

Change-Id: I19434717dd3af4fdcffbfcca2ffbb485dfebe644

9 years agoMerge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
Adam Powell [Mon, 27 Apr 2015 18:03:07 +0000 (18:03 +0000)]
Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev

9 years agoMerge "DO NOT MERGE Do not clean up global/system settings on package unintalls....
Svet Ganov [Mon, 27 Apr 2015 17:50:00 +0000 (17:50 +0000)]
Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev

9 years agoMerge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
Arunesh Mishra [Mon, 27 Apr 2015 17:49:48 +0000 (17:49 +0000)]
Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev

9 years agoDO NOT MERGE Do not clean up global/system settings on package unintalls.
Svet Ganov [Mon, 27 Apr 2015 16:33:40 +0000 (09:33 -0700)]
DO NOT MERGE Do not clean up global/system settings on package unintalls.

Legacy apps can write their own entries in the system settings and
when they get uninstalled these are hanging around forever polluting
the settings table. We keep track of which settings an app added and
when the app is uninstalled we drop its custom entries. The trouble
was that we did the same thing for global and secure settings with
no explicit list of platform defined settings. Hence, if say a test
signed by the platform certificate touches platform defined global
or secure settings and is then uninstalled, we would drop the platform
defined entries portentially crippling the system.

bug:20113160

Change-Id: Ia21694f6326ad4a1795c4666027b366e26c05a23
(cherry picked from commit b128540dc741c424d4f652419686882b7a3bfa06)

9 years agoam 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs...
Scott Rowe [Mon, 27 Apr 2015 17:48:38 +0000 (17:48 +0000)]
am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8':

9 years agoam ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to...
Andrew Solovay [Mon, 27 Apr 2015 17:48:32 +0000 (17:48 +0000)]
am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit 'ec472abfa22ecbd42f295fb17bd9414386c6a065':

9 years agoam bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for...
Andrew Solovay [Mon, 27 Apr 2015 17:48:27 +0000 (17:48 +0000)]
am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit 'bd719d7ba94b87ec89cbdbfde74f007bb1047d2b':

9 years agoam 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd...
Quddus Chong [Mon, 27 Apr 2015 17:48:21 +0000 (17:48 +0000)]
am 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit '5edfdac4b8264e3c94673eaede8f17a3568b8496':

9 years agoAdd near-ultrasound properties to AudioManager.java
Arunesh Mishra [Mon, 27 Apr 2015 16:39:00 +0000 (09:39 -0700)]
Add near-ultrasound properties to AudioManager.java

Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc

9 years agoMerge "Allow device initializers to set a preferred setup activity." into mnc-dev
Julia Reynolds [Mon, 27 Apr 2015 17:29:21 +0000 (17:29 +0000)]
Merge "Allow device initializers to set a preferred setup activity." into mnc-dev

9 years agoFix view outline for shadows in LayoutLib.
Deepanshu Gupta [Mon, 20 Apr 2015 21:18:50 +0000 (14:18 -0700)]
Fix view outline for shadows in LayoutLib.

Set the bounds on the drawable before getting the view outline for
shadow. Also, reuse the temp outline object in AttachInfo rather than
allocating a new one each time.

Change-Id: I69793d38d60c5b9f9050569f2b22fbc7b90620bf

9 years agoWire up caller chooser targets for ChooserActivity
Adam Powell [Fri, 24 Apr 2015 00:19:37 +0000 (17:19 -0700)]
Wire up caller chooser targets for ChooserActivity

Add the caller-supplied ChooserTargets from EXTRA_CHOOSER_TARGETS in
the default ChooserActivity. These appear before other options.

Change-Id: Ic4d23ae9ecdfd0cc8a5ac077696d7334a8f844a6

9 years agoMerge "Introduce disable2 into StatusBarManager" into mnc-dev
Benjamin Franz [Mon, 27 Apr 2015 17:03:16 +0000 (17:03 +0000)]
Merge "Introduce disable2 into StatusBarManager" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 17:02:14 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 17:00:00 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I25475f80c0d13df9f72b8504b0468eee5203d521
Auto-generated-cl: translation import

9 years agoAllow device initializers to set a preferred setup activity.
Julia Reynolds [Mon, 20 Apr 2015 20:42:54 +0000 (16:42 -0400)]
Allow device initializers to set a preferred setup activity.

This activity will launch by default on device reboot or user switch
during user initialization, even if there are higher priority 'home'
activities.

Bug: 20223050
Change-Id: I335aeb010a1ae5db07a4343d26e160c74bd299e1

9 years agoIntroduce disable2 into StatusBarManager
Benjamin Franz [Thu, 23 Apr 2015 16:19:48 +0000 (17:19 +0100)]
Introduce disable2 into StatusBarManager

We ran out of space for new disable flags, so need to introduce a
disable2 API into StatusBarManager and update all the underlying code
to support the second set of flags.

Bug: 20331928
Change-Id: I5009b393133c576b37d7e2bae0df97cb8c41a065

9 years agoam 991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
Cedric Ho [Mon, 27 Apr 2015 16:41:33 +0000 (16:41 +0000)]
am 991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev

* commit '991c8c53aff32f3d605f6715b3fa78a86990f7ff':
  Enable VoiceInteractionService on watch.

9 years agoam 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats...
Scott Rowe [Mon, 27 Apr 2015 16:33:01 +0000 (16:33 +0000)]
am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '6360428359bd1a4db1c9a569d8f9e1af8baf29fb':

9 years agoam 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes...
Andrew Solovay [Mon, 27 Apr 2015 16:32:56 +0000 (16:32 +0000)]
am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit '44199d26d2305b45086695acb1c851aae7328706':

9 years agoam 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions...
Andrew Solovay [Mon, 27 Apr 2015 16:32:50 +0000 (16:32 +0000)]
am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit '19bc81dbbaeef90f1417d78a18a96120b8d81762':

9 years agoam a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs...
Quddus Chong [Mon, 27 Apr 2015 16:32:44 +0000 (16:32 +0000)]
am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit 'a76a3dd3a90451e78672ccd52b004e6948bf21b7':

9 years agoMerge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
Cedric Ho [Mon, 27 Apr 2015 15:47:26 +0000 (15:47 +0000)]
Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 14:35:58 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:33:21 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7d4844ba446d75b4596a0213579fb94395df3d92
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:18:39 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: I614f77f977e342c3b374da72501c1b8de0a7abf3
Auto-generated-cl: translation import

9 years agoFix: Selection handles are wrongly shown.
Keisuke Kuroyanagi [Wed, 22 Apr 2015 12:27:08 +0000 (21:27 +0900)]
Fix: Selection handles are wrongly shown.

Selection handles were always shown when selection action
mode is started at first time. When the action mode is
started without a selection, only insertion handle must be
shown.

Bug: 20264980
Bug: 20407551

Change-Id: I630804e007f795d28f87e3fa6cba0de5bf588c78

9 years agoFix: End handle disappears when the selection is short.
Keisuke Kuroyanagi [Wed, 22 Apr 2015 12:41:14 +0000 (21:41 +0900)]
Fix: End handle disappears when the selection is short.

HandleView#isVisible didn't use getHorizontalOffset; thus,
the position is always computed as if Gravity.LEFT is set.
As a result, isVisible can be wrongly false for the end
handle and the handle is dismissed.

Bug: 20480054
Change-Id: Ib3242000bb98ae28e0cb37bf5b05069754abbfc6

9 years agoam 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New secti...
Quddus Chong [Mon, 27 Apr 2015 08:16:18 +0000 (08:16 +0000)]
am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '41df3b4b4f3601567003cbbc742dbb748b4f01fe':

9 years agoam 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Mon, 27 Apr 2015 08:16:13 +0000 (08:16 +0000)]
am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '0233b9aa462ac42a8dec3b61d4168d9e64ca93e1':

9 years agoam bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear...
Luan Nguyen [Mon, 27 Apr 2015 08:16:07 +0000 (08:16 +0000)]
am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit 'bcfee8112a386f06b94d319bf3e477c36766e295':

9 years agoam c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android...
Quddus Chong [Mon, 27 Apr 2015 08:16:01 +0000 (08:16 +0000)]
am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit 'c141efed1b6edc496c65a056264748cee102f2d9':

9 years agoam ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribu...
Ryosuke Matsuuchi [Mon, 27 Apr 2015 08:15:55 +0000 (08:15 +0000)]
am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit 'ed6c8ff17f61b547f4f2a85776e514f8ab5a5241':

9 years agoam 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page...
Dirk Dougherty [Mon, 27 Apr 2015 08:15:50 +0000 (08:15 +0000)]
am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '7f2bdf885d0b72fa6e4c21953d0a0ca5d53ebbd1':

9 years agoam 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog...
Rich Slogar [Mon, 27 Apr 2015 08:15:43 +0000 (08:15 +0000)]
am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '74c574027c409cd071476559de1a66515d7b8fa2':

9 years agoam 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into...
Rich Slogar [Mon, 27 Apr 2015 08:15:37 +0000 (08:15 +0000)]
am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '4b79a1477db467561cf6af874eb1770f355a9a5b':

9 years agoam ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS...
Quddus Chong [Mon, 27 Apr 2015 07:49:29 +0000 (07:49 +0000)]
am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit 'ab52769be2d2dc33a520459194f1e007f03970e4':

9 years agoam 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Mon, 27 Apr 2015 07:49:23 +0000 (07:49 +0000)]
am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '4f50a2b173e31accd8f1fbdde7e9b038914746e7':

9 years agoam bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp...
Luan Nguyen [Mon, 27 Apr 2015 07:49:16 +0000 (07:49 +0000)]
am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit 'bed3f49b5547642c76901d848c08163463ab4fbe':

9 years agoam 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing...
Quddus Chong [Mon, 27 Apr 2015 07:49:10 +0000 (07:49 +0000)]
am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit '9c8f8117c1ed2fbf2181011116287b5f6c6dbe9d':

9 years agoam 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page...
Ryosuke Matsuuchi [Mon, 27 Apr 2015 07:49:03 +0000 (07:49 +0000)]
am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '3cd98ab63cf4bee489de9077e62c93a13f9e66b2':

9 years agoam d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Mon, 27 Apr 2015 07:48:52 +0000 (07:48 +0000)]
am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit 'd668578f6f7a5623bc88afa1e39bb19ede91879e':

9 years agoam 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp...
Rich Slogar [Mon, 27 Apr 2015 07:48:44 +0000 (07:48 +0000)]
am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '03389e7e4a74a92b6bcae5474e9b2c887ac2d335':

9 years agoam 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
Rich Slogar [Mon, 27 Apr 2015 07:48:37 +0000 (07:48 +0000)]
am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '5fb293b27d71cc1b8949179c30d43fc057ae05fb':

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 01:52:36 +0000 (01:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 01:47:08 +0000 (18:47 -0700)]
Import translations. DO NOT MERGE

Change-Id: I88ab579013a6824872195c6c7714055462d63340
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 01:43:32 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 01:32:53 +0000 (18:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id361b7e87a85cb100addc326bc74ce7db4ba10f2
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 01:29:43 +0000 (18:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9acb57cbfcf1d50e6380c6c5ee091fe49912f43e
Auto-generated-cl: translation import

9 years agoam 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android...
Scott Rowe [Sun, 26 Apr 2015 22:08:07 +0000 (22:08 +0000)]
am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '02e4f2fbe6e0511789d42d5942548158d2dd154f':
  docs: Supported media protocols, codecs, formats for Android TV

9 years agoam 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings....
Andrew Solovay [Sun, 26 Apr 2015 22:07:52 +0000 (22:07 +0000)]
am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08':
  Docs: Correcting section on how to escape quotes in strings.

9 years agoam 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent...
Andrew Solovay [Sun, 26 Apr 2015 22:07:44 +0000 (22:07 +0000)]
am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent

9 years agoam f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release...
Quddus Chong [Sun, 26 Apr 2015 22:07:38 +0000 (22:07 +0000)]
am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit 'f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.

9 years agoam 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan...
Quddus Chong [Sun, 26 Apr 2015 22:00:29 +0000 (22:00 +0000)]
am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '789c59711e55be981ed2093228ded0c588e74ba0':
  docs: Added What's New section for GMS v7.3 (Parmesan).

9 years agoam 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Sun, 26 Apr 2015 19:15:52 +0000 (19:15 +0000)]
am 33ac358a: docs: Add Wear Capability training

* commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85':
  docs: Add Wear Capability training

9 years agoam 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
Luan Nguyen [Sun, 26 Apr 2015 19:15:46 +0000 (19:15 +0000)]
am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
  docs: Add Channel API summary for Wear.

9 years agoam 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0...
Quddus Chong [Sun, 26 Apr 2015 19:15:39 +0000 (19:15 +0000)]
am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit '900831f303beb4a67a871d969ac822d8b6d36460':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

9 years agoam 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Sun, 26 Apr 2015 19:15:26 +0000 (19:15 +0000)]
am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoam ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Sun, 26 Apr 2015 19:15:20 +0000 (19:15 +0000)]
am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
  Doc change: distribute landing page.

9 years agoam 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Sun, 26 Apr 2015 19:15:12 +0000 (19:15 +0000)]
am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
  docs: studio remove gradle tasks dialog

9 years agoam efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
Rich Slogar [Sun, 26 Apr 2015 19:15:04 +0000 (19:15 +0000)]
am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
  docs: hierarchyviewer updates

9 years agoam 2a8ef256: am 495227aa: Doc change: update dff image.
Dirk Dougherty [Sat, 25 Apr 2015 22:05:38 +0000 (22:05 +0000)]
am 2a8ef256: am 495227aa: Doc change: update dff image.

* commit '2a8ef2563042e2db93960ace529a2986c289d3dc':
  Doc change: update dff image.

9 years agoam 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 22:05:25 +0000 (22:05 +0000)]
am 05ad674a: am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

* commit '05ad674aa888e3f9217de0e5c3176161dd8e31aa':
  fix compiler error under FORTIFY_SOURCE=2

9 years agoam 495227aa: Doc change: update dff image.
Dirk Dougherty [Sat, 25 Apr 2015 21:59:35 +0000 (21:59 +0000)]
am 495227aa: Doc change: update dff image.

* commit '495227aab706fa6daf7f7b0b4ca741fef82c9d1d':
  Doc change: update dff image.

9 years agoam 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
Nick Kralevich [Sat, 25 Apr 2015 21:56:56 +0000 (21:56 +0000)]
am 00e165ae: am e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"

* commit '00e165aed3d53b147b153003b3b9fd3c129ff3c4':
  fix compiler error under FORTIFY_SOURCE=2