OSDN Git Service
Adrian Roos [Thu, 11 Aug 2016 02:51:07 +0000 (02:51 +0000)]
Only disable trust agents after lockout am:
9d6fc9246b am:
73b2f5981e
am:
bbf52f2e85
Change-Id: I4606854b24313cc8231aaa0ce3ea33ea909f68b0
Adrian Roos [Thu, 11 Aug 2016 02:44:42 +0000 (02:44 +0000)]
Only disable trust agents after lockout am:
9d6fc9246b
am:
73b2f5981e
Change-Id: Idec9662345a8ed9f75605d1b5dd39f04ef488389
Adrian Roos [Thu, 11 Aug 2016 02:38:45 +0000 (02:38 +0000)]
Only disable trust agents after lockout
am:
9d6fc9246b
Change-Id: I1fd7860a5a2c452e4b3c2e3e8d1073c423c9f054
Andreas Gampe [Thu, 11 Aug 2016 02:23:05 +0000 (02:23 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev am:
927db408a2 am:
c9c0edfa14
am:
e329adfcf5
Change-Id: Idc7daa4c503b93dfe5b8e77797c513967682d5fa
Andreas Gampe [Thu, 11 Aug 2016 02:22:58 +0000 (02:22 +0000)]
Zygote: allow system server compilation to fail am:
e7bc152c20 am:
8253782f5b
am:
0d42671cc5
Change-Id: Ib811fe4631339f6edb98e9aba8b76513dc071140
Andreas Gampe [Thu, 11 Aug 2016 02:16:16 +0000 (02:16 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev am:
927db408a2
am:
c9c0edfa14
Change-Id: Ief749fa39db72532fbc91d075a130751a66d11df
Andreas Gampe [Thu, 11 Aug 2016 02:16:12 +0000 (02:16 +0000)]
Zygote: allow system server compilation to fail am:
e7bc152c20
am:
8253782f5b
Change-Id: I1fc916e9db2e391975b0037853cbfda9b08c706a
Andreas Gampe [Thu, 11 Aug 2016 02:11:26 +0000 (02:11 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
am:
927db408a2
Change-Id: I11435b1853073eca75bcff33e180fc165eb3d460
Andreas Gampe [Thu, 11 Aug 2016 02:11:21 +0000 (02:11 +0000)]
Zygote: allow system server compilation to fail
am:
e7bc152c20
Change-Id: Ibaea0c9bc3a5eb0e8a64342e4e27b7cfca21c647
TreeHugger Robot [Thu, 11 Aug 2016 02:02:08 +0000 (02:02 +0000)]
Merge "Zygote: allow system server compilation to fail" into nyc-mr1-dev
Christopher Tate [Thu, 11 Aug 2016 01:18:32 +0000 (01:18 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev am:
262f0186bd am:
dd1d9baa55
am:
5d3db6ddcb
Change-Id: I5f77e62b60af6b9aa69c25c818e779d8ffe2618d
Christopher Tate [Thu, 11 Aug 2016 01:18:29 +0000 (01:18 +0000)]
Base date-change alarm on 24h "hour zero," not 12h am:
afa8b980ac am:
3303c26759
am:
db5188b641
Change-Id: Id83b79ed5cfd486e2314b4034662b9501008f4b9
Christopher Tate [Thu, 11 Aug 2016 01:12:11 +0000 (01:12 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev am:
262f0186bd
am:
dd1d9baa55
Change-Id: I69200ed34995f3ce1c1a90d18912953b525cca62
Christopher Tate [Thu, 11 Aug 2016 01:12:07 +0000 (01:12 +0000)]
Base date-change alarm on 24h "hour zero," not 12h am:
afa8b980ac
am:
3303c26759
Change-Id: I145b9c4e1de61b8b1e8b456fea39ebc0ef928c18
TreeHugger Robot [Thu, 11 Aug 2016 01:09:18 +0000 (01:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Christopher Tate [Thu, 11 Aug 2016 01:06:00 +0000 (01:06 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
am:
262f0186bd
Change-Id: I5182e8474d0ed481485b58d1a6a0c447859ea5dd
Christopher Tate [Thu, 11 Aug 2016 01:05:58 +0000 (01:05 +0000)]
Base date-change alarm on 24h "hour zero," not 12h
am:
afa8b980ac
Change-Id: I4dac5d4eab675fde483ab3fe821370b02a3a8b05
Adrian Roos [Thu, 11 Aug 2016 00:09:55 +0000 (17:09 -0700)]
Only disable trust agents after lockout
Previously trust agents would be disabled even after one
wrong attempt. Now we wait for the cooldown (usually 5 attempts),
the same as fingerprint.
Also adds a TrustArchive entry of when device policy changes are sent to
trust agents.
Bug:
30037948
Change-Id: I9e284d994ddae45ef66b5b8b601297c63d8ba667
TreeHugger Robot [Thu, 11 Aug 2016 00:57:25 +0000 (00:57 +0000)]
Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev
Yin-Chia Yeh [Thu, 11 Aug 2016 00:54:03 +0000 (00:54 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev am:
58b4623d1f am:
ffa443f431
am:
76efc13610
Change-Id: Iad1be783e840a2d01ee1bcc495fdca219f0186e1
Yin-Chia Yeh [Thu, 11 Aug 2016 00:54:01 +0000 (00:54 +0000)]
Camera: ensure lock ordering (device->session) am:
b0025e1f68 am:
de71f83c2c
am:
162c8b84b5
Change-Id: Ia2b36acc9f945c7ab838681f8ea63a6b94579207
Yin-Chia Yeh [Thu, 11 Aug 2016 00:47:32 +0000 (00:47 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev am:
58b4623d1f
am:
ffa443f431
Change-Id: I2ee72a0857d2a4e4756727d876eed227f6e68653
Yin-Chia Yeh [Thu, 11 Aug 2016 00:47:26 +0000 (00:47 +0000)]
Camera: ensure lock ordering (device->session) am:
b0025e1f68
am:
de71f83c2c
Change-Id: I0c6addd8191c9e6ebde8b5efd066f54aaad71af5
TreeHugger Robot [Thu, 11 Aug 2016 00:43:55 +0000 (00:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Yin-Chia Yeh [Thu, 11 Aug 2016 00:39:28 +0000 (00:39 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
am:
58b4623d1f
Change-Id: I8c92a36230ae4b838cd06f421fdf8359e9a8a966
Yin-Chia Yeh [Thu, 11 Aug 2016 00:39:26 +0000 (00:39 +0000)]
Camera: ensure lock ordering (device->session)
am:
b0025e1f68
Change-Id: Idcb9b48274ecfe9fe2f306ae201491d1e485d601
Yin-Chia Yeh [Thu, 11 Aug 2016 00:32:13 +0000 (00:32 +0000)]
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:29:16 +0000 (00:29 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev am:
938d298116 am:
3cd67ed9d2
am:
9b39e97c0e
Change-Id: I38e06f9dd005e8445231bbd87e9a666c1753deed
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:29:11 +0000 (00:29 +0000)]
Use non-fast JNI for Canvas.native_drawBitmap. am:
bce8866506 am:
5d92aea521
am:
f88851a5f1
Change-Id: I90df07665f84932b8c6f88eacf409f60fabf8c7d
Jin Park [Tue, 9 Aug 2016 06:50:35 +0000 (15:50 +0900)]
ExifInterface: Handle test behavior
This CL corrects the compare values of lg_g4_iso_800 test file, which
was originally default values. Also, since .xml files do not handle
empty string cases, this CL adds code to treat it equal to a null
value.
Bug:
29409825
Change-Id: I26ed06a2ba689911c45885cfdaf9dfc018dfa7da
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:21:01 +0000 (00:21 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev am:
938d298116
am:
3cd67ed9d2
Change-Id: I43d37ca45ed9c0a6c26799cf323c72dec5228ca9
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:20:57 +0000 (00:20 +0000)]
Use non-fast JNI for Canvas.native_drawBitmap. am:
bce8866506
am:
5d92aea521
Change-Id: I5ca2535d1220c93c0bddc714542a727ec6fae93d
Jin Seok Park [Thu, 11 Aug 2016 00:20:09 +0000 (00:20 +0000)]
Merge "ExifInterface: Remove JNI code"
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:14:05 +0000 (00:14 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
am:
938d298116
Change-Id: Ie9c4ffd766ba9965ef2287a9e5a45cbe81555c58
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:14:02 +0000 (00:14 +0000)]
Use non-fast JNI for Canvas.native_drawBitmap.
am:
bce8866506
Change-Id: I58c322701cdc084aae018714f13fa9c2cf8d4cc6
Hiroshi Yamauchi [Thu, 11 Aug 2016 00:05:17 +0000 (00:05 +0000)]
Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
Jaewan Kim [Wed, 10 Aug 2016 23:57:00 +0000 (23:57 +0000)]
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev am:
25796925d9 am:
28825f1af0
am:
eac2d407c6
Change-Id: I30d4f49d1f79213c7f770acfc8d7068f3ed55140
Jaewan Kim [Wed, 10 Aug 2016 23:56:56 +0000 (23:56 +0000)]
PIP: Hide play/pause button by default am:
7000519695 am:
d5bee85ed5
am:
c7b66b51e7
Change-Id: I6282ee8112b8178a3b90750b3d3c911925ce367e
Jaewan Kim [Wed, 10 Aug 2016 23:45:00 +0000 (23:45 +0000)]
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev am:
25796925d9
am:
28825f1af0
Change-Id: I488278956d22d53c08e1bd8ac1ff2d4978b7ddc5
Jaewan Kim [Wed, 10 Aug 2016 23:44:54 +0000 (23:44 +0000)]
PIP: Hide play/pause button by default am:
7000519695
am:
d5bee85ed5
Change-Id: I8336e0a601515567b2371ccd1b7816fed486ec64
Chris Tate [Wed, 10 Aug 2016 23:43:01 +0000 (23:43 +0000)]
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev am:
c72da3331b am:
cdfc491693
am:
959a520248
Change-Id: If8fca5484a5942517517476528e9149d8c333ca7
Christopher Tate [Wed, 10 Aug 2016 23:42:55 +0000 (23:42 +0000)]
Fix lock wallpaper backup & restore am:
f47eff7343 am:
7d29edf078
am:
3e50da6c54
Change-Id: I347b4edb9651623f057ec0bf7ae3cbd05f753149
Jaewan Kim [Wed, 10 Aug 2016 23:36:05 +0000 (23:36 +0000)]
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev
am:
25796925d9
Change-Id: I0c55170b259ea7f51f030456337d81bebfc6dcfe
Jaewan Kim [Wed, 10 Aug 2016 23:36:00 +0000 (23:36 +0000)]
PIP: Hide play/pause button by default
am:
7000519695
Change-Id: I82bb2fcb3ab91920c4d1ebb7d3c716b36f7e5bff
Chris Tate [Wed, 10 Aug 2016 23:35:05 +0000 (23:35 +0000)]
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev am:
c72da3331b
am:
cdfc491693
Change-Id: I23440f9c98974e369272e8744ce33537a5e3380b
Christopher Tate [Wed, 10 Aug 2016 23:35:01 +0000 (23:35 +0000)]
Fix lock wallpaper backup & restore am:
f47eff7343
am:
7d29edf078
Change-Id: Id84a230e901c1610409508c065f821b5d17cfe3d
Chris Tate [Wed, 10 Aug 2016 23:27:05 +0000 (23:27 +0000)]
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev
am:
c72da3331b
Change-Id: I58152c38fd478978c7fb1454537ed3fc0f8eb644
Christopher Tate [Wed, 10 Aug 2016 23:27:00 +0000 (23:27 +0000)]
Fix lock wallpaper backup & restore
am:
f47eff7343
Change-Id: I4ed7d178487cb2b1b36578dc69f13f2532c71665
Jaewan Kim [Wed, 10 Aug 2016 23:22:19 +0000 (23:22 +0000)]
Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev
Chris Tate [Wed, 10 Aug 2016 23:17:07 +0000 (23:17 +0000)]
Merge "Fix lock wallpaper backup & restore" into nyc-mr1-dev
Christopher Tate [Wed, 10 Aug 2016 23:15:48 +0000 (16:15 -0700)]
Base date-change alarm on 24h "hour zero," not 12h
Bug
30628519
Change-Id: Ie504748c7fc2d43c713ddc72c39c56a976cc0df0
Alan Viverette [Wed, 10 Aug 2016 22:22:47 +0000 (22:22 +0000)]
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev am:
75f7bfdc7a am:
35af2d8672
am:
edd17734a8
Change-Id: Ia47cdde4c22dbd2f7e45e5c1c49d01aa6e580d4c
Alan Viverette [Wed, 10 Aug 2016 22:22:43 +0000 (22:22 +0000)]
Use localized hour when announcing selection for accessibility am:
66a8562c58 am:
fde654fb97
am:
4922fdc35f
Change-Id: I769d1cc8b25af34b4a08fba27e62db09a22412bc
Alan Viverette [Wed, 10 Aug 2016 22:11:12 +0000 (22:11 +0000)]
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev am:
75f7bfdc7a
am:
35af2d8672
Change-Id: Idde16aa1088b63c64d7328cf4dfe3c77d6607037
Alan Viverette [Wed, 10 Aug 2016 22:11:10 +0000 (22:11 +0000)]
Use localized hour when announcing selection for accessibility am:
66a8562c58
am:
fde654fb97
Change-Id: I8a07c4f9af6bfc31a2510dc5cc5aa7b763d77bc0
Tim Murray [Wed, 10 Aug 2016 22:06:58 +0000 (22:06 +0000)]
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev am:
f6fcb7b77d am:
e4ff55a10a
am:
6c91286bff
Change-Id: I98d5ab1186e0d782db5fb35ff3f22790becff6f0
Tim Murray [Wed, 10 Aug 2016 22:06:55 +0000 (22:06 +0000)]
Fix exception spam in ActivityManagerService. am:
feb846c299 am:
76ac2e7a8b
am:
fb1021f32e
Change-Id: I7a3695b0e545fb37c5cbb41eb2b24c60f6c4e312
Tyler Gunn [Wed, 10 Aug 2016 22:06:47 +0000 (22:06 +0000)]
Merge "Add carrier config to indicate whether to notify of vt handover failure." into nyc-mr1-dev am:
c687f614b9 am:
47d8bc9eb3
am:
82a087587c
Change-Id: Ia08de7b2c090ef41143115e615abac8067568d77
Tyler Gunn [Wed, 10 Aug 2016 22:05:20 +0000 (22:05 +0000)]
Add carrier config to indicate whether to notify of vt handover failure. am:
0f20d9343c am:
5c88ba0d7c
am:
ff50fc1374
Change-Id: I7f797768283c489a67ac1ad3cb38b2c79557bcda
Robert Greenwalt [Wed, 10 Aug 2016 22:05:05 +0000 (22:05 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am:
2438a33e54 am:
bda5769701 am:
c259624d8f
am:
360cacd159
Change-Id: I68f4b95b16aa38b97b0e9402f25c5db87bdbf722
Alan Viverette [Wed, 10 Aug 2016 22:05:02 +0000 (22:05 +0000)]
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev
am:
75f7bfdc7a
Change-Id: I6173deb1ca9b8d43844db798ab58cf35e80d5890
Alan Viverette [Wed, 10 Aug 2016 22:04:59 +0000 (22:04 +0000)]
Use localized hour when announcing selection for accessibility
am:
66a8562c58
Change-Id: Ieffd33d1e33fdd38e2383396b18dce8031fb1538
Bill Yi [Wed, 10 Aug 2016 21:56:58 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: If24d3b0422ae3f0c459bbfa939b54c74c9c2c2fe
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 10 Aug 2016 21:55:28 +0000 (21:55 +0000)]
Merge "Use localized hour when announcing selection for accessibility" into nyc-mr1-dev
Tim Murray [Wed, 10 Aug 2016 21:53:19 +0000 (21:53 +0000)]
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev am:
f6fcb7b77d
am:
e4ff55a10a
Change-Id: Ieab9f9a25d4f40e34b340d4eec68045c977d2323
Tim Murray [Wed, 10 Aug 2016 21:53:10 +0000 (21:53 +0000)]
Fix exception spam in ActivityManagerService. am:
feb846c299
am:
76ac2e7a8b
Change-Id: I6701526c571967715064cc366f032d0a284a7b35
Tyler Gunn [Wed, 10 Aug 2016 21:45:10 +0000 (21:45 +0000)]
Merge "Add carrier config to indicate whether to notify of vt handover failure." into nyc-mr1-dev am:
c687f614b9
am:
47d8bc9eb3
Change-Id: I5e9d0137b540b08ad3105113a63e015c8d5221b8
Tyler Gunn [Wed, 10 Aug 2016 21:43:42 +0000 (21:43 +0000)]
Add carrier config to indicate whether to notify of vt handover failure. am:
0f20d9343c
am:
5c88ba0d7c
Change-Id: Ib56d6233292bb6b3e35a226e50a8ff7104eef6a6
Tim Murray [Wed, 10 Aug 2016 21:43:42 +0000 (21:43 +0000)]
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev
am:
f6fcb7b77d
Change-Id: I4abc6cd03993383c0ace610a6c70b6a72b41e065
Tim Murray [Wed, 10 Aug 2016 21:43:37 +0000 (21:43 +0000)]
Fix exception spam in ActivityManagerService.
am:
feb846c299
Change-Id: I0d30d351d0c5455ebf518a36991d7772e43408ef
Alan Viverette [Wed, 10 Aug 2016 21:42:51 +0000 (21:42 +0000)]
Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev am:
c816320161 am:
131368be60
am:
9669ac3f1b
Change-Id: I7e8d9ec7d140a0fcad7bfb82f1182dc43cdbe61a
Alan Viverette [Wed, 10 Aug 2016 21:42:47 +0000 (21:42 +0000)]
Use symmetric conditions for advertising and performing ACTION_SCROLL am:
47be54bb78 am:
fd855c17b1
am:
56a05f464e
Change-Id: I8b2e6afbd3aa8de0234db1abd7bf21cdb4b369bc
Robert Greenwalt [Wed, 10 Aug 2016 21:41:59 +0000 (21:41 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am:
2438a33e54 am:
bda5769701
am:
c259624d8f
Change-Id: I7d63ae00d079ceac64429ea1a538eb58142d54bc
TreeHugger Robot [Wed, 10 Aug 2016 21:38:15 +0000 (21:38 +0000)]
Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev
Tyler Gunn [Wed, 10 Aug 2016 21:36:50 +0000 (21:36 +0000)]
Merge "Add carrier config to indicate whether to notify of vt handover failure." into nyc-mr1-dev
am:
c687f614b9
Change-Id: I5c72605839fd18a051ac00fbb499cb57140404bd
Tyler Gunn [Wed, 10 Aug 2016 21:36:44 +0000 (21:36 +0000)]
Add carrier config to indicate whether to notify of vt handover failure.
am:
0f20d9343c
Change-Id: Ibfa7d39871717ce46971b1999d9eab09fb1931c1
Robert Greenwalt [Wed, 10 Aug 2016 21:29:31 +0000 (21:29 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am:
2438a33e54
am:
bda5769701
Change-Id: I921e50e48b0c93e31fa3d172c850629312f322e6
Tyler Gunn [Wed, 10 Aug 2016 21:28:37 +0000 (21:28 +0000)]
Merge "Add carrier config to indicate whether to notify of vt handover failure." into nyc-mr1-dev
Bill Yi [Wed, 10 Aug 2016 21:22:41 +0000 (14:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a36f28639fa2e775a5d17dcaf24a9293cb64457
Auto-generated-cl: translation import
Robert Greenwalt [Wed, 10 Aug 2016 21:20:39 +0000 (21:20 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
am:
2438a33e54
Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71
Bill Yi [Wed, 10 Aug 2016 21:20:35 +0000 (21:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b0e095c93d -s ours
am:
2dea6c7475 -s ours
Change-Id: I7dd849c0a5097f2590b5129a8b356a25c0e29518
Bill Yi [Wed, 10 Aug 2016 21:20:32 +0000 (21:20 +0000)]
Import translations. DO NOT MERGE am:
10540d5a5e -s ours
am:
56498e388d -s ours
Change-Id: I7bfaa7ebadf07a60c37678ac2520098a6fd477f9
Bill Yi [Wed, 10 Aug 2016 21:20:30 +0000 (21:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
3d788faae0 -s ours
am:
994b41c753 -s ours
Change-Id: I92bc1145a3e60f61ca11b2cffbb464f4c456021b
Bill Yi [Wed, 10 Aug 2016 21:20:27 +0000 (21:20 +0000)]
Import translations. DO NOT MERGE am:
53ae06fe10 -s ours
am:
f8b5e78639 -s ours
Change-Id: I414ac7140a342e636c6556627a0cb8dd70083713
Alan Viverette [Wed, 10 Aug 2016 21:20:09 +0000 (21:20 +0000)]
Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev am:
c816320161
am:
131368be60
Change-Id: I5f1101abe31b2a820aeaf050e613978ad5ab0604
Alan Viverette [Wed, 10 Aug 2016 21:20:05 +0000 (21:20 +0000)]
Use symmetric conditions for advertising and performing ACTION_SCROLL am:
47be54bb78
am:
fd855c17b1
Change-Id: I6efe57707e22099409869c3e7c42bfa12a081ff4
TreeHugger Robot [Wed, 10 Aug 2016 21:12:44 +0000 (21:12 +0000)]
Merge "Dispose WMS.DragInputEventReceiver on the correct thread"
TreeHugger Robot [Wed, 10 Aug 2016 21:09:00 +0000 (21:09 +0000)]
Merge "Add WiFi toggle prompts - framework"
Alan Viverette [Wed, 10 Aug 2016 21:08:28 +0000 (21:08 +0000)]
Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev
am:
c816320161
Change-Id: I36ce4c76617592d574def6873645be1f95df1426
Alan Viverette [Wed, 10 Aug 2016 21:08:25 +0000 (21:08 +0000)]
Use symmetric conditions for advertising and performing ACTION_SCROLL
am:
47be54bb78
Change-Id: Icdb68cd673269cbc2e41a44becbb0fa4c0ba4712
Robert Greenwalt [Wed, 10 Aug 2016 21:07:25 +0000 (21:07 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
Bill Yi [Wed, 10 Aug 2016 21:00:36 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b0e095c93d -s ours
Change-Id: I97c915d738109cad16709301bb6624af098a64eb
Bill Yi [Wed, 10 Aug 2016 21:00:31 +0000 (21:00 +0000)]
Import translations. DO NOT MERGE
am:
10540d5a5e -s ours
Change-Id: Iae734c43f78ea986a22d95083dddc1990cb07a35
Bill Yi [Wed, 10 Aug 2016 21:00:22 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
3d788faae0 -s ours
Change-Id: I9f7e5e174a392469277555dd78bea2a749ce67ea
Bill Yi [Wed, 10 Aug 2016 21:00:14 +0000 (21:00 +0000)]
Import translations. DO NOT MERGE
am:
53ae06fe10 -s ours
Change-Id: I8b15d3f8463f22e8214beed85961b09b5e2f6ca0
TreeHugger Robot [Wed, 10 Aug 2016 20:57:21 +0000 (20:57 +0000)]
Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev
TreeHugger Robot [Wed, 10 Aug 2016 20:51:24 +0000 (20:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 10 Aug 2016 20:51:07 +0000 (20:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Julius D'souza [Wed, 10 Aug 2016 20:50:06 +0000 (20:50 +0000)]
Merge "DO NOT MERGE: Make slow brightness display ramp rate configurable." into cw-f-dev am:
b0f113535b
am:
04ae665745 -s ours
Change-Id: Ib43af389cb4d193a0504a50b0db1ca31d855fefe
Julius D'souza [Wed, 10 Aug 2016 20:50:03 +0000 (20:50 +0000)]
DO NOT MERGE: Make slow brightness display ramp rate configurable. am:
621dc1cca2
am:
2d3842c197 -s ours
Change-Id: Iaebddbb3d5aa60f22fe0fe780c9b1aca13cf9c3f