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

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

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3 -s ours am: 26e84466d3 -s ours am: 9bc160cc3d
am: b237ea7cc8

Change-Id: I04d50fa8ed1d66b706f5a5497543bc6b01aa1d8a

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours am: 95e10b296e
am: c3e2d40309

Change-Id: Ie07e84bbb31df780b8366d63bd364368a24b9134

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3 -s ours am: 26e84466d3 -s ours
am: 9bc160cc3d

Change-Id: Ib152e64e01f43f3a6fb1df6c749e4f83566266b5

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b am: ba55b3bea6 -s ours am: ef696aa47b
am: a35989b007

Change-Id: I05764035a31a1be641f3c2aea4bda9b1770e8aa0

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours
am: 95e10b296e

Change-Id: I4cc393a504461b206355dd269c59cd5b38c80f09

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3 -s ours
am: 26e84466d3 -s ours

Change-Id: I8564ca1d5f7c185bd6eedd0ee23adbefa9a421e0

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 17:51:28 +0000 (17:51 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b am: ba55b3bea6 -s ours
am: ef696aa47b

Change-Id: I977532e25b0bbfb05c1687d9cca7311d46d5eb8c

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
am: 121d3b89f7 -s ours

Change-Id: I91cb627a007c03660d41b0a01d3de71165373ff1

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 17:44:23 +0000 (17:44 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b
am: 68f91528c3 -s ours

Change-Id: Ib051065fc2e83bc001d82f18c9150339842f5e21

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b
am: ba55b3bea6 -s ours

Change-Id: I0d0ce4d4a017126cb5f6cab1fbe4da2e8ba37ce9

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2
am: 8462da779b

Change-Id: Ibbfa865f666f174b307fbe7a50ac73030d4a5c01

commit | commitdiff | tree

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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
am: 61bc3f3c9b

Change-Id: Iba63e8e9b1c543478c16e49c2f81a8cb32567529

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 17:21:42 +0000 (17:21 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours
am: 0a93f42be2

Change-Id: I2da7592547bbd1c3c028eb06360c15baf9a8c13c

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 17:16:48 +0000 (17:16 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 17:14:13 +0000 (17:14 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8
am: 3be1269c0a -s ours

Change-Id: I194e18d7ac9ac98010e00db548e8f39bec220fc0

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 16:46:42 +0000 (16:46 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
am: 0bdb7902d8

Change-Id: I67c6ceac68b57b9d2e619a25b5e08721b0385db8

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Beverly Tai [Thu, 14 Sep 2017 15:26:36 +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: I7f52c07986fbcb784b6b6b892b1c83977355c754

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

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

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

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

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

Neil Fuller [Thu, 14 Sep 2017 14:25:03 +0000 (14:25 +0000)]

Merge "Finalize package intents used to trigger tz update" am: 48d3181b1d
am: 0e0f3b6d29

Change-Id: Ief1906af78e69da0c8d09e7b467ec0f2f4743339

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

Neil Fuller [Thu, 14 Sep 2017 14:17:35 +0000 (14:17 +0000)]

Merge "Finalize package intents used to trigger tz update"
am: 48d3181b1d

Change-Id: I49f8cf990c76b95f2ef8d4f2e7ad6d3fe4b4b80e

commit | commitdiff | tree

Neil Fuller [Thu, 14 Sep 2017 14:07:59 +0000 (14:07 +0000)]

Merge "Finalize package intents used to trigger tz update"

commit | commitdiff | tree

Neil Fuller [Wed, 13 Sep 2017 15:01:58 +0000 (16:01 +0100)]

Finalize package intents used to trigger tz update

Finalize the package intents used to trigger tz update and
improve the documentation.

Bug: 64018084
Test: PTS: run pts -m PtsTimeZoneTestCases
Change-Id: Ifba9dea1d6d8818f875d4c7efba09d77c8e6d66a
Merged-In: Ifba9dea1d6d8818f875d4c7efba09d77c8e6d66a
(cherry picked from commit 228dc6cfefd06936657fa39848f7ee73162def8f)

commit | commitdiff | tree

Hugo Benichi [Thu, 14 Sep 2017 12:15:17 +0000 (12:15 +0000)]

Merge changes I4719b4dc,I0308cdf4,I38db1bb7 am: a3c28cc567
am: 3fce811dcb

Change-Id: Ib0e0ae62e8bb3eb278425d4dec132739313f8172

commit | commitdiff | tree

Hugo Benichi [Thu, 14 Sep 2017 12:08:26 +0000 (12:08 +0000)]

Merge changes I4719b4dc,I0308cdf4,I38db1bb7
am: a3c28cc567

Change-Id: I3b222afc77b121769cc18d52e5c3d8bcec9db886

commit | commitdiff | tree

Hugo Benichi [Thu, 14 Sep 2017 12:08:22 +0000 (12:08 +0000)]

Merge changes Ie2676b20,Ie8db6f85 am: 61901ddedd
am: 4188432a7b

Change-Id: I4ad3267304977f9956dc33c179c86118252a55b3

commit | commitdiff | tree

Hugo Benichi [Thu, 14 Sep 2017 12:01:19 +0000 (12:01 +0000)]

Merge changes Ie2676b20,Ie8db6f85
am: 61901ddedd

Change-Id: Ib4fab32418da8274bd6b5cb9fef85e0db79d866a

commit | commitdiff | tree

Hugo Benichi [Thu, 14 Sep 2017 11:59:58 +0000 (11:59 +0000)]

Merge changes I4719b4dc,I0308cdf4,I38db1bb7

* changes:
  IpManagerTest: fix flaky test
  Fix flaky NsdManagerTest
  Boostrap test for NetworkMonitor

commit | commitdiff | tree

Hugo Benichi [Thu, 14 Sep 2017 11:53:02 +0000 (11:53 +0000)]

Merge changes Ie2676b20,Ie8db6f85

* changes:
Connectivity metrics: add WakeupStats events
Connectivity metrics: collect NFLOG wakeup events

commit | commitdiff | tree

Hugo Benichi [Tue, 5 Sep 2017 04:34:48 +0000 (13:34 +0900)]

Connectivity metrics: add WakeupStats events

This patch defines a new WakeupStats event in ipconnectivity.proto and
populates these events from the NFLOG wakeup events stored in
NetdEventListenerService.

There is one WakeupStats object per known interface on which ingress
packets arrive and may wake the system up.

Example from $ adb shell dumpsys connmetrics list:

UPDATEME
...
WakeupStats(wlan0, total: 58, root: 0, system: 3, apps: 38, non-apps: 0, unrouted: 17, 6111s)
WakeupEvent(13:36:31.686, iface wlan0, uid -1)
WakeupEvent(13:38:50.846, iface wlan0, uid -1)
WakeupEvent(13:39:16.676, iface wlan0, uid 10065)
WakeupEvent(13:40:32.144, iface wlan0, uid 1000)
WakeupEvent(13:40:35.827, iface wlan0, uid 1000)
WakeupEvent(13:40:47.913, iface wlan0, uid 10004)
WakeupEvent(13:40:52.622, iface wlan0, uid 10014)
WakeupEvent(13:41:06.036, iface wlan0, uid 10004)
...

Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net
Change-Id: Ie2676b20bfb411a1902f4942643df0c20e268d99

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: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: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

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

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: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

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

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

Change-Id: Ic177de299decf09261daf18f8a0b779bf10727de

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:59:13 +0000 (00:59 +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

Change-Id: I700bded8355fdd87a10afc482ab060b0994b0c45

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:54:29 +0000 (00:54 +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

Change-Id: I0c2d88354cc683ad4e7c40e25b44748657e10af4

commit | commitdiff | tree

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

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

Change-Id: I5ae31f699edb0155b27dacccea4ed5972f8cb666

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:49:59 +0000 (00:49 +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

Change-Id: I23095eef34e5d69a47f8c854a58bda4d78f77e06

commit | commitdiff | tree

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

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

Change-Id: I69b7c005b4dc5b4c63743a7a315bf2aa3e4e290a

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:45:56 +0000 (00:45 +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

Change-Id: Ifa2a598bd15595add3a775a93cb2b10c7001e5a8

commit | commitdiff | tree

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

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

Change-Id: Iffe01cedcfb01c31c9f89e3ddb459552934fb000

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:31:39 +0000 (00:31 +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

Change-Id: I42f3c1957b7100362e96c2b85f68094eef28065c

commit | commitdiff | tree

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

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

Change-Id: Ied34ede3136f40d23dbbe9309afd13fbf5c1ca5d

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:24:48 +0000 (00:24 +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

Change-Id: I95f4b0ca227e69e524c7550e0255688ab038c916

commit | commitdiff | tree

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

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

Change-Id: I9ce1bd9180a009958d9dd60d794235869e28529a

commit | commitdiff | tree

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

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

Change-Id: Ic6a131df00ed57b03414e7708e91bc7faf9bccc9

commit | commitdiff | tree

Bill Yi [Thu, 14 Sep 2017 00:16:51 +0000 (00:16 +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

Change-Id: Id5779883f449c1f9656d6a190d1dd19983ab99bd

commit | commitdiff | tree

Dave Friedman [Thu, 14 Sep 2017 00:11:54 +0000 (00:11 +0000)]

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

Change-Id: I89c089697a431a21d120561fcd54ead30320751c

commit | commitdiff | tree

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

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

Change-Id: Ib3cf951855174e511b70e7e82fcf1041b654d9fd

commit | commitdiff | tree

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

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

Change-Id: I3d7a232e2eaa57bc3225857cec63b20fd1b1999e

commit | commitdiff | tree

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

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

Change-Id: Ie004d9ef022c5297e783e2e79db6adc05c31c1d3

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:56:54 +0000 (23:56 +0000)]

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

Change-Id: I586e557c9257797642cafb7857ba1a2b60e3edee

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:53:37 +0000 (23:53 +0000)]

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

Change-Id: I3a7afab3700da0464ca24e2aa5e7ac73b756855f

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:50:04 +0000 (23:50 +0000)]

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

Change-Id: If26ea10608d586d3014bd99d2c27720d2316e37a

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:49:38 +0000 (23:49 +0000)]

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

Change-Id: I37e5c41fe54c5cc009da415395ae54e1c872f57d

commit | commitdiff | tree

Dave Friedman [Wed, 13 Sep 2017 23:42:48 +0000 (23:42 +0000)]

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

Change-Id: I2925d1d3bf70cebfb8d830a28a977208138d91af

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:41:40 +0000 (23:41 +0000)]

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

Change-Id: I6bf75581266953ee24347d9248a6f672a0db7651

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:37:36 +0000 (23:37 +0000)]

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

Change-Id: I1968606706a2c4a0041b4e26f08d3de5aa6e4046

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:31:03 +0000 (23:31 +0000)]

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

Change-Id: Idd71b32264c2fe1dc2b2cc572778882650170f81

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:26:19 +0000 (23:26 +0000)]

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

Change-Id: Id8c25356f63b7755f305b6f88eaa49ebdb3903df

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:18:12 +0000 (23:18 +0000)]

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

Change-Id: Ie715aed27dae619de572006fe4a37210ac4cf21a

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:14:37 +0000 (23:14 +0000)]

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

Change-Id: I09bbb5157c9e43f348cba855db6430245c525c54

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:12:27 +0000 (23:12 +0000)]

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

Change-Id: Ibe71d1a15eba70b96675afcb711eaa46597ab82d

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:11:18 +0000 (23:11 +0000)]

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

Change-Id: I915c191c0d807b6347df276661ad850d9ef7bd17

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:08:34 +0000 (23:08 +0000)]

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

Change-Id: Icaaa9992ba23d840e46ab7ab774dadb7c279ba7b

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:05:48 +0000 (23:05 +0000)]

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

Change-Id: Ie82ec238bedf1d6b36fa027b466f1682c368f8c4

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:05:08 +0000 (23:05 +0000)]

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

