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

commit | commitdiff | tree

Svetoslav [Wed, 18 Feb 2015 02:36:12 +0000 (02:36 +0000)]

Merge "Remove unnecessary volume validators"

commit | commitdiff | tree

Svetoslav [Wed, 18 Feb 2015 02:20:29 +0000 (18:20 -0800)]

Remove unnecessary volume validators

Change-Id: I5f13016fa23978c8d35e9b85ec0ebecdf40a3d74

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Feb 2015 01:22:47 +0000 (01:22 +0000)]

Merge "More lint tests."

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Feb 2015 01:19:41 +0000 (17:19 -0800)]

More lint tests.

When overloading methods, verify that common arguments always come
first and have consistent ordering.

When methods register listeners or callbacks (outside of the UI
toolkit), verify that an overload exists that takes a Handler to
deliver events through.

When a method accepts a Context argument, it must be the first
argument.

Change-Id: I6a6f94a3a0a8c48987835e47eb87564e569db2af

commit | commitdiff | tree

Tim Murray [Wed, 18 Feb 2015 00:44:32 +0000 (00:44 +0000)]

Merge "Revert "Revert "Add BLAS intrinsic."""

commit | commitdiff | tree

Tim Murray [Wed, 18 Feb 2015 00:44:08 +0000 (00:44 +0000)]

Revert "Revert "Add BLAS intrinsic.""

This reverts commit aaab02a91fcb33388d958a6402b2e77481a0d5b2.

Change-Id: Iabc3684a9a8c2f9a781029f55120f0346ee9b289

commit | commitdiff | tree

Marco Nelissen [Wed, 18 Feb 2015 00:40:19 +0000 (00:40 +0000)]

am 2fddfea3: am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

* commit '2fddfea3e5311bb5503d148d7ad18240a13ee033':
Fix NPE

commit | commitdiff | tree

Craig Mautner [Wed, 18 Feb 2015 00:40:14 +0000 (00:40 +0000)]

am 2007a630: (-s ours) am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

* commit '2007a630d4767b4e90f8ed727acd574424c2183c':
Do not make ActivityContainer available to apps. DO NOT MERGE

commit | commitdiff | tree

Alan Viverette [Wed, 18 Feb 2015 00:30:24 +0000 (00:30 +0000)]

am b20d48fd: am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

* commit 'b20d48fd20928cf3167ee37649d702c90c7e0218':
Revert "Fixed accessibility for the pin input view on keyguard."

commit | commitdiff | tree

Alan Viverette [Wed, 18 Feb 2015 00:30:15 +0000 (00:30 +0000)]

am 7286d1ff: am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev

* commit '7286d1ff3747d3a71aeb2c8724947b35cc77d2d5':
Fix year picker initial range

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:30:08 +0000 (00:30 +0000)]

am 65d12bf7: am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00

* commit '65d12bf7f14ff7568cc3011793e219391f9c3d29':
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

Oliver Woodman [Wed, 18 Feb 2015 00:30:04 +0000 (00:30 +0000)]

am ea970051: am aa5b5b74: am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d

* commit 'ea970051283dc11da11897771608f306b9fdfbbb':

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:30:00 +0000 (00:30 +0000)]

am d9a8bce7: am fa0ac1fd: am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545

* commit 'd9a8bce7e01e9b9483570f17ac243c1f30e01f3e':

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:29:56 +0000 (00:29 +0000)]

am 39545001: am cb5f052e: am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9

* commit '39545001fce300933da64671ad8cf17c7efd99d9':

commit | commitdiff | tree

David Friedman [Wed, 18 Feb 2015 00:29:52 +0000 (00:29 +0000)]

am 480fb3fa: am 32759833: am 40191d8e: am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0

* commit '480fb3fa913e0b7e57e23ae9f9f66d192c0ce904':

commit | commitdiff | tree

Deepanshu Gupta [Wed, 18 Feb 2015 00:29:47 +0000 (00:29 +0000)]

am bd966f8f: am 803499e1: am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991

* commit 'bd966f8f69663a49bb0bc456da409bab38a99835':

commit | commitdiff | tree

Amith Yamasani [Wed, 18 Feb 2015 00:19:22 +0000 (00:19 +0000)]

Merge "Save per-user camera policy in different system properties"

commit | commitdiff | tree

Marco Nelissen [Wed, 18 Feb 2015 00:15:00 +0000 (00:15 +0000)]

am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

