Brad Ebinger
|
74e1928fa9
|
Merge "Remove PIN/PUK keyguard when SIM is removed/ready"
|
2017-08-24 22:44:14 +00:00 |
|
Chavi Weingarten
|
3787d39a59
|
Merge "Check for null appToken" into oc-mr1-dev am: ba893e6a10
am: 3a839d7fae
Change-Id: Ib534e2d16beb76daefdde3ad712d421a25a7f481
|
2017-08-24 22:34:50 +00:00 |
|
Garry Boyer
|
63431405de
|
Merge "Remove child package max."
|
2017-08-24 22:28:15 +00:00 |
|
Chavi Weingarten
|
3a839d7fae
|
Merge "Check for null appToken" into oc-mr1-dev
am: ba893e6a10
Change-Id: Ib99dad7da1d4e639a95f6e276c039946639e88cb
|
2017-08-24 22:05:16 +00:00 |
|
Shuo Qian
|
bf1a674ed7
|
Merge "Add new error code in SmsManager" into oc-mr1-dev am: 1dafcc89a5
am: a43b382766
Change-Id: Ic1a8824e1f1d2e3a7655484d23ff658d3d5fd40d
|
2017-08-24 22:02:47 +00:00 |
|
Yohei Yukawa
|
c6f9b06164
|
Merge "New haptic feedback constants" into oc-mr1-dev am: f3b78305ff
am: b737076a4e
Change-Id: I94a90ce699c420f6f761f55c31967ea407e1e8c5
|
2017-08-24 21:57:08 +00:00 |
|
Shuo Qian
|
a43b382766
|
Merge "Add new error code in SmsManager" into oc-mr1-dev
am: 1dafcc89a5
Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f
|
2017-08-24 21:44:54 +00:00 |
|
Makoto Onuki
|
279766e0cf
|
Merge "Don't report suspicious periodic sync removal for gone users" into oc-mr1-dev am: 1fab6234c0
am: a750014a6d
Change-Id: I7684a29b730f0c3a5dd1f24aea16755c0b3fea9d
|
2017-08-24 21:37:57 +00:00 |
|
Bill Yi
|
d56f74b601
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: faa21e1a6c -s ours
am: b922ede46a -s ours
Change-Id: I9341a1e79f59321a5f7ae9729f4a90d9f262731e
|
2017-08-24 21:31:24 +00:00 |
|
Chavi Weingarten
|
ba893e6a10
|
Merge "Check for null appToken" into oc-mr1-dev
|
2017-08-24 21:24:33 +00:00 |
|
Shuo Qian
|
1dafcc89a5
|
Merge "Add new error code in SmsManager" into oc-mr1-dev
|
2017-08-24 21:22:31 +00:00 |
|
Geoffrey Pitsch
|
90de22461a
|
Merge "Support keyboard long-press on notifications" into oc-mr1-dev am: e7c9d8f905
am: fd7be277d8
Change-Id: Ia2a0d536e3f1cfe6af682071f91f810bfb84da21
|
2017-08-24 21:22:21 +00:00 |
|
chaviw
|
35d7de0bf2
|
Check for null appToken
AppWindowToken can be null for non-app windows.
Test: Existing tests pass
Fixes: 65018183
Change-Id: I81c7e4e2bec40c588771cc46e4a8061c7112765a
|
2017-08-24 14:19:39 -07:00 |
|
Yohei Yukawa
|
b737076a4e
|
Merge "New haptic feedback constants" into oc-mr1-dev
am: f3b78305ff
Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5
|
2017-08-24 21:14:36 +00:00 |
|
Siyamed Sinir
|
69332c48b9
|
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev am: faba49c4d3
am: 5186589eba -s ours
Change-Id: I2e86ad51806c036c195eab17f822088d61ed5633
|
2017-08-24 21:12:48 +00:00 |
|
Makoto Onuki
|
a750014a6d
|
Merge "Don't report suspicious periodic sync removal for gone users" into oc-mr1-dev
am: 1fab6234c0
Change-Id: I90b209f4077d858b6a801dd7a195e0c4e268df4c
|
2017-08-24 21:03:54 +00:00 |
|
TreeHugger Robot
|
f3b78305ff
|
Merge "New haptic feedback constants" into oc-mr1-dev
|
2017-08-24 21:02:57 +00:00 |
|
Bill Yi
|
b922ede46a
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: faa21e1a6c -s ours
Change-Id: Icffdd7252151b526eb0e96d94c9a5849c3eeaac1
|
2017-08-24 20:57:04 +00:00 |
|
Geoffrey Pitsch
|
fd7be277d8
|
Merge "Support keyboard long-press on notifications" into oc-mr1-dev
am: e7c9d8f905
Change-Id: I0b826bf0f1105b202f3b3368b5cec5568c8ffd6b
|
2017-08-24 20:48:43 +00:00 |
|
Andrii Kulian
|
d48474969e
|
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev am: 7ee92d5291
am: a64529a989
Change-Id: I52a93678621d3d28e88cd7cdbfbfca3c2a96f0b2
|
2017-08-24 20:39:54 +00:00 |
|
Siyamed Sinir
|
5186589eba
|
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
am: faba49c4d3
Change-Id: I2140b3ece38c8081de1b10ae5dbfa32ccf3acf90
|
2017-08-24 20:39:27 +00:00 |
|
TreeHugger Robot
|
1fab6234c0
|
Merge "Don't report suspicious periodic sync removal for gone users" into oc-mr1-dev
|
2017-08-24 20:29:06 +00:00 |
|
Lujiang Xue
|
82765d5f29
|
Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev am: 130d850614
am: ccc4e327be
Change-Id: Ie47cd2521aa4d21fc2dce3a57d6eff28b1d03f7a
|
2017-08-24 20:22:31 +00:00 |
|
Andrii Kulian
|
a64529a989
|
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
am: 7ee92d5291
Change-Id: I8bfb1fb9f96489d9d11cc1b587d78b6a08a130ed
|
2017-08-24 20:14:28 +00:00 |
|
TreeHugger Robot
|
faa21e1a6c
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
|
2017-08-24 20:13:59 +00:00 |
|
Etan Cohen
|
81c76a98f9
|
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev am: 19f12028b7
am: 58d610c5c2
Change-Id: I094ac271142898f356195ad23a7503121bae8b2a
|
2017-08-24 20:10:50 +00:00 |
|
TreeHugger Robot
|
a2a1c156f5
|
Merge "Import translations. DO NOT MERGE"
|
2017-08-24 20:07:09 +00:00 |
|
Geoffrey Pitsch
|
e7c9d8f905
|
Merge "Support keyboard long-press on notifications" into oc-mr1-dev
|
2017-08-24 20:04:37 +00:00 |
|
Lujiang Xue
|
ccc4e327be
|
Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev
am: 130d850614
Change-Id: Ie5848073bb6462166ad0c09c84d9a95ac4dbe26a
|
2017-08-24 20:03:31 +00:00 |
|
Siyamed Sinir
|
faba49c4d3
|
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
* changes:
StaticLayout capped height should be 0 when maxLines=0
Reset StaticLayout.mEllipsized during generate()
|
2017-08-24 19:59:22 +00:00 |
|
Andrii Kulian
|
7ee92d5291
|
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
|
2017-08-24 19:59:08 +00:00 |
|
Tyler Gunn
|
b18835d453
|
Merge "Track conference start in system elapsed time."
|
2017-08-24 19:56:50 +00:00 |
|
Etan Cohen
|
58d610c5c2
|
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
am: 19f12028b7
Change-Id: I2a99242470c37ca423221ff31e2fdd72ea53d4f1
|
2017-08-24 19:54:06 +00:00 |
|
TreeHugger Robot
|
159d677664
|
Merge "AAPT2: Fix regression in Manifest.java permissions"
|
2017-08-24 19:54:02 +00:00 |
|
Android Build Merger (Role)
|
ee94d0af57
|
Merge "Merge "Audio event logging" into oc-mr1-dev am: 9961d6968e am: 87dfc5bb4e"
|
2017-08-24 19:47:11 +00:00 |
|
Jean-Michel Trivi
|
d2f450bed6
|
Merge "Audio event logging" into oc-mr1-dev am: 9961d6968e
am: 87dfc5bb4e
Change-Id: Ief454ea5fd405cb902a06851d3b5e966266c84e4
|
2017-08-24 19:42:48 +00:00 |
|
TreeHugger Robot
|
c706588091
|
Merge "AAPT2: better error handling for daemon mode"
|
2017-08-24 19:41:53 +00:00 |
|
TreeHugger Robot
|
95411dad1c
|
Merge "Import translations. DO NOT MERGE"
|
2017-08-24 19:35:44 +00:00 |
|
TreeHugger Robot
|
130d850614
|
Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev
|
2017-08-24 19:33:53 +00:00 |
|
TreeHugger Robot
|
19f12028b7
|
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
|
2017-08-24 19:29:02 +00:00 |
|
Beverly
|
abb162342d
|
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev am: 8f5c9de97e
am: 62ffcb36c9
Change-Id: I80dbc3cb1eed565a3f5aea1bbc89b31bc4a03b4e
|
2017-08-24 19:27:07 +00:00 |
|
Roozbeh Pournader
|
2be7eff3a4
|
Merge "Use fallback-based line spacing in TextView etc"
|
2017-08-24 19:24:06 +00:00 |
|
Jean-Michel Trivi
|
87dfc5bb4e
|
Merge "Audio event logging" into oc-mr1-dev
am: 9961d6968e
Change-Id: I574558660e57b56a1f38b878fac8f25c84051cd7
|
2017-08-24 19:21:44 +00:00 |
|
Beverly
|
62ffcb36c9
|
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev
am: 8f5c9de97e
Change-Id: I32322f1b788bf3a55d92425485d98b58f7b524c7
|
2017-08-24 19:15:13 +00:00 |
|
TreeHugger Robot
|
9961d6968e
|
Merge "Audio event logging" into oc-mr1-dev
|
2017-08-24 19:04:47 +00:00 |
|
Matthew Ng
|
2a16a85654
|
Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev am: b952c7557e
am: 5e4f6dad0c
Change-Id: I27789aee6e8b64e7cf63c0a52bdeba0ade2e63c3
|
2017-08-24 19:02:41 +00:00 |
|
TreeHugger Robot
|
8f5c9de97e
|
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev
|
2017-08-24 19:01:55 +00:00 |
|
TreeHugger Robot
|
6f42bd67fe
|
Merge "Fix assert_premultiplied assert"
|
2017-08-24 18:48:25 +00:00 |
|
Matthew Ng
|
5e4f6dad0c
|
Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev
am: b952c7557e
Change-Id: I66e78a3eb612a16d9dfcac749cb68c4f9e2e7334
|
2017-08-24 18:47:48 +00:00 |
|
Selim Cinek
|
d51c734a4f
|
Merge "Fixed a bug where we weren't releasing views" into oc-mr1-dev am: a782ff3fb7
am: 3490fd43a6
Change-Id: I601ad9df09c5dd3682cac7e81116ebc77c5d2ddf
|
2017-08-24 18:42:07 +00:00 |
|