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

Etan Cohen [Thu, 3 Nov 2016 20:39:26 +0000 (20:39 +0000)]

Merge "Update service test runner to allow test args" am: 56b92e8191 am: dde9ea21e4
am: 10840d1897

Change-Id: I200c88f0d6d00bef77fe00a59f8e99b3b91f7aa2

commit | commitdiff | tree

Etan Cohen [Thu, 3 Nov 2016 20:32:54 +0000 (20:32 +0000)]

Merge "Update service test runner to allow test args" am: 56b92e8191
am: dde9ea21e4

Change-Id: I59d572e233720ecf0ddc6cbb5893323b563a3241

commit | commitdiff | tree

Greg Plesur [Thu, 3 Nov 2016 20:30:59 +0000 (20:30 +0000)]

Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2e0
am: c447d9ef6a

Change-Id: I17a831ab2c537c00452f250d151ec3f63b2d6277

commit | commitdiff | tree

Greg Plesur [Thu, 3 Nov 2016 20:29:55 +0000 (20:29 +0000)]

New Wear devices need to update their DISABLE_LOCKSCREEN_KEY. am: eb2e45369a
am: a71a0b8da1

Change-Id: I9a19eea21e008a9253ea7abbd854b21f4696548c

commit | commitdiff | tree

Etan Cohen [Thu, 3 Nov 2016 20:26:29 +0000 (20:26 +0000)]

Merge "Update service test runner to allow test args"
am: 56b92e8191

Change-Id: Ib5f44685228bab61d50dea4c5bd226c4b80c2dd1

commit | commitdiff | tree

Greg Plesur [Thu, 3 Nov 2016 20:23:29 +0000 (20:23 +0000)]

Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
am: 343dbac2e0

Change-Id: Ia7b6297443c555edc9372e6991784b2a6920d2ba

commit | commitdiff | tree

Greg Plesur [Thu, 3 Nov 2016 20:23:24 +0000 (20:23 +0000)]

New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.
am: eb2e45369a

Change-Id: I64c1cc38bc38d9d0ee6214a64c6ddfaa57095ce0

commit | commitdiff | tree

Etan Cohen [Thu, 3 Nov 2016 20:18:53 +0000 (20:18 +0000)]

Merge "Update service test runner to allow test args"

commit | commitdiff | tree

Greg Plesur [Thu, 3 Nov 2016 20:15:15 +0000 (20:15 +0000)]

Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev

commit | commitdiff | tree

Michael Kwan [Thu, 3 Nov 2016 20:03:55 +0000 (20:03 +0000)]

Merge "Disable multiwindow support for watch devices by default." into cw-f-dev am: 0d3f740316
am: 10f3eda0fd

Change-Id: I5d6ad3b9b5ce63546907f629c289229bf673186d

commit | commitdiff | tree

Michael Kwan [Thu, 3 Nov 2016 20:02:55 +0000 (20:02 +0000)]

Disable multiwindow support for watch devices by default. am: 1cb6777e51
am: 620a33b827

Change-Id: Id2f6d1e2a12c6644f41ed5f535568130139cd355

commit | commitdiff | tree

Michael Kwan [Thu, 3 Nov 2016 19:56:24 +0000 (19:56 +0000)]

Merge "Disable multiwindow support for watch devices by default." into cw-f-dev
am: 0d3f740316

Change-Id: I7867b0ff72237c7ce216f570034f6f811e5a6abb

commit | commitdiff | tree

Michael Kwan [Thu, 3 Nov 2016 19:56:20 +0000 (19:56 +0000)]

Disable multiwindow support for watch devices by default.
am: 1cb6777e51

Change-Id: I9e42480be007387109f9e58efe594dca860e3597

commit | commitdiff | tree

Michael Kwan [Thu, 3 Nov 2016 19:48:53 +0000 (19:48 +0000)]

Merge "Disable multiwindow support for watch devices by default." into cw-f-dev

commit | commitdiff | tree

Greg Plesur [Wed, 2 Nov 2016 21:10:27 +0000 (17:10 -0400)]