* commit 'a3404263c08c711fa5f2d73a92ec7c6f366b9338':
Fix NPE

commit | commitdiff | tree

Svetoslav [Wed, 18 Feb 2015 00:11:46 +0000 (00:11 +0000)]

Merge "Add dump support to the settings provider"

commit | commitdiff | tree

Marco Nelissen [Wed, 18 Feb 2015 00:07:58 +0000 (00:07 +0000)]

am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

* commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
Fix NPE

commit | commitdiff | tree

Sasha Levitskiy [Wed, 18 Feb 2015 00:03:02 +0000 (00:03 +0000)]

Merge "Fingerprint: Adjust to HAL2 spec."

commit | commitdiff | tree

Marco Nelissen [Wed, 18 Feb 2015 00:01:02 +0000 (00:01 +0000)]

am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
Fix NPE

commit | commitdiff | tree

Diego Perez [Wed, 18 Feb 2015 00:00:53 +0000 (00:00 +0000)]

am a0235f8b: am d66f2eb2: am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed
automerge: 8a8b006

* commit '8a8b00686f23409b509dcc8099cc6e5b1d1e54e1':

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 23:59:21 +0000 (23:59 +0000)]

am 79ded2d0: am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416
automerge: f242e92

* commit 'f242e927ba4a2ded015c0654bfde85402b7d04b2':

commit | commitdiff | tree

Oliver Woodman [Tue, 17 Feb 2015 23:57:47 +0000 (23:57 +0000)]

am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d automerge: 1289d52
automerge: 6a71e81

* commit '6a71e814a3207fbe2cffe0650a1c37688f2aa62e':
Update ExoPlayer developer guide.

commit | commitdiff | tree

Svetoslav [Tue, 17 Feb 2015 20:41:04 +0000 (12:41 -0800)]

Add dump support to the settings provider

Change-Id: I1338af4c660e3ecc412954a7cb9b820952aae523

commit | commitdiff | tree

Marco Nelissen [Tue, 17 Feb 2015 23:54:29 +0000 (23:54 +0000)]

Merge "Fix NPE" into lmp-mr1-dev

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:53:11 +0000 (23:53 +0000)]

am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e':
Do not make ActivityContainer available to apps. DO NOT MERGE

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:50:16 +0000 (23:50 +0000)]

Merge "Fix NPE in DisplayContent.setTouchExcludeRegion."

commit | commitdiff | tree

Chris Craik [Tue, 17 Feb 2015 23:46:33 +0000 (23:46 +0000)]

Merge "Glop SkiaShader support"

commit | commitdiff | tree

Chris Craik [Sat, 14 Feb 2015 01:47:21 +0000 (17:47 -0800)]

Glop SkiaShader support

Change-Id: I894a0b62701bd02367ab970813e4c332147351a2

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 23:44:47 +0000 (23:44 +0000)]

am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545 automerge: 696ea51
automerge: 0a87137

* commit '0a8713799cb6ebab4f40ef3313ea71df9c580146':
docs: studio revision 1-1

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:43:33 +0000 (23:43 +0000)]

am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
Do not make ActivityContainer available to apps. DO NOT MERGE

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 23:43:03 +0000 (23:43 +0000)]

am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9 automerge: 4826bed
automerge: 7b3a118

* commit '7b3a11802ad2c344577f651f1a0ef5083b4133eb':
docs: android plugin for gradle revisions page

commit | commitdiff | tree

David Friedman [Tue, 17 Feb 2015 23:41:29 +0000 (23:41 +0000)]

am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0 automerge: 40191d8
automerge: cdf0774

* commit 'cdf0774314842eb16f8db2b822a6d6538f17090e':
This file is misplaced, and serves no purpose. I am sending it to oblivion.

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 23:40:11 +0000 (23:40 +0000)]

am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991 automerge: c2fa5e2
automerge: 7bf58d0

* commit '7bf58d0c5523a9b76ab1d570acb92514e8fff8ba':
Add Asset management support for fonts.

commit | commitdiff | tree

Diego Perez [Tue, 17 Feb 2015 23:38:48 +0000 (23:38 +0000)]

am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed automerge: d66f2eb
automerge: 412e643

* commit '412e6439b2d372565f14cc1dce0ff25f106975af':
Do not paint shadow if outside of the clip area

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 23:37:13 +0000 (23:37 +0000)]

am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416 automerge: f12d023
automerge: 5cc0e76

