Tyler Gunn
80e8e8911e
Merge \"Add carrier config for WFC promo mode.\" into nyc-mr1-dev
...
am: 3cc6935719
Change-Id: Ib135da9b8869da3396a98262f5e18f09ffbbad3e
2016-07-11 15:16:51 +00:00
Tyler Gunn
3cc6935719
Merge "Add carrier config for WFC promo mode." into nyc-mr1-dev
2016-07-11 15:04:30 +00:00
Tetsutoki Shiozawa
5c062978a4
Merge \\\"Solve the infinite loop on clearExternalStorageDataSync\\\" am: 9a3fbe1162 am: 2747eb7e94
...
am: 8fbc6c9005
Change-Id: I6136a70985b1594a7374afa50a62235765f8f236
2016-07-11 15:01:29 +00:00
Todd Kennedy
8fbc6c9005
Merge \\"Solve the infinite loop on clearExternalStorageDataSync\\" am: 9a3fbe1162
...
am: 2747eb7e94
Change-Id: I56e12f9609c5b511c65a6e6b32dbc7ab1d80958a
2016-07-11 14:51:48 +00:00
Tetsutoki Shiozawa
2747eb7e94
Merge \"Solve the infinite loop on clearExternalStorageDataSync\"
...
am: 9a3fbe1162
Change-Id: I5cfb3374a162863adc305f041eaca08d6efa2d3e
2016-07-11 14:42:57 +00:00
Todd Kennedy
9a3fbe1162
Merge "Solve the infinite loop on clearExternalStorageDataSync"
2016-07-11 14:32:02 +00:00
Sergio Giro
daad138428
Merge \"Add bound checks to utf16_to_utf8\" into nyc-mr1-dev
...
am: 49c410bc48
Change-Id: I9a226afc143db459184a279167f0dce66c0f32df
2016-07-11 12:22:30 +00:00
Sergio Giro
49c410bc48
Merge "Add bound checks to utf16_to_utf8" into nyc-mr1-dev
2016-07-11 12:11:31 +00:00
Erik Kline
915d09b5d4
Support requesting async LinkProperties/NetworkCapabilities updates
...
am: acdd639513
Change-Id: Icc048323debbbe641941c5c0d993f4c9782c5d3e
2016-07-11 11:01:42 +00:00
Erik Kline
461e4fff31
Basic IPv6 Router Advertisement daemon
...
am: a3ca6bd3e0
Change-Id: I242eb8e932581a537a47f31e3f16c7e776da91cf
2016-07-11 10:38:49 +00:00
Shubham Ajmera
fbf0d8e8e4
Merge \\\"Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a\\\" am: 18941cb53f am: fbe280e345
...
am: 8fb315b17b
Change-Id: I89b4514de874d07c686ead81eb530fbc93de2ebc
2016-07-11 10:30:45 +00:00
Shubham Ajmera
8fb315b17b
Merge \\"Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a\\" am: 18941cb53f
...
am: fbe280e345
Change-Id: I654540abfc3a691b1f2caa0921203e952bbaf53d
2016-07-11 10:23:36 +00:00
Shubham Ajmera
48a6d5a3f1
Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a am: a0d7917c36
...
am: 1487d5f409
Change-Id: I6856f2386827ce73a6a5a8e7227b9597137f487d
2016-07-11 10:22:23 +00:00
Erik Kline
acdd639513
Support requesting async LinkProperties/NetworkCapabilities updates
...
Bug: 9580643
Change-Id: I1d7ba7645c20d7d53f6eef777dfce43727940f13
2016-07-11 19:17:41 +09:00
Shubham Ajmera
fbe280e345
Merge \"Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a\"
...
am: 18941cb53f
Change-Id: I40ce35ca5e8901f3e8b1e06258c7a5649084d51e
2016-07-11 10:16:34 +00:00
Shubham Ajmera
1487d5f409
Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a
...
am: a0d7917c36
Change-Id: I728386e4a8a2c97c5cc8e2d3c1cac46c046057db
2016-07-11 10:16:20 +00:00
Shubham Ajmera
18941cb53f
Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a"
2016-07-11 10:08:40 +00:00
Shubham Ajmera
a0d7917c36
Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a
...
(cherry-picked from commit 30cbe3b264 )
Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09
2016-07-11 10:06:11 +00:00
Erik Kline
a3ca6bd3e0
Basic IPv6 Router Advertisement daemon
...
Bug: 9580643
Change-Id: Iebd4d1f694699ffd4daf7d71e9b9d8f49e9b632f
2016-07-11 18:37:25 +09:00
Android Build Merger (Role)
2069466435
Merge "Merge \\"Fix simple typo in System Permissions guide\\" into nyc-dev am: a2f3c8fb0b am: 8158fbe83a" into nyc-mr1-dev-plus-aosp
2016-07-11 00:43:07 +00:00
Wonil Kim
981bc48d1b
Merge \\"Fix simple typo in System Permissions guide\\" into nyc-dev am: a2f3c8fb0b
...
am: 8158fbe83a
Change-Id: I07d8c9a2197041cb37142bb84c34a93128454c2f
2016-07-11 00:42:39 +00:00
Wonil Kim
482e40e727
Merge \\"Fix simple typo in System Permissions guide\\" into nyc-dev am: a2f3c8fb0b
...
am: 6a1cc3d97d
Change-Id: I2a0f174c31ea099d878a4db73542423a7008349e
2016-07-11 00:42:36 +00:00
Wonil Kim
6a1cc3d97d
Merge \"Fix simple typo in System Permissions guide\" into nyc-dev
...
am: a2f3c8fb0b
Change-Id: I40f81be795e2bc42ae8a71c4fed559512b8be253
2016-07-11 00:36:14 +00:00
Wonil Kim
8158fbe83a
Merge \"Fix simple typo in System Permissions guide\" into nyc-dev
...
am: a2f3c8fb0b
Change-Id: I6aa06a7df365546bec88c65ba58b58869591f187
2016-07-11 00:36:14 +00:00
Wonil Kim
a2f3c8fb0b
Merge "Fix simple typo in System Permissions guide" into nyc-dev
2016-07-11 00:20:46 +00:00
Hall Liu
b60e0bf477
Merge \"Rename disable add call extra\" into nyc-mr1-dev
...
am: 7e10bcffc5
Change-Id: Ide932c20b167bdfb9623cebd70d7732b53a80b34
2016-07-09 01:08:34 +00:00
Hall Liu
7e10bcffc5
Merge "Rename disable add call extra" into nyc-mr1-dev
2016-07-09 01:03:20 +00:00
Chris Craik
0fc003e675
Merge \"Fix UiBench MainActivity fragment\" into nyc-mr1-dev
...
am: 8b31db3621
Change-Id: I597e28d025569fec839ca7b02ea03b054a582a94
2016-07-09 00:37:54 +00:00
Chris Craik
8b31db3621
Merge "Fix UiBench MainActivity fragment" into nyc-mr1-dev
2016-07-09 00:31:59 +00:00
Doris Ling
b8d3caf4b8
Merge \"Add a secure setting for double twist gesture for camera flip.\" into nyc-mr1-dev
...
am: 3e869587e8
Change-Id: If64a188d45beea48d264219df8a9c7bce63bcecf
2016-07-09 00:03:08 +00:00
Doris Ling
3e869587e8
Merge "Add a secure setting for double twist gesture for camera flip." into nyc-mr1-dev
2016-07-08 23:58:46 +00:00
Eric Laurent
4b09c6bc9e
Merge \"Add Dolby TrueHD audio format\" into nyc-mr1-dev
...
am: b2fe804064
Change-Id: I2eba2e118c6ce34299ffe894d2c6e6ef9140fa24
2016-07-08 23:13:13 +00:00
Eric Laurent
b2fe804064
Merge "Add Dolby TrueHD audio format" into nyc-mr1-dev
2016-07-08 23:08:02 +00:00
Jorim Jaggi
0483184454
Merge \"Preparations for different scrim depending on wallpaper\" into nyc-mr1-dev
...
am: 702589d060
Change-Id: I32c188034c773836ade46ddab63606e7e88400de
2016-07-08 22:19:42 +00:00
Hall Liu
ee6e86b2bc
Rename disable add call extra
...
Used to be DISABLE_ADD_CALL_DURING_VIDEO_CALL, now just
DISABLE_ADD_CALL. The meaning has also changed -- having the extra set
means that adding calls should be disabled no matter what.
Bug: 29047863
Change-Id: Icd8966492b264a9c64dc4880080a706032f0759c
2016-07-08 15:14:42 -07:00
TreeHugger Robot
702589d060
Merge "Preparations for different scrim depending on wallpaper" into nyc-mr1-dev
2016-07-08 22:13:51 +00:00
Jorim Jaggi
6e57aae680
Merge \"Improve initial unlock delay (1/2)\" into nyc-mr1-dev
...
am: 165b011a74
Change-Id: Ib7bfefcd59288d144a22434e5a99124c66fa4826
2016-07-08 22:08:37 +00:00
TreeHugger Robot
165b011a74
Merge "Improve initial unlock delay (1/2)" into nyc-mr1-dev
2016-07-08 22:03:49 +00:00
Mark Salyzyn
7d0c912653
Settings: add logpersist kernel only selection (strings) am: 1e6dab2b91
...
am: 23cb96ae9b
Change-Id: I1d8a124dfa81051abb6a9de4276c059ab396b839
2016-07-08 21:42:03 +00:00
Mark Salyzyn
23cb96ae9b
Settings: add logpersist kernel only selection (strings)
...
am: 1e6dab2b91
Change-Id: If1f3da789eab3c36a622a26f06df6dc74f222bb5
2016-07-08 21:37:36 +00:00
Doris Ling
a60d31d70f
Add a secure setting for double twist gesture for camera flip.
...
Add Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED to control whether the
double twist gesture should flip the camera between front and back mode
is enabled or not. Also move SYSTEM_NAVIGATION_KEYS_ENABLED from
Global to Secure.
Bug: 29869445
Change-Id: I614289e6de7b1ee4221de7047a5e0dd784607bed
2016-07-08 14:32:32 -07:00
Mark Salyzyn
1e6dab2b91
Settings: add logpersist kernel only selection (strings)
...
Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
2016-07-08 14:31:22 -07:00
Justin Klaassen
1228803cde
Merge \"Add Night display feature\" into nyc-mr1-dev
...
am: 76262b8e14
Change-Id: I03912016390820f61fb515b1f206edd9bfea9ccf
2016-07-08 21:15:35 +00:00
Eino-Ville Talvala
9b74b46034
Merge \"Camera2: Add @hide variant for openCamera for UID forwarding\" into nyc-mr1-dev
...
am: 8c22370331
Change-Id: Ie03815d4793fd432f8e49d2119d2a9478bdd4332
2016-07-08 21:15:20 +00:00
Michael Kwan
48ff322bb5
Merge \"Updated margins and spacing of preferences for watch type devices.\" into nyc-mr1-dev
...
am: 3a45f27ceb
Change-Id: Ia6cdf20fa4e4ad7c7988c2b613d4a35bdd01bbf3
2016-07-08 21:11:45 +00:00
Justin Klaassen
76262b8e14
Merge "Add Night display feature" into nyc-mr1-dev
2016-07-08 21:07:48 +00:00
TreeHugger Robot
8c22370331
Merge "Camera2: Add @hide variant for openCamera for UID forwarding" into nyc-mr1-dev
2016-07-08 21:02:51 +00:00
Michael Kwan
3a45f27ceb
Merge "Updated margins and spacing of preferences for watch type devices." into nyc-mr1-dev
2016-07-08 20:44:25 +00:00
Justin Klaassen
9a087f6954
Merge \"Remove \"Night mode\" from tuner\" into nyc-mr1-dev
...
am: e615e16ab6
Change-Id: I497cf51948597f8f70e756e4f11dac94c2d69444
2016-07-08 20:22:10 +00:00
TreeHugger Robot
e615e16ab6
Merge "Remove "Night mode" from tuner" into nyc-mr1-dev
2016-07-08 20:14:43 +00:00