Change-Id: I728dcfc27c89c3f9d494b06d1a09625e6b33b085

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:00:53 +0000 (23:00 +0000)]

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

Change-Id: I828e11d0d99cf7f5081ab3e4ea67d86dc6d44e9f

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 23:00:37 +0000 (23:00 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8 -s ours
am: 318728fd6b -s ours

Change-Id: I230701f9b32e0b51962459ac740ddcb446415b96

commit | commitdiff | tree

Tetsutoki Shiozawa [Wed, 13 Sep 2017 22:56:03 +0000 (22:56 +0000)]

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

Change-Id: Iee500cd96b279b6ed7ccbc4466c114cd7a472807

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:54:23 +0000 (22:54 +0000)]

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

Change-Id: I27d6736b64df7e2887de545008d99b1bb5418049

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:52:33 +0000 (22:52 +0000)]

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

Change-Id: Iee1a8646963d52b43be7fc9de34cc88468b23bec

commit | commitdiff | tree

Tetsutoki Shiozawa [Wed, 13 Sep 2017 22:50:52 +0000 (22:50 +0000)]

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

Change-Id: I65b9ff5ac55e344a4aa985912ec09a01e4b14c99

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:48:33 +0000 (22:48 +0000)]

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

Change-Id: Icba327537143ff1f0753a31123e3f3feb2f862da

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:47:26 +0000 (22:47 +0000)]

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