New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.

Previous versions of Wear forced this flag to "true."

BUG: 32591969
Change-Id: I9619eee5df5f67e92818ef0b7b45ddd2299449f1

commit | commitdiff | tree

Wyatt Riley [Thu, 3 Nov 2016 17:33:26 +0000 (17:33 +0000)]

Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
am: 8b85444802

Change-Id: I44ba889725acdb43e7eea890cc0bfa9fe3c2b5a6

commit | commitdiff | tree

Wyatt Riley [Thu, 3 Nov 2016 17:33:19 +0000 (17:33 +0000)]

High speed GPS/GNSS Navigation Information Block
am: 5d5bac8383

Change-Id: If8e8576f7e18faf6cb45ff228222c0c34be98d6d

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Nov 2016 17:27:05 +0000 (17:27 +0000)]

Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev

commit | commitdiff | tree

Richard Coles [Thu, 3 Nov 2016 14:54:09 +0000 (14:54 +0000)]

Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am: be19fe5e8a am: 9c47f5c87a
am: 0092dbabe0

Change-Id: Ic1b2d362c582513ba821f6b9035e1ac91dcfa471

commit | commitdiff | tree

Richard Coles [Thu, 3 Nov 2016 14:48:05 +0000 (14:48 +0000)]

Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am: be19fe5e8a
am: 9c47f5c87a

Change-Id: Ia5d867468080e0e48a4e5b3c08b1ee627e16cebe

commit | commitdiff | tree

Richard Coles [Thu, 3 Nov 2016 14:42:08 +0000 (14:42 +0000)]

Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
am: be19fe5e8a

Change-Id: I85e2e13f395dac085616838670c19ddbedc67e9d

commit | commitdiff | tree

Richard Coles [Thu, 3 Nov 2016 14:34:49 +0000 (14:34 +0000)]

Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."

commit | commitdiff | tree

Michael Kwan [Thu, 3 Nov 2016 08:09:08 +0000 (01:09 -0700)]

Disable multiwindow support for watch devices by default.

Bug: 30120559
Change-Id: I458eac557e38fd32533a98cca7cbbabc5fa08b09

commit | commitdiff | tree

Wyatt Riley [Tue, 1 Nov 2016 14:05:16 +0000 (07:05 -0700)]

High speed GPS/GNSS Navigation Information Block

When speed goes above 400m/s, the GnssLocationProvider will
stop output of location, measurements and navigation message.

Test: Several on device tests, see bug for details

Bug: 31711586
Change-Id: I8bceb9a67b10ac7cf21983bb856ed0608957096a

commit | commitdiff | tree

Steven Moreland [Wed, 2 Nov 2016 22:34:30 +0000 (22:34 +0000)]

Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251
am: 0d5da175a0

Change-Id: I8ed00bc19e120e76e546c2ae0610f8771077a471

commit | commitdiff | tree

Steven Moreland [Wed, 2 Nov 2016 22:28:28 +0000 (22:28 +0000)]

Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c
am: 8527f13251

Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f

commit | commitdiff | tree

Steven Moreland [Wed, 2 Nov 2016 22:23:45 +0000 (22:23 +0000)]

Merge "Update for hidlized hwservicemanager."
am: 8d0c4ed74c

Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Nov 2016 22:17:24 +0000 (22:17 +0000)]

Merge "Update for hidlized hwservicemanager."

commit | commitdiff | tree

neo.chae [Wed, 2 Nov 2016 21:25:05 +0000 (21:25 +0000)]

Merge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c
am: 3e15d09ed4

Change-Id: I7d3d7d72e92a66c48b68165e5e3d26a1ccd1b56a

commit | commitdiff | tree

neo.chae [Wed, 2 Nov 2016 21:21:32 +0000 (21:21 +0000)]

Merge "Fix idmap leak in zygote process" am: f5ad44b60a
am: 4720125a3c

Change-Id: If66e9476583ec50d2dca5a15376a4b84ae2a2885

commit | commitdiff | tree

neo.chae [Wed, 2 Nov 2016 21:16:33 +0000 (21:16 +0000)]