* commit '5cc0e76464f170d987370bb7bf9c04d746795f12':
Changes made by intelliJ 14.1

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:36:51 +0000 (23:36 +0000)]

am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
Do not make ActivityContainer available to apps. DO NOT MERGE

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:30:33 +0000 (23:30 +0000)]

Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:09:47 +0000 (15:09 -0800)]

Fix NPE in DisplayContent.setTouchExcludeRegion.

DisplayContent.mTapDetector is null for any non-default display. When
testing ActivityView DisplayContent.setTouchExcludeRegion() throws an
NPE when dereferencing mTapDetector.

This change adds a null test to avoid the NPE.

Fixes bug 19413700.

Change-Id: I48a66c0ed071c87b38b354eead58a4de97fb47b9

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 23:06:55 +0000 (23:06 +0000)]

am 014442c2: am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

* commit '014442c28eae214af56f4c1fe3e0c21d5b091d25':
Revert "Fixed accessibility for the pin input view on keyguard."

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:59:29 +0000 (22:59 +0000)]

am 0dfae079: am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

* commit '0dfae079633764c3b6fceaea38fdc664e0e5a76d':
Revert "Fixed accessibility for the pin input view on keyguard."

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:52:06 +0000 (22:52 +0000)]

am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

* commit 'd5471a0b2bf938cf83f4abac66a18664d8ca5277':
Revert "Fixed accessibility for the pin input view on keyguard."

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:51:53 +0000 (22:51 +0000)]

am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev

* commit '157c75e4b55d34d0426d08044130d74c2369be07':
Fix year picker initial range

commit | commitdiff | tree

Ed Heyl [Tue, 17 Feb 2015 22:51:48 +0000 (14:51 -0800)]

Revert "Add BLAS intrinsic."

This reverts commit 25207df658d6a8a3e885c7017fcc25702363583c.

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:51:48 +0000 (22:51 +0000)]

am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00

* commit 'c7067053252413f78edbd6f21618a65a72235542':
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

Oliver Woodman [Tue, 17 Feb 2015 22:51:43 +0000 (22:51 +0000)]

am aa5b5b74: am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d

* commit 'aa5b5b7465bf667328d7400dee51f1d93412ef6c':

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:51:38 +0000 (22:51 +0000)]

am fa0ac1fd: am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545

* commit 'fa0ac1fd5c7489a193f5aad55c5ed1292da8fcc0':

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:51:33 +0000 (22:51 +0000)]

am cb5f052e: am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9

* commit 'cb5f052e1179887c0f9cddb1f24120f5f3b75a05':

commit | commitdiff | tree

David Friedman [Tue, 17 Feb 2015 22:51:27 +0000 (22:51 +0000)]

am 32759833: am 40191d8e: am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0

* commit '32759833c0f8ff8f257f3d0436438e760fafca68':

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:51:19 +0000 (22:51 +0000)]

am 803499e1: am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991

* commit '803499e1dbb2206f19751dede54ebfc25ccaa6b2':

commit | commitdiff | tree

Diego Perez [Tue, 17 Feb 2015 22:51:14 +0000 (22:51 +0000)]

am a0235f8b: am d66f2eb2: am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed

* commit 'a0235f8bb9b78caa065d1857d435e4a45f5c9bce':

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:51:09 +0000 (22:51 +0000)]

am 79ded2d0: am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416

* commit '79ded2d035a53135dfd23caaf635b5a9a9f8ddc0':

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:48:04 +0000 (22:48 +0000)]

Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

commit | commitdiff | tree

Oliver Woodman [Tue, 17 Feb 2015 22:47:16 +0000 (22:47 +0000)]

am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d
automerge: 1289d52

* commit '1289d522986e44c681bae020cb6dffe1d563b1ed':
Update ExoPlayer developer guide.

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:45:49 +0000 (22:45 +0000)]

am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545
automerge: 696ea51

* commit '696ea51a1c7c01061daf8693101e48d5d0701293':
docs: studio revision 1-1

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:43:17 +0000 (22:43 +0000)]

am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9
automerge: 4826bed

* commit '4826bed5dbb07bc819db071b02de7c30925ff8a6':
docs: android plugin for gradle revisions page

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:41:15 +0000 (22:41 +0000)]

am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev

* commit '504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de':
Fix year picker initial range

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:41:11 +0000 (22:41 +0000)]

am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00

* commit '2b29d96f0718f55429d0140ef9227310f42b228a':
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

David Friedman [Tue, 17 Feb 2015 22:41:10 +0000 (22:41 +0000)]

