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

Jeff Sharkey [Thu, 14 Sep 2017 16:37:06 +0000 (16:37 +0000)]

Merge "Update network rules on meteredness changes." into oc-mr1-dev
am: d50ef281ba

Change-Id: I03db3bcdedeca758ce4ec4ba2f8f09eb32a419eb

commit | commitdiff | tree

Jeff Sharkey [Thu, 14 Sep 2017 16:29:56 +0000 (16:29 +0000)]

Merge "Update network rules on meteredness changes." into oc-mr1-dev

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:35:44 +0000 (15:35 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61 am: a126d94892 -s ours am: 2435c816d8 am: a62951f28f
am: f4e23cbcfa

Change-Id: I591a950a87fe432d415794157d80f08888e08b2a

commit | commitdiff | tree

Bernardo Rufino [Thu, 14 Sep 2017 15:28:59 +0000 (15:28 +0000)]

Merge "Add logs to IOExceptions during adb backup" into oc-mr1-dev
am: 786354a53f

Change-Id: I21dc3f5523632306f69e9f8d0f99072f52742f85

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:26:41 +0000 (15:26 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61 am: a126d94892 -s ours am: 2435c816d8
am: a62951f28f

Change-Id: I98176e73e4fc9e1627c638ff7510fdc35b3b874f

commit | commitdiff | tree

Chris Wren [Thu, 14 Sep 2017 15:25:41 +0000 (15:25 +0000)]

Merge "don't log auto-expansion of notificaitons" into oc-mr1-dev
am: 0f016f00c4

Change-Id: I958d991156c765c3283d279165aa5944c0e8c424

commit | commitdiff | tree

Rubin Xu [Thu, 14 Sep 2017 15:21:58 +0000 (15:21 +0000)]

Merge "Fix typo in LockSettingsService.getDecryptedPasswordsForAllTiedProfiles" into oc-mr1-dev
am: 48686b6afb

Change-Id: I5e32555e204f2aa574190f37748d786dda698d1f

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:19:03 +0000 (15:19 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61 am: a126d94892 -s ours
am: 2435c816d8

Change-Id: Idba71a4e659947f4ebf0dd76c3d305bc3a9132e6

commit | commitdiff | tree

Jan Althaus [Thu, 14 Sep 2017 15:15:47 +0000 (15:15 +0000)]

Change default smart select range for logging to [0,0]
am: ec3ded8686

Change-Id: I58e94975850e8eed399932ef40dd7fb70ee1a6d6

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:10:05 +0000 (15:10 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61
am: a126d94892 -s ours

Change-Id: Iafccd7ef757e1b858a58ce31df55f0f0b545903f

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Sep 2017 15:09:44 +0000 (15:09 +0000)]

Bluetooth: thread-safe callback invocation
am: 05c1578c16 -s ours

Change-Id: Ia04ea46a3af7430c847f511a8bf82ae11392e07b

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Sep 2017 15:04:57 +0000 (15:04 +0000)]

Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev
am: d9ad6fc11a -s ours

Change-Id: Ia63cd9cb3c0f2084890d8713e397f64435c6079d

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:03:04 +0000 (15:03 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9
am: e148e39d61

Change-Id: Ia19f7708f64129c5ab3fb37c516e00a81b3cfc1b

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 15:01:40 +0000 (15:01 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours am: 95dd448a5e -s ours am: abc3417961 -s ours
am: f708dcbfb5 -s ours

Change-Id: I205c89626fdeaa54e781f54535c0815bdb0ccf1c

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 14:58:10 +0000 (14:58 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours am: 8eb6ff0212 -s ours am: c8ede1e966 -s ours am: ea94475791 -s ours
am: 9533e784fa -s ours

Change-Id: Ie3edd3284e4df4cc3e750519b2502d6b58fe1689

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 14:55:33 +0000 (14:55 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2
am: 0bf81b63f9

Change-Id: Id2d47d51581669ee4eb8354e3881f9cbeb57e24f

commit | commitdiff | tree

Jiyong Park [Thu, 14 Sep 2017 14:51:57 +0000 (14:51 +0000)]

Merge "vendor apk is unbundled" into oc-mr1-dev
am: a26750e757

Change-Id: I218a52a0fff924ca139c96c35df5b3ad0c917216

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 14:50:33 +0000 (14:50 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92
am: 9a74d618c2

Change-Id: If044222a2428095f3faa492f72d39acbb0db5bd3

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 14:43:40 +0000 (14:43 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours
am: b004901c92

Change-Id: I528ac97ec904ce789b50bde5e8174d81c85d5e1b

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 14:35:34 +0000 (14:35 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c
am: d54bc6a908 -s ours

Change-Id: Ie91e9f362cc247babdc4cfc8eee7f75b647107c2

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 14:29:56 +0000 (14:29 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee
am: 97b98a3b1c

Change-Id: If39d33d4c5b9e1057c7cdfd9b9b52f42d4b193d2

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 14:25:02 +0000 (14:25 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
am: 8150eb82ee

Change-Id: I85a98e8c857c9c7b7597fafb13ecb6ae44cb9b69

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 14:18:07 +0000 (14:18 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 13:53:49 +0000 (13:53 +0000)]

Merge "Add logs to IOExceptions during adb backup" into oc-mr1-dev

commit | commitdiff | tree

Chris Wren [Thu, 14 Sep 2017 12:05:12 +0000 (12:05 +0000)]

Merge "don't log auto-expansion of notificaitons" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 11:27:32 +0000 (11:27 +0000)]

Merge "Fix typo in LockSettingsService.getDecryptedPasswordsForAllTiedProfiles" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:27:13 +0000 (11:27 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours am: 95dd448a5e -s ours am: abc3417961 -s ours
am: fb0d750cd1 -s ours

Change-Id: Ie2013519a567cf40f10fb5f86e93ab27d906045a

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:24:00 +0000 (11:24 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours am: 8eb6ff0212 -s ours am: c8ede1e966 -s ours am: ea94475791 -s ours
am: 30a6630a94 -s ours

Change-Id: I117854f441d0413a4b38ee3fc6efe9ee0ebc770e

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:20:49 +0000 (11:20 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours am: 8d1cdbb135 -s ours am: 1186c6ec45 -s ours
am: 9d12fcc2e6 -s ours

Change-Id: Ia90a9963d6f149f7d4c290bd9bf1cd60e26c2c9a

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:17:44 +0000 (11:17 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours am: 8d0a15c4f5 -s ours am: 3989c8b1f7 -s ours
am: 12f06fada2 -s ours

Change-Id: I1e777b62576f602c1612eab1db975100dccd51cb

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:14:44 +0000 (11:14 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours am: b7c6238556 -s ours am: a690e7362d -s ours am: 2dd51799b2 -s ours
am: 6cf43ac513 -s ours

Change-Id: I2f4eff855eedc8206ece5ce40f2d1a2cbed264c6

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:11:09 +0000 (11:11 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours am: 16bc5f15b7 -s ours am: 69259c2b32 -s ours am: 9ebfe48df5 -s ours
am: 4b7f944c49 -s ours

Change-Id: I55390236ce76a058a7d61a6cdab455999e3f63d8

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:07:56 +0000 (11:07 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359 -s ours am: 4f8b486f69 -s ours am: 0dd2e975ca -s ours am: bcbc39e695 -s ours
am: 9474162096 -s ours

Change-Id: I5cd8545b1b5ff062a976300bee5dae94adb671c7

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 11:01:21 +0000 (11:01 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448 -s ours am: c0ccea9bf5 -s ours am: 4e72aa2314 -s ours am: 797dca48c9 -s ours
am: a1e90126fd -s ours

Change-Id: I887310a634b72abebecf1758113f10a4d76a45dc

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 10:58:15 +0000 (10:58 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8 -s ours am: 318728fd6b -s ours am: 9ce3cc9c78 -s ours am: 0973e9a34e -s ours
am: 48d8106fc4 -s ours

Change-Id: I417d18ec0332bd309aacc53ef7e5f9d93a9b6dce

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 10:55:25 +0000 (10:55 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9f5e95f64e -s ours am: 697f149acf -s ours am: b5b1b7b505 -s ours am: eb29e3e357 -s ours
am: d225b9726a -s ours

Change-Id: Idb2bfa677750eb1a9581d13893291edc2bd1faa0

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 10:52:42 +0000 (10:52 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b -s ours am: 1db479ee26 -s ours am: 1ff18ac097 -s ours am: ac23d4afac -s ours
am: 8d2adf19ae -s ours

Change-Id: I694e2555f6cf5d3c09e5191e22438cb5f1c876ab

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 10:49:48 +0000 (10:49 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0 -s ours am: 9abe093864 -s ours am: 4c152ae488 -s ours am: 4379f07401 -s ours
am: 488a1a5673 -s ours

Change-Id: I6414fdb8962ab97542aeddfddaf3f65d14f72a6e

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 10:46:55 +0000 (10:46 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours am: 289d6b71a9 -s ours am: 74e9007c7b -s ours am: 5e220d0800 -s ours
am: 42155ee7c6 -s ours

Change-Id: Iaea2b0d387b80f03c79ede473cfea51e226bea25

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 10:43:58 +0000 (10:43 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40 -s ours am: 307f6a4d92 -s ours am: 106e58f93c -s ours am: 9b4b22a52f -s ours
am: e62b35f758 -s ours

Change-Id: Ibf9e02c934af8d087b0949841b9dfd5328c0c2e7

commit | commitdiff | tree

Dave Friedman [Thu, 14 Sep 2017 10:40:53 +0000 (10:40 +0000)]

Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed am: d1412d3d60
am: 1bfd76caf7

Change-Id: I861b2e4fe97719ccb6e6b1bd2d5e9717b59249df

commit | commitdiff | tree

Tetsutoki Shiozawa [Thu, 14 Sep 2017 10:36:40 +0000 (10:36 +0000)]

Merge "Merge "Abort connecting to native daemon during shutdown" am: d763e341b5" into stage-aosp-master am: f0da6c03bc
am: c3c4007a10

Change-Id: Iaf4f8b10727ae8b455e5cd2bfa021e2f77d4c6d6

commit | commitdiff | tree

Tetsutoki Shiozawa [Thu, 14 Sep 2017 10:33:39 +0000 (10:33 +0000)]

Merge "Abort connecting to native daemon during shutdown" am: d763e341b5 am: 0e42b8bab5
am: ce96d1dd9d

Change-Id: I46c3e0c4f7241d1dccaa3963c462028ca8f1322d

commit | commitdiff | tree

Hall Liu [Thu, 14 Sep 2017 10:30:06 +0000 (10:30 +0000)]

Merge "Unhide EMBMS download API" am: 0285ee851d am: e9b31e8eaf
am: c55378fad4

Change-Id: Ib2a05680a219c45705db30420787d1b8ed827cca

commit | commitdiff | tree

Hall Liu [Thu, 14 Sep 2017 10:26:20 +0000 (10:26 +0000)]

Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide" am: 910e5751b6 am: dd6878ad03
am: 6288f42286

Change-Id: I62c0d1f6e8d82ccda9740672263f8dfe11f475a4

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Sep 2017 10:23:06 +0000 (10:23 +0000)]

Merge "Bluetooth: thread-safe callback invocation" am: f8c7572b8f am: c416035448
am: eef8920a9f

Change-Id: Ib14b38dd04bdd73482d6b085ede7151414a5f829

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Sep 2017 10:16:41 +0000 (10:16 +0000)]

Merge "Bluetooth: fix GATT race conditions when using Handler" am: 06b29a87d7 am: 9054e03cf4
am: 79ce33fc96

Change-Id: I1cd7e411f9cea651c10ed0db1adec1212112725c

commit | commitdiff | tree

Rubin Xu [Thu, 14 Sep 2017 10:13:40 +0000 (10:13 +0000)]

Merge "Refactor CompareResult<> class and its call sites" am: 60eae6e621 am: 89deab16f3
am: c345562746

Change-Id: I850f2ceab5949c2fceba5d25eda639a319efa7b3

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 10:09:07 +0000 (10:09 +0000)]

Import translations. DO NOT MERGE am: ca913a6107 -s ours
am: 877670a41d -s ours

Change-Id: I48384a7bc0bc1df96c16fbae28c98b1412995f23

commit | commitdiff | tree

Nicolas Geoffray [Thu, 14 Sep 2017 10:05:39 +0000 (10:05 +0000)]

Missed these renames in last commit. am: 1bf40f63b3
am: ef35bd57d5

Change-Id: Ic36e9298da7acbbcd216c73a5f9a59e1a498b9c8

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 09:59:39 +0000 (09:59 +0000)]

Merge "resolve merge conflicts of eb8a4ef5d344 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jan Althaus [Wed, 13 Sep 2017 11:55:29 +0000 (13:55 +0200)]

Change default smart select range for logging to [0,0]

Bug: 64914512
Test: Manually tested that logs are correct. Will follow up with automated tests.
Change-Id: I5eb151f49f9dd665c6c76625ebb2b9c0be96a11d

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 03:02:09 +0000 (03:02 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours am: 8d1cdbb135 -s ours am: 1186c6ec45 -s ours" into oc-mr1-dev
am: a33ed0cd74 -s ours

Change-Id: I29edb48375ba50a143ceb18c73c0558031041e6b

commit | commitdiff | tree

Selim Cinek [Thu, 14 Sep 2017 03:00:30 +0000 (03:00 +0000)]

Merge "Fixed an issue where the pattern wouldn't show properly" into oc-mr1-dev
am: 246a9f8038

Change-Id: I63ab7c592586c7e370cd86f4efbe38614f71f1aa

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:57:24 +0000 (02:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours am: 8d0a15c4f5 -s ours am: 3989c8b1f7 -s ours
am: d167d5d850 -s ours

Change-Id: I523bb98de5d494412409384acc304c392e0c9664

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:55:34 +0000 (02:55 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours am: b7c6238556 -s ours am: a690e7362d -s ours am: 2dd51799b2 -s ours
am: bb2f7d550b -s ours

Change-Id: I915fade2bc0f6b3e2c0d5fc249d59040ab39e4d9

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:49:50 +0000 (02:49 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours am: 16bc5f15b7 -s ours am: 69259c2b32 -s ours am: 9ebfe48df5 -s ours
am: 6ba544112a -s ours

Change-Id: I0cdc37dad3acbb80d5087a418418f1f3a3932df7

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:48:15 +0000 (02:48 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359 -s ours am: 4f8b486f69 -s ours am: 0dd2e975ca -s ours am: bcbc39e695 -s ours
am: c5f14aa561 -s ours

Change-Id: I406d6bc7bf5470c88d4832429407f21c98b5c450

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:45:22 +0000 (02:45 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448 -s ours am: c0ccea9bf5 -s ours am: 4e72aa2314 -s ours am: 797dca48c9 -s ours
am: b8991577f7 -s ours

Change-Id: I0ef8b701c08976a167e07af9c3ee84eaae3b90d4

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:43:15 +0000 (02:43 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8 -s ours am: 318728fd6b -s ours am: 9ce3cc9c78 -s ours am: 0973e9a34e -s ours
am: 347067bf27 -s ours

Change-Id: Iddfbc5a55fdd409ad7af5ddff29983b80aea6a75

commit | commitdiff | tree

Jakub Pawlowski [Wed, 13 Sep 2017 16:33:34 +0000 (09:33 -0700)]

Bluetooth: thread-safe callback invocation

Bug: 65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
Merged-In: I92a436328a3070ea842e8e652891e485406c2ed7
(cherry picked from commit 3eb569fc72781857f1f2722bb645a6090a9b53ce)

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:37:22 +0000 (02:37 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9f5e95f64e -s ours am: 697f149acf -s ours am: b5b1b7b505 -s ours am: eb29e3e357 -s ours
am: d612f90ad5 -s ours

Change-Id: I8ff9d2e101fa1ea503df8f6e46ad625aa3cfa8f1

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:35:34 +0000 (02:35 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b -s ours am: 1db479ee26 -s ours am: 1ff18ac097 -s ours am: ac23d4afac -s ours" into oc-mr1-dev
am: 8af7895bcc -s ours

Change-Id: I4d49608dc3c56f3c88b73b7c178c2ac9b027d3fe

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:33:16 +0000 (02:33 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0 -s ours am: 9abe093864 -s ours am: 4c152ae488 -s ours am: 4379f07401 -s ours" into oc-mr1-dev
am: b3893e04fd -s ours

Change-Id: I99212fd600bd4a853e5d3fdbe28afd73b47e5653

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Sep 2017 02:32:28 +0000 (02:32 +0000)]

Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:27:53 +0000 (02:27 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours am: 289d6b71a9 -s ours am: 74e9007c7b -s ours am: 5e220d0800 -s ours" into oc-mr1-dev
am: 00873a2e33 -s ours

Change-Id: Idd9a4ab6d9485b66ece4c2736d3ac41a2d20862c

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:26:10 +0000 (02:26 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40 -s ours am: 307f6a4d92 -s ours am: 106e58f93c -s ours am: 9b4b22a52f -s ours" into oc-mr1-dev
am: cdf80ad738 -s ours

Change-Id: Ifc7753e54b4ac8f2de7c8b01333e1a172a4791d6

commit | commitdiff | tree

Siyamed Sinir [Thu, 14 Sep 2017 02:24:00 +0000 (02:24 +0000)]

Merge "Fix ClipboardService device lock check for cross profile" into oc-mr1-dev
am: 3ff708b6af

Change-Id: Ia63274cccfd553951c34a2ea357b0791668e6776

commit | commitdiff | tree

Dave Friedman [Thu, 14 Sep 2017 02:22:00 +0000 (02:22 +0000)]

Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed am: d1412d3d60
am: b8ae843a20

Change-Id: Ic72fdc1f0833b8ebcd6d789cc2023266287dc341

commit | commitdiff | tree

Andreas Gampe [Thu, 14 Sep 2017 01:16:13 +0000 (18:16 -0700)]

resolve merge conflicts of eb8a4ef5d344 to oc-mr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia29e31d704982985264b40a78578a4c93d11bf3a

commit | commitdiff | tree

George Mount [Thu, 14 Sep 2017 02:19:59 +0000 (02:19 +0000)]

Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
am: 465a956066

Change-Id: Ieb8f17d3b1c345f27298dd4e461eaa7b780543b7

commit | commitdiff | tree

Sundeep Ghuman [Thu, 14 Sep 2017 02:18:01 +0000 (02:18 +0000)]

Merge "Change score cache eviction time to settings value." into oc-mr1-dev
am: 2193f912f3

Change-Id: Ifec764594fcaa858a81d52896cc501d56dcf20e0

commit | commitdiff | tree

Hangyu Kuang [Thu, 14 Sep 2017 02:15:00 +0000 (02:15 +0000)]

Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev
am: 7dd0c6924e

Change-Id: I6eef1bed8894f907177f21eb2550a9465b45c257

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:07:03 +0000 (02:07 +0000)]

Import translations. DO NOT MERGE am: ca913a6107 -s ours
am: 3349e61941 -s ours

Change-Id: I9dd126d72b4f35d7793e6a5e46ec809ca58c80dc

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:04:14 +0000 (02:04 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 42203f5f7d -s ours

Change-Id: I267f548daf2b6ca55b110e776c11d347d6a8df26

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 02:00:44 +0000 (02:00 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: f45cbb9a8a -s ours

Change-Id: I02b782480173b5e8b55b42de8598b948410b668c

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:55:27 +0000 (01:55 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 5483642730 -s ours

Change-Id: I6772b07cc948d7320ff082e12f0d50676795b9b7

commit | commitdiff | tree

Andrew Lehmer [Thu, 14 Sep 2017 01:52:07 +0000 (01:52 +0000)]

Merge "AOD: Prewarm display while waiting for brightness sensor" into oc-mr1-dev
am: 1952fcffc3

Change-Id: I92b6d4ce3d1a17274809dfd123bea3ed56cd646c

commit | commitdiff | tree

Kurt Nelson [Thu, 14 Sep 2017 01:49:08 +0000 (01:49 +0000)]

Fix javadoc typo
am: 27616138bc

Change-Id: I5e55f645b757fd60b52cc50a223aa42ca65d0beb

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:46:11 +0000 (01:46 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours am: 95dd448a5e -s ours
am: abc3417961 -s ours

Change-Id: I8f8d0a7fd143e96aa13c4b61fa0501f9fd187638

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:43:50 +0000 (01:43 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours am: 95dd448a5e -s ours
am: abc3417961 -s ours

Change-Id: I61c531101305b5875be83847991d4514cc773511

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:43:08 +0000 (01:43 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours am: 8eb6ff0212 -s ours am: c8ede1e966 -s ours
am: ea94475791 -s ours

Change-Id: I45f91c35af8c0632fdc90828831ad728dd6b2d09

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:39:21 +0000 (01:39 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours am: 8eb6ff0212 -s ours am: c8ede1e966 -s ours
am: ea94475791 -s ours

Change-Id: I2c90c8467634d338d1eebe8cdfdfa0de6cb0902b

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:38:46 +0000 (01:38 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours am: 8d1cdbb135 -s ours
am: 1186c6ec45 -s ours

Change-Id: I9d4ffdae35f34582d969c56005d09a27d3f62fd9

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 01:35:42 +0000 (01:35 +0000)]

Merge "vendor apk is unbundled" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 14 Sep 2017 01:35:01 +0000 (01:35 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours am: 8d1cdbb135 -s ours am: 1186c6ec45 -s ours" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 14 Sep 2017 01:25:22 +0000 (01:25 +0000)]

Merge "Fixed an issue where the pattern wouldn't show properly" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:24:43 +0000 (01:24 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours am: 8d1cdbb135 -s ours
am: 1186c6ec45 -s ours

Change-Id: I44ea9e39a0c4dfcf5da7d0415d6c941a2a93d686

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:23:53 +0000 (01:23 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours am: 8d0a15c4f5 -s ours
am: 3989c8b1f7 -s ours

Change-Id: I73f3598b79775b98800f0d81ffaef24d368e5406

commit | commitdiff | tree

Bryce Lee [Thu, 14 Sep 2017 01:22:56 +0000 (01:22 +0000)]

Merge "Update reference to top activity." into oc-mr1-dev
am: f35bfc3d0c

Change-Id: Idd809abedb4e0a63bca117cdb6ce7ec89b6fa64a

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:17:51 +0000 (01:17 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours am: 8d0a15c4f5 -s ours
am: 3989c8b1f7 -s ours

Change-Id: I607c1016f3eb395ebc015e362c00d4ac1914e1ce

commit | commitdiff | tree

Tomasz Wasilczyk [Thu, 14 Sep 2017 01:16:20 +0000 (01:16 +0000)]

Merge "Adjust AM/FM region ranges." into oc-mr1-dev
am: af8d15f626

Change-Id: Ie773792e6c60cb004795420fc4f857f215967379

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:14:46 +0000 (01:14 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours am: b7c6238556 -s ours am: a690e7362d -s ours
am: 2dd51799b2 -s ours

Change-Id: I0f1a8ebf46773548b0e0604e88dacf5de18175fb

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:14:07 +0000 (01:14 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours am: b7c6238556 -s ours am: a690e7362d -s ours
am: 2dd51799b2 -s ours

Change-Id: I0594a7e4f0eaaa2ab607ecbf6dab50e64d72fe33

commit | commitdiff | tree

James Hawkins [Thu, 14 Sep 2017 01:11:43 +0000 (01:11 +0000)]

Merge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics." into oc-mr1-dev
am: 624f617d01

Change-Id: Ief37c97c762b72161684c0fe7be8c5e6dad42b2d

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:10:51 +0000 (01:10 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours am: 16bc5f15b7 -s ours am: 69259c2b32 -s ours
am: 9ebfe48df5 -s ours

Change-Id: Id0649fd5d7a2bc71828ac9c18f833a6037a124f5

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:05:43 +0000 (01:05 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359 -s ours am: 4f8b486f69 -s ours am: 0dd2e975ca -s ours
am: bcbc39e695 -s ours

Change-Id: I0bdcb7701bb6ca30019014fec7a2b591b36bdbe0

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:05:27 +0000 (01:05 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours
am: 95dd448a5e -s ours

Change-Id: I9dabad9b8dbfb88c9c41fb9334730e3d9a13b822

commit | commitdiff | tree

Tomasz Wasilczyk [Thu, 14 Sep 2017 01:04:55 +0000 (01:04 +0000)]

Merge "Implement missing mute call." into oc-mr1-dev
am: 4f0dd2e689

Change-Id: I204c4288bdf0039b3f9c0e3743510cd95c12a97e

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 01:01:00 +0000 (01:01 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours am: 16bc5f15b7 -s ours am: 69259c2b32 -s ours
am: 9ebfe48df5 -s ours

Change-Id: Id4c8b1da2079dcc92deefbecd6faa18df2651597