Merge "Fix idmap leak in zygote process"
am: f5ad44b60a

Change-Id: Ia9977c8166f797ad716284eda03076e282a9fde7

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Nov 2016 21:09:02 +0000 (21:09 +0000)]

Merge "Fix idmap leak in zygote process"

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 21:00:05 +0000 (21:00 +0000)]

Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours am: ccec8919fe
am: a895383b44

Change-Id: I0c606de6d7bd7eb37a3748c2f6ab3be889f933a6

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 20:55:16 +0000 (20:55 +0000)]

Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours
am: ccec8919fe

Change-Id: I27443a9024ea4aff209a24a9049832a76f252476

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 20:51:36 +0000 (20:51 +0000)]

Merge "Modify ConnectionServiceAdapter to include Session"
am: f231db7786 -s ours

Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507

commit | commitdiff | tree

Steven Moreland [Mon, 24 Oct 2016 20:44:41 +0000 (13:44 -0700)]

Update for hidlized hwservicemanager.

Bug: 32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 20:39:40 +0000 (20:39 +0000)]

Merge "Modify ConnectionServiceAdapter to include Session"

commit | commitdiff | tree

pengzhicai [Wed, 2 Nov 2016 18:34:53 +0000 (18:34 +0000)]

Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d
am: d7df704d98

Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6

commit | commitdiff | tree

pengzhicai [Wed, 2 Nov 2016 18:29:24 +0000 (18:29 +0000)]

Merge "Fix String is empty issue" am: 80af1ba47b
am: 38c585cb8d

Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7

commit | commitdiff | tree

pengzhicai [Wed, 2 Nov 2016 18:23:26 +0000 (18:23 +0000)]

Merge "Fix String is empty issue"
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Nov 2016 18:14:49 +0000 (18:14 +0000)]

Merge "Fix String is empty issue"

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 17:47:30 +0000 (17:47 +0000)]

Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am: def235760e
am: c50005ee6c

Change-Id: I7b04f249de691f1499d3e2bbcbc93bf81d4fd1ea

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 17:46:43 +0000 (17:46 +0000)]

resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
am: c5eacceb3f

Change-Id: I1fe6eea67081a8d35132d87c8e3e38952e110cc0

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 17:43:49 +0000 (17:43 +0000)]

Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
am: def235760e

Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 17:28:54 +0000 (10:28 -0700)]

resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp

Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034

commit | commitdiff | tree

Phil Weaver [Wed, 2 Nov 2016 17:31:45 +0000 (17:31 +0000)]

Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712
am: a3c03ba74a

Change-Id: I90cf9264ede25712ebaeb1b787cc61c2438f35bc

commit | commitdiff | tree

Phil Weaver [Wed, 2 Nov 2016 17:30:48 +0000 (17:30 +0000)]

Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06
am: b8a314427b

Change-Id: I5ace1c6b058b795a5b04e48200d2b3d3a1ae2486

commit | commitdiff | tree

Phil Weaver [Wed, 2 Nov 2016 17:26:10 +0000 (17:26 +0000)]

Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff
am: 9bfdce4712

Change-Id: Ic8a9c38988dd23d0b3c7e1fa96a28a2ffb2f3b6b

commit | commitdiff | tree

Phil Weaver [Wed, 2 Nov 2016 17:25:17 +0000 (17:25 +0000)]

Revert "Don't invalidate list data during layout." am: 866ded50bb
am: 96b4a68c06

Change-Id: I02b34aea90cae2312baa5f8300bc8f6349985470

commit | commitdiff | tree

Phil Weaver [Wed, 2 Nov 2016 17:20:20 +0000 (17:20 +0000)]

Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
am: 7ffc2a62ff

Change-Id: Id1f42e0dcb96e9dab884faa5ecd070ced3c4fba2

commit | commitdiff | tree

Phil Weaver [Wed, 2 Nov 2016 17:20:17 +0000 (17:20 +0000)]

Revert "Don't invalidate list data during layout."
am: 866ded50bb

Change-Id: I191c26bfb9488d5d67514a81387a9cde95a20eb4