am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0
automerge: 40191d8

* commit '40191d8e780724107c87edc5b1cfcea68a1442ca':
This file is misplaced, and serves no purpose. I am sending it to oblivion.

commit | commitdiff | tree

Oliver Woodman [Tue, 17 Feb 2015 22:41:07 +0000 (22:41 +0000)]

am 1289d522: am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d

* commit '1289d522986e44c681bae020cb6dffe1d563b1ed':
Update ExoPlayer developer guide.

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:41:04 +0000 (22:41 +0000)]

am 696ea51a: am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545

* commit '696ea51a1c7c01061daf8693101e48d5d0701293':
docs: studio revision 1-1

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:41:00 +0000 (22:41 +0000)]

am 4826bed5: am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9

* commit '4826bed5dbb07bc819db071b02de7c30925ff8a6':
docs: android plugin for gradle revisions page

commit | commitdiff | tree

David Friedman [Tue, 17 Feb 2015 22:40:57 +0000 (22:40 +0000)]

am 40191d8e: am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0

* commit '40191d8e780724107c87edc5b1cfcea68a1442ca':
This file is misplaced, and serves no purpose. I am sending it to oblivion.

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:39:48 +0000 (22:39 +0000)]

am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991
automerge: c2fa5e2

* commit 'c2fa5e205e617df6b622cb54fac77738e82e6320':
Add Asset management support for fonts.

commit | commitdiff | tree

Diego Perez [Tue, 17 Feb 2015 22:38:37 +0000 (22:38 +0000)]

am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed
automerge: d66f2eb

* commit 'd66f2eb241ba8676ef01f4efd23be5ae62d3a7aa':
Do not paint shadow if outside of the clip area

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:36:59 +0000 (22:36 +0000)]

am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416
automerge: f12d023

* commit 'f12d02339fefc4111b62715d5c0fb2e58570c34b':
Changes made by intelliJ 14.1

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:36:06 +0000 (22:36 +0000)]

am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev

* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
Fix year picker initial range

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:36:02 +0000 (22:36 +0000)]

am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00

* commit '82510fa5a63114e75c0ed154120e0ca92d401524':
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

Marco Nelissen [Tue, 17 Feb 2015 22:31:33 +0000 (14:31 -0800)]

Fix NPE

Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.

Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:33:03 +0000 (22:33 +0000)]

Merge "Fix year picker initial range" into lmp-mr1-dev

commit | commitdiff | tree

Oliver Woodman [Tue, 17 Feb 2015 22:31:41 +0000 (22:31 +0000)]

am 2a6bf82e: am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge: a40eb5d

* commit '2a6bf82e26f5099b6659055c9b5ffce09efaedfd':
Update ExoPlayer developer guide.

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:31:37 +0000 (22:31 +0000)]

am dbb32faf: am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge: bff1545

* commit 'dbb32faf33c95b245d75c0dc8d4578a011378f78':
docs: studio revision 1-1

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:31:33 +0000 (22:31 +0000)]

am 2d43b730: am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge: cb73fb9

* commit '2d43b7300dfad8bbf54d88e7b315d2ea38023131':
docs: android plugin for gradle revisions page

commit | commitdiff | tree

David Friedman [Tue, 17 Feb 2015 22:31:28 +0000 (22:31 +0000)]

am a6614a12: am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge: efb69b0

* commit 'a6614a12bbc6715af843d26f66fb32ae854323e6':
This file is misplaced, and serves no purpose. I am sending it to oblivion.

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:31:24 +0000 (22:31 +0000)]

am c2fa5e20: am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991

* commit 'c2fa5e205e617df6b622cb54fac77738e82e6320':
Add Asset management support for fonts.

commit | commitdiff | tree

Diego Perez [Tue, 17 Feb 2015 22:31:21 +0000 (22:31 +0000)]

am d66f2eb2: am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed

* commit 'd66f2eb241ba8676ef01f4efd23be5ae62d3a7aa':
Do not paint shadow if outside of the clip area

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:31:17 +0000 (22:31 +0000)]

am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416

* commit 'f12d02339fefc4111b62715d5c0fb2e58570c34b':
Changes made by intelliJ 14.1

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:28:45 +0000 (22:28 +0000)]

am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
automerge: fa40f00

* commit 'fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

Oliver Woodman [Tue, 17 Feb 2015 22:27:16 +0000 (22:27 +0000)]

am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
automerge: a40eb5d