Change-Id: I8a446d3a47db4c97e7292a8b6322a12013807813

commit | commitdiff | tree

Hall Liu [Wed, 13 Sep 2017 22:47:17 +0000 (22:47 +0000)]

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

Change-Id: I21ff320916c218e8f215116ab7046f5075067300

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:44:20 +0000 (22:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0 -s ours
am: 9abe093864 -s ours

Change-Id: I2f2564a295bdaa73cabc41ade774c3ced7d07e6b

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:43:36 +0000 (22:43 +0000)]

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

Change-Id: Icabcb2f90bb9a1ab13ec338f8d57ae27bc540d2b

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:40:02 +0000 (22:40 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee -s ours
am: 289d6b71a9 -s ours

Change-Id: I30dcfc1b085a93df65ef63354e824c395ab8fecc

commit | commitdiff | tree

Hall Liu [Wed, 13 Sep 2017 22:39:22 +0000 (22:39 +0000)]

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

Change-Id: I7338eaaa53211985ea86935669f23fd2245d1e78

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:39:09 +0000 (22:39 +0000)]

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

Change-Id: I96d9c99869652d2d1aad512772394ef433296b6d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Sep 2017 22:38:38 +0000 (22:38 +0000)]

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

commit | commitdiff | tree

Tetsutoki Shiozawa [Wed, 13 Sep 2017 22:36:59 +0000 (22:36 +0000)]

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

Change-Id: I5b8984d51ff0715b29074cee98197263b5ce1c29

commit | commitdiff | tree

Jakub Pawlowski [Wed, 13 Sep 2017 22:36:14 +0000 (22:36 +0000)]

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

Change-Id: I232f18596d1fd64aa64f44fd726df32d2f61ce83

commit | commitdiff | tree

Bill Yi [Wed, 13 Sep 2017 22:35:01 +0000 (22:35 +0000)]

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

Change-Id: I2291d935b088a54cdb71524770c47b8be7dc97ae

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help