commit | commitdiff | tree

Phil Weaver [Wed, 2 Nov 2016 17:13:22 +0000 (17:13 +0000)]

Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Nov 2016 16:59:30 +0000 (16:59 +0000)]

Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master

commit | commitdiff | tree

Brad Ebinger [Fri, 28 Oct 2016 19:29:55 +0000 (12:29 -0700)]

Modify ConnectionServiceAdapter to include Session

Modifies the ConnectionServiceAdapter to include Session Information in
the AIDL interface so that external Sessions can be started in Telecom
from Telephony.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403

commit | commitdiff | tree

Shuo Gao [Wed, 2 Nov 2016 16:13:46 +0000 (16:13 +0000)]

DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am: 1b5d5bd119 -s ours am: eb3696542a -s ours am: 41bdd3a668 -s ours am: 90c736f892 -s ours am: e319e7335c -s ours am: 2e40559326 -s ours
am: 2aa15664af -s ours

Change-Id: I551a90774c523e4c27c87a4f804d2562490ca41a

commit | commitdiff | tree

Thomas Buhot [Wed, 2 Nov 2016 16:12:46 +0000 (16:12 +0000)]

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours am: 7b43f2af93 -s ours am: 40d2aa1edc -s ours am: eae299874c -s ours am: 5e089ad195 -s ours am: a71a6ec8fb -s ours
am: a682048141 -s ours

Change-Id: I1e78b118ee1f4d4551558399b3cd2e9960270594

commit | commitdiff | tree

Shuo Gao [Wed, 2 Nov 2016 16:07:59 +0000 (16:07 +0000)]

DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am: 1b5d5bd119 -s ours am: eb3696542a -s ours am: 41bdd3a668 -s ours am: 90c736f892 -s ours am: e319e7335c -s ours
am: 2e40559326 -s ours

Change-Id: I7e74e80dabc62b2270628848b52b559999d05189

commit | commitdiff | tree

Thomas Buhot [Wed, 2 Nov 2016 16:07:10 +0000 (16:07 +0000)]

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours am: 7b43f2af93 -s ours am: 40d2aa1edc -s ours am: eae299874c -s ours am: 5e089ad195 -s ours
am: a71a6ec8fb -s ours

Change-Id: Ib8cba8d490f9777628108b56a6a3a81582c2a483

commit | commitdiff | tree

Shuo Gao [Wed, 2 Nov 2016 16:03:00 +0000 (16:03 +0000)]

DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am: 1b5d5bd119 -s ours am: eb3696542a -s ours am: 41bdd3a668 -s ours am: 90c736f892 -s ours
am: e319e7335c -s ours

Change-Id: I848f238db11bc2f67fec83cb157d3cb3faec0212

commit | commitdiff | tree

Thomas Buhot [Wed, 2 Nov 2016 16:02:09 +0000 (16:02 +0000)]

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours am: 7b43f2af93 -s ours am: 40d2aa1edc -s ours am: eae299874c -s ours
am: 5e089ad195 -s ours

Change-Id: I0062bfb72567ae43dbf50a1127e22b2363cac9e1

commit | commitdiff | tree

Shuo Gao [Wed, 2 Nov 2016 15:57:25 +0000 (15:57 +0000)]

DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am: 1b5d5bd119 -s ours am: eb3696542a -s ours am: 41bdd3a668 -s ours
am: 90c736f892 -s ours

Change-Id: I38668b4a372530962a0ae0d6e2a717319731dff0

commit | commitdiff | tree

Thomas Buhot [Wed, 2 Nov 2016 15:56:38 +0000 (15:56 +0000)]

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours am: 7b43f2af93 -s ours am: 40d2aa1edc -s ours
am: eae299874c -s ours

Change-Id: I6a8b5337f38b099bee806451db1df44c723e6596

commit | commitdiff | tree

Shuo Gao [Wed, 2 Nov 2016 15:51:17 +0000 (15:51 +0000)]

DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am: 1b5d5bd119 -s ours am: eb3696542a -s ours
am: 41bdd3a668 -s ours