* commit 'a40eb5db455ebb225a7ff0afa244256079d8cf20':
Update ExoPlayer developer guide.

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:25:53 +0000 (22:25 +0000)]

am 8c124744: am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
automerge: bff1545

* commit 'bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
docs: studio revision 1-1

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:24:38 +0000 (22:24 +0000)]

am d2856643: am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
automerge: cb73fb9

* commit 'cb73fb90443a3a3fee645aa3f01d38b19f108377':
docs: android plugin for gradle revisions page

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:24:17 +0000 (22:24 +0000)]

am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge: 0684991

* commit '0a300b897711bfa39e0d30e2fa61664f01fb58d8':
Add Asset management support for fonts.

commit | commitdiff | tree

Diego Perez [Tue, 17 Feb 2015 22:24:14 +0000 (22:24 +0000)]

am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed

* commit 'a0fb87a3b831e8eb4e4f7e03fc170cf8f93a2161':
Do not paint shadow if outside of the clip area

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:24:09 +0000 (22:24 +0000)]

am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416

* commit '221d732005b04b5f979d2e03e8ebe00160e52ca3':
Changes made by intelliJ 14.1

commit | commitdiff | tree

David Friedman [Tue, 17 Feb 2015 22:22:50 +0000 (22:22 +0000)]

am 53ec037f: am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
automerge: efb69b0

* commit 'efb69b003e24757fbf04f219a61a4a71adada3a2':
This file is misplaced, and serves no purpose. I am sending it to oblivion.

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:21:11 +0000 (22:21 +0000)]

am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
automerge: 0684991

* commit '068499111c173fdd9869e7dbe5b9de857aca1c2d':
Add Asset management support for fonts.

commit | commitdiff | tree

Diego Perez [Tue, 17 Feb 2015 22:19:43 +0000 (22:19 +0000)]

am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
automerge: a912fed

* commit 'a912fedbc5fba99fb75884a1941d58170822ceb4':
Do not paint shadow if outside of the clip area

commit | commitdiff | tree

Deepanshu Gupta [Tue, 17 Feb 2015 22:18:35 +0000 (22:18 +0000)]

am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
automerge: 4e47416

* commit '4e47416012b8cb88d564a04a29c0b79a28b9e529':
Changes made by intelliJ 14.1

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:13:37 +0000 (22:13 +0000)]

am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs

* commit '9c9a3afb95dcac7bf356edf25c8d86187ea59afd':
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

Tim Murray [Tue, 17 Feb 2015 22:13:06 +0000 (22:13 +0000)]

am 41c93ffe: Merge "Add BLAS intrinsic." automerge: 712572d
automerge: 27e554c

* commit '27e554c78f36f3afeb8e64c6c57326dc887e91c7':
Add BLAS intrinsic.

commit | commitdiff | tree

Tim Murray [Tue, 17 Feb 2015 22:08:18 +0000 (22:08 +0000)]

am 41c93ffe: Merge "Add BLAS intrinsic."
automerge: 712572d

* commit '712572d406b47b7f3d913bbac72f35fe9808a86f':
Add BLAS intrinsic.

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:06:21 +0000 (22:06 +0000)]

am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs

* commit '8823b93d5c32bb7a8c757022ce055ca53b71171f':
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

Tim Murray [Tue, 17 Feb 2015 22:02:48 +0000 (22:02 +0000)]

am 41c93ffe: Merge "Add BLAS intrinsic."

* commit '41c93ffee5bd271cabc4c111994c1d30970933b1':
Add BLAS intrinsic.

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 22:02:44 +0000 (22:02 +0000)]

Merge changes If3a78fc7,Ifbe3f03a into lmp-docs

* changes:
docs: studio proxy setting setup
docs: studio proxy setup

commit | commitdiff | tree

Tim Murray [Tue, 17 Feb 2015 21:57:23 +0000 (21:57 +0000)]

Merge "Add BLAS intrinsic."

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 21:09:04 +0000 (13:09 -0800)]

Fix year picker initial range

BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9

commit | commitdiff | tree

Tim Murray [Tue, 13 Jan 2015 00:47:56 +0000 (16:47 -0800)]

Add BLAS intrinsic.

Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324

commit | commitdiff | tree

Oliver Woodman [Tue, 17 Feb 2015 20:59:50 +0000 (20:59 +0000)]

am 533149d5: am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs

* commit '533149d54f881e07f36c2fd62c861942542340fc':
Update ExoPlayer developer guide.