Change-Id: I70baae78d036713c95c02e9cad497a343d5d1309

commit | commitdiff | tree

Thomas Buhot [Wed, 2 Nov 2016 15:50:38 +0000 (15:50 +0000)]

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours am: 7b43f2af93 -s ours
am: 40d2aa1edc -s ours

Change-Id: I741b9682b066384aadce0dcaf9ca792de015d59e

commit | commitdiff | tree

Shuo Gao [Wed, 2 Nov 2016 15:46:36 +0000 (15:46 +0000)]

DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am: 1b5d5bd119 -s ours
am: eb3696542a -s ours

Change-Id: I9a78875432e05918c574c9d8ea89230067b811cc

commit | commitdiff | tree

Thomas Buhot [Wed, 2 Nov 2016 15:45:43 +0000 (15:45 +0000)]

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours
am: 7b43f2af93 -s ours

Change-Id: Ia6804a8b93168a033075b6e77ac5d1bec63e3d69

commit | commitdiff | tree

Shuo Gao [Wed, 2 Nov 2016 15:41:06 +0000 (15:41 +0000)]

DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
am: 1b5d5bd119 -s ours

Change-Id: I6c218970581361c195471ee435f5a91b109911f0

commit | commitdiff | tree

Thomas Buhot [Wed, 2 Nov 2016 15:40:34 +0000 (15:40 +0000)]

DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
am: 80e6d8873b -s ours

Change-Id: I521a8a64510e89ee97578fc5e2f600b4a1851bd3

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:16:30 +0000 (13:16 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours am: 3b99360472 -s ours
am: 77323eb2bd -s ours

Change-Id: Ib7e45076dda50cf23ee25743605480c58682af43

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:15:36 +0000 (13:15 +0000)]

Import translations. DO NOT MERGE am: 7d24dd6448 -s ours am: 1aa04e8cae -s ours
am: 70d5453b63 -s ours

Change-Id: Ide7da0fea22b8e7af33a4cecfa7b73264a65846b

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:13:19 +0000 (13:13 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ba7f49030 -s ours
am: 80914e10e5 -s ours

Change-Id: If559097d398446f5f2f8181ac608c6458c099fb2

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:12:25 +0000 (13:12 +0000)]

Import translations. DO NOT MERGE am: 6fb3b77745 -s ours
am: 9e7ac87d08 -s ours

Change-Id: Icc870fda386710dc570c0c9846b4eba8cf9d47fb

commit | commitdiff | tree

Nimrod Gileadi [Wed, 2 Nov 2016 13:11:33 +0000 (13:11 +0000)]

Merge "Increment a MetricsLogger counter on back press." into cw-f-dev am: 523c4fd695
am: 2c2abe6db3

Change-Id: I478872bddc9526e8477bd1a0ed7ef816e691d3d7

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:11:18 +0000 (13:11 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours
am: 3b99360472 -s ours

Change-Id: I3645f4da4f27625faad83dddb191b16a196aeea7

commit | commitdiff | tree

Nimrod Gileadi [Wed, 2 Nov 2016 13:10:36 +0000 (13:10 +0000)]

Increment a MetricsLogger counter on back press. am: 580135c1b8
am: 51ac3a911c

Change-Id: I0b65ca68a743828fa47efd6793c5873cbc9b74a9

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:10:22 +0000 (13:10 +0000)]

Import translations. DO NOT MERGE am: 7d24dd6448 -s ours
am: 1aa04e8cae -s ours

Change-Id: I0957749f702aa34c7ef447e4995e2ae23e1748a1

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:04:36 +0000 (13:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 7ba7f49030 -s ours

Change-Id: I2786876548e79632ff8aae52cd058ba4eaa57895

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:04:35 +0000 (13:04 +0000)]

Import translations. DO NOT MERGE
am: 6fb3b77745 -s ours

Change-Id: Id6c5d0487f362fed25ddf6379f44db9b2ad60a1c

commit | commitdiff | tree

Nimrod Gileadi [Wed, 2 Nov 2016 13:03:07 +0000 (13:03 +0000)]

Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
am: 523c4fd695

Change-Id: I2928fafd79f08500c7369691985f6b8b726433c1

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:03:04 +0000 (13:03 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 125deebf5d -s ours

Change-Id: Ic90df3a0db800052813e23370e1b80846caae456

commit | commitdiff | tree

Nimrod Gileadi [Wed, 2 Nov 2016 13:03:04 +0000 (13:03 +0000)]

Increment a MetricsLogger counter on back press.
am: 580135c1b8

Change-Id: I29fb7f03b5da8edf3643118bc74bba553f2f6ca1

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: f750173bf1 -s ours

Change-Id: I7ca4f4999b2079b5746a88aa2d69a270c507679d

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)]

Import translations. DO NOT MERGE
am: 7d24dd6448 -s ours

Change-Id: Iadd9f2dcec4c026a70aa5169325a6d3e42d15460

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 13:03:00 +0000 (13:03 +0000)]

Import translations. DO NOT MERGE
am: 212cda9a9a -s ours

Change-Id: I327873e50179cc0e48712ce95b855ddf9f935aae

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Nov 2016 12:58:12 +0000 (12:58 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Nov 2016 12:57:31 +0000 (12:57 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Nov 2016 12:57:03 +0000 (12:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Nov 2016 12:55:14 +0000 (12:55 +0000)]

Merge "Increment a MetricsLogger counter on back press." into cw-f-dev

commit | commitdiff | tree

Bill Yi [Wed, 2 Nov 2016 02:34:21 +0000 (19:34 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

pengzhicai [Wed, 2 Nov 2016 01:27:20 +0000 (09:27 +0800)]

Fix String is empty issue

Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739

Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>

commit | commitdiff | tree

Sanket Agarwal [Wed, 2 Nov 2016 01:19:29 +0000 (01:19 +0000)]

Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e am: f41abccf80
am: 5e8b2e4110

Change-Id: I481283466c74087e4075cbda52f99fa94deae8c6

commit | commitdiff | tree

Joseph Pirozzo [Wed, 2 Nov 2016 01:18:38 +0000 (01:18 +0000)]

MAP MCE am: b8fc0679e8 am: b13240028b
am: 5602b26f41

Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c

commit | commitdiff | tree

Joseph Pirozzo [Wed, 2 Nov 2016 01:17:45 +0000 (01:17 +0000)]

Pbap disconnect durring connect am: a4f0127fbb am: a31933abc3
am: 1c21f0378a

Change-Id: I367eea86cd82017a8c8a9e2922ac5a9580159b96

commit | commitdiff | tree

Joseph Pirozzo [Wed, 2 Nov 2016 01:16:45 +0000 (01:16 +0000)]

MAP MCE am: 631768d814 am: d94c280a7f
am: c412914520

Change-Id: Ia56d131194075795c55c899dfbebbe3c2feb1584

commit | commitdiff | tree

Sanket Agarwal [Wed, 2 Nov 2016 01:11:53 +0000 (01:11 +0000)]

Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e
am: f41abccf80

Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0

commit | commitdiff | tree

Joseph Pirozzo [Wed, 2 Nov 2016 01:11:04 +0000 (01:11 +0000)]

MAP MCE am: b8fc0679e8
am: b13240028b

Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113

commit | commitdiff | tree

Joseph Pirozzo [Wed, 2 Nov 2016 01:10:02 +0000 (01:10 +0000)]

Pbap disconnect durring connect am: a4f0127fbb
am: a31933abc3

Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5

commit | commitdiff | tree

Joseph Pirozzo [Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)]

MAP MCE am: 631768d814
am: d94c280a7f

Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5

commit | commitdiff | tree

Sanket Agarwal [Wed, 2 Nov 2016 01:05:20 +0000 (01:05 +0000)]

Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am: cf4dc9236e

Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401

commit | commitdiff | tree

Joseph Pirozzo [Wed, 2 Nov 2016 01:05:14 +0000 (01:05 +0000)]

MAP MCE
am: b8fc0679e8

Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f