OSDN Git Service
Tyler Gunn [Fri, 12 Aug 2016 15:08:31 +0000 (15:08 +0000)]
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev am:
34910458c4
am:
c05e0a8d35
Change-Id: If22e4fe4327ef7cd62873ee5431a60a5f029d404
Tyler Gunn [Fri, 12 Aug 2016 15:07:10 +0000 (15:07 +0000)]
Add ImsReason codes and DisconnectCauses for data disconnects. am:
ed21e8fc0c
am:
61d1830a49
Change-Id: I3f35db127ef21adbcb086879f4b92eacac72974c
Tyler Gunn [Fri, 12 Aug 2016 14:59:37 +0000 (14:59 +0000)]
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev
am:
34910458c4
Change-Id: I5d1d6a7067376dc765224ef27fbee25b86334a9a
Tyler Gunn [Fri, 12 Aug 2016 14:59:27 +0000 (14:59 +0000)]
Add ImsReason codes and DisconnectCauses for data disconnects.
am:
ed21e8fc0c
Change-Id: I468ab4a5e16bd08aa80c50c1cfc583e0004ea1ab
Tyler Gunn [Fri, 12 Aug 2016 14:54:26 +0000 (14:54 +0000)]
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev
John Reck [Fri, 12 Aug 2016 14:39:45 +0000 (14:39 +0000)]
Merge "Fix NPE in TextureView" into nyc-mr1-dev am:
4804404e11
am:
8bd8703538
Change-Id: Ia14fc3478f914453e77fc94180e5972da5cd5aea
John Reck [Fri, 12 Aug 2016 14:39:36 +0000 (14:39 +0000)]
Fix NPE in TextureView am:
7e237189c2
am:
ed1f1399d4
Change-Id: I1166edf4590e2846e6c115cbe9c9455ee46b64b5
John Reck [Fri, 12 Aug 2016 14:31:52 +0000 (14:31 +0000)]
Merge "Fix NPE in TextureView" into nyc-mr1-dev
am:
4804404e11
Change-Id: Iab6ecc3b6a5bf9d8921297dec9a0f93ff1abc397
John Reck [Fri, 12 Aug 2016 14:31:49 +0000 (14:31 +0000)]
Fix NPE in TextureView
am:
7e237189c2
Change-Id: I16d37e5c8ab6b81b57f510be5cdea09047cdbd79
John Reck [Fri, 12 Aug 2016 14:25:14 +0000 (14:25 +0000)]
Merge "Fix NPE in TextureView" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 10:58:14 +0000 (10:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ccd9ff6157 -s ours
am:
d4d3503d57 -s ours
Change-Id: I328576af4b4f006176a98fe8279e44803bb80432
Bill Yi [Fri, 12 Aug 2016 10:58:09 +0000 (10:58 +0000)]
Import translations. DO NOT MERGE am:
7e33c8c4d2 -s ours
am:
4415f7ceca -s ours
Change-Id: Ied502c98f68e9ff417fc2babbf26f8bb952f454a
Bill Yi [Fri, 12 Aug 2016 10:51:37 +0000 (10:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ccd9ff6157 -s ours
Change-Id: I2191e7d4670a9852c72bf18cef1513cd7236ee80
Bill Yi [Fri, 12 Aug 2016 10:51:35 +0000 (10:51 +0000)]
Import translations. DO NOT MERGE
am:
7e33c8c4d2 -s ours
Change-Id: Iafc428588907eee40e8d1f8a3f306179c0cf83ff
TreeHugger Robot [Fri, 12 Aug 2016 10:44:40 +0000 (10:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 09:39:46 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d97f049315 -s ours
am:
a4fc5f2b76 -s ours
Change-Id: I32213fc43c9f653b35ee856d72284158a5ae8d1a
Bill Yi [Fri, 12 Aug 2016 09:39:42 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
ab3feb2c95 -s ours
am:
505a717a4b -s ours
Change-Id: I5d36313dfee93f7bbd4e0c0d2624e6ead1bc8b44
Bill Yi [Fri, 12 Aug 2016 09:39:38 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
438c3cbffe -s ours
am:
545c97d0b8 -s ours
Change-Id: I4502b45acbe9c6e23f13bb8f2279bb31e8550cd5
Bill Yi [Fri, 12 Aug 2016 09:39:34 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
cf9a807e7e -s ours
am:
d943567007 -s ours
Change-Id: I123efbf60e6b08e6eab6234ab5eeb8a5fc49e593
Bill Yi [Fri, 12 Aug 2016 09:34:32 +0000 (09:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d4640c213d -s ours
Change-Id: I5ee0e42879aaf09a93813de1d5cdb9e8c52734f2
Bill Yi [Fri, 12 Aug 2016 09:34:26 +0000 (09:34 +0000)]
Import translations. DO NOT MERGE
am:
62a3424ebb -s ours
Change-Id: Id431b60d75f6cd548b2b7595cc1d8b1032594571
Bill Yi [Fri, 12 Aug 2016 09:32:00 +0000 (09:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d97f049315 -s ours
Change-Id: I33e2836cf2560848cbb35d25df34757672960ac1
Bill Yi [Fri, 12 Aug 2016 09:31:58 +0000 (09:31 +0000)]
Import translations. DO NOT MERGE
am:
ab3feb2c95 -s ours
Change-Id: Ic1d0955c598c90d8d86a99d6dc19f7a12d476541
Bill Yi [Fri, 12 Aug 2016 09:31:55 +0000 (09:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
438c3cbffe -s ours
Change-Id: I1678c90c02ce16239aabcbf66aa3573d33ea1fca
Bill Yi [Fri, 12 Aug 2016 09:31:54 +0000 (09:31 +0000)]
Import translations. DO NOT MERGE
am:
cf9a807e7e -s ours
Change-Id: Ib6dd7fb5af9678f7e8bfc8ce55d4f34e9b7a7b59
TreeHugger Robot [Fri, 12 Aug 2016 09:25:27 +0000 (09:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 12 Aug 2016 09:24:37 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 09:24:19 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 07:26:31 +0000 (00:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib152ecb48817f123084dd0c776f3aa6393fc3f83
Auto-generated-cl: translation import
Bill Yi [Fri, 12 Aug 2016 07:13:54 +0000 (00:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27949ecc8590b8c00ddac9c45000e34c11205a29
Auto-generated-cl: translation import
Bill Yi [Fri, 12 Aug 2016 07:06:34 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I617474f76296482b1eade0ad6ed909b4c4fd25c7
Auto-generated-cl: translation import
Bill Yi [Fri, 12 Aug 2016 02:18:50 +0000 (19:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2adf619d5a27506386d4f59beda29537734437c1
Auto-generated-cl: translation import
Sanket Padawe [Fri, 12 Aug 2016 01:58:54 +0000 (01:58 +0000)]
Merge "Make data warning notification heads up." into nyc-mr1-dev am:
36879a9d82
am:
d475ebeed6
Change-Id: If058c53812ccda35b642876bb55eab2baad69c34
Sanket Padawe [Fri, 12 Aug 2016 01:58:50 +0000 (01:58 +0000)]
Make data warning notification heads up. am:
c015e1c63c
am:
73bcc6e0f3
Change-Id: I4331b1ee94d1f8e871aaebec874959c650d2d10c
Sanket Padawe [Fri, 12 Aug 2016 01:49:23 +0000 (01:49 +0000)]
Merge "Make data warning notification heads up." into nyc-mr1-dev
am:
36879a9d82
Change-Id: I8c5e00081e54134c61a5ca5fc9504e897f22f125
Sanket Padawe [Fri, 12 Aug 2016 01:49:21 +0000 (01:49 +0000)]
Make data warning notification heads up.
am:
c015e1c63c
Change-Id: I826fadc6fdda8707ec280b11379201f72b861362
Sanket Padawe [Fri, 12 Aug 2016 01:38:44 +0000 (01:38 +0000)]
Merge "Make data warning notification heads up." into nyc-mr1-dev
Chong Zhang [Fri, 12 Aug 2016 00:57:02 +0000 (00:57 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am:
305d610fd8
am:
74670684d4
Change-Id: I5480cd6b338a25e97712d94464bf6b03237cfff9
Andrii Kulian [Fri, 12 Aug 2016 00:56:58 +0000 (00:56 +0000)]
Allow to keep screen on only if window can be seen am:
b20addbdfb
am:
19353b45e5
Change-Id: Id0d729e59d156ec93a59031efa670642c1b70502
Chong Zhang [Fri, 12 Aug 2016 00:52:17 +0000 (00:52 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
am:
305d610fd8
Change-Id: Ib3d0beeed54a52b1185456b0c859859c61548d50
Andrii Kulian [Fri, 12 Aug 2016 00:52:14 +0000 (00:52 +0000)]
Allow to keep screen on only if window can be seen
am:
b20addbdfb
Change-Id: I09e12733e8073814f8d16c3d4025db8f042c2f25
Chong Zhang [Fri, 12 Aug 2016 00:42:56 +0000 (00:42 +0000)]
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
Chih-Hung Hsieh [Fri, 12 Aug 2016 00:40:25 +0000 (00:40 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master am:
ed935c32f4
am:
ef57a0d629
Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084
Chih-Hung Hsieh [Fri, 12 Aug 2016 00:31:29 +0000 (00:31 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
am:
ed935c32f4
Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
Ruben Brunk [Fri, 12 Aug 2016 00:16:40 +0000 (00:16 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev am:
f36d81038a
am:
fbde186842
Change-Id: Ia38c0e464c11fb71bec8793eed15017d6a33356d
Ruben Brunk [Fri, 12 Aug 2016 00:16:32 +0000 (00:16 +0000)]
Include tids in android.util.Process exceptions. am:
4c0c4df7cf
am:
f23fabf54e
Change-Id: I677f5eece0b8ea7c86541766eb6aa8c9f2b7ff94
Ruben Brunk [Fri, 12 Aug 2016 00:07:26 +0000 (00:07 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev
am:
f36d81038a
Change-Id: Ia3a3ab547f93158dbec22fa89939ec8939a3f6aa
Ruben Brunk [Fri, 12 Aug 2016 00:07:24 +0000 (00:07 +0000)]
Include tids in android.util.Process exceptions.
am:
4c0c4df7cf
Change-Id: Ic0950e41aaa767e00610a77a57145c4a1bac2c85
Ruben Brunk [Fri, 12 Aug 2016 00:00:35 +0000 (00:00 +0000)]
Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:48:46 +0000 (16:48 -0700)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
Sanket Padawe [Thu, 11 Aug 2016 23:34:10 +0000 (16:34 -0700)]
Make data warning notification heads up.
Bug:
30760683
Change-Id: Id3fed0a62936dddabcb169536a4a917d750259d7
Treehugger Robot [Thu, 11 Aug 2016 23:20:47 +0000 (23:20 +0000)]
Merge "Fix clang-tidy warnings in libs/hwui."
Jakub Pawlowski [Thu, 11 Aug 2016 23:11:19 +0000 (23:11 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master am:
5aa4ba3776
am:
84b61fb4b0
Change-Id: Id1dc84ba248e6d91bcab28f94b9c2b29dc16787d
Jakub Pawlowski [Thu, 11 Aug 2016 23:05:49 +0000 (23:05 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master
am:
5aa4ba3776
Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872
Jakub Pawlowski [Thu, 11 Aug 2016 22:53:06 +0000 (15:53 -0700)]
resolve merge conflicts of
5671277 to stage-aosp-master
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
Jakub Pawlowski [Thu, 11 Aug 2016 22:32:22 +0000 (22:32 +0000)]
Merge "Add LE Secure Connection data parsing (1/4)"
Jakub Pawlowski [Thu, 28 Jul 2016 12:21:36 +0000 (05:21 -0700)]
Add LE Secure Connection data parsing (1/4)
Bug:
30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
Amith Yamasani [Thu, 11 Aug 2016 21:19:53 +0000 (21:19 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev am:
792aaab77a
am:
c76f8c1b55
Change-Id: If18b8d2947a1bcddeda6f3cc7c74b8ce7ea536f5
Amith Yamasani [Thu, 11 Aug 2016 21:19:49 +0000 (21:19 +0000)]
Clean up when recycling a pid with a pending launch am:
d86e14e45c
am:
92de60bd7f
Change-Id: Iedb5153b37f8e240b545c97b99248a18e9f8613e
Wale Ogunwale [Thu, 11 Aug 2016 21:19:45 +0000 (21:19 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am:
efa21a9924
am:
70d32b3d22
Change-Id: I7b235a555e585900e7949f79757d7555e277270d
Wale Ogunwale [Thu, 11 Aug 2016 21:19:10 +0000 (21:19 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags am:
3c0d44e633
am:
5d132bf021
Change-Id: I637742001089d128a22762411b35b5973dd604ae
Chong Zhang [Thu, 11 Aug 2016 21:18:37 +0000 (21:18 +0000)]
Some fixes for transition animation selection am:
808621ca54
am:
3d2acc1ab6
Change-Id: I0158f63b4ad154aabe0a53a8b8030ab914f76c29
Amith Yamasani [Thu, 11 Aug 2016 21:06:23 +0000 (21:06 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
am:
792aaab77a
Change-Id: I908d6adb238d47b42f4c756e07ec1d0ac137f8d5
Amith Yamasani [Thu, 11 Aug 2016 21:05:51 +0000 (21:05 +0000)]
Clean up when recycling a pid with a pending launch
am:
d86e14e45c
Change-Id: If77af8cc8a0b9620c2fc5e4704c178667fc0703e
Wale Ogunwale [Thu, 11 Aug 2016 21:05:48 +0000 (21:05 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev
am:
efa21a9924
Change-Id: I540bf405007052af240d58a4e390cbbbda9011e8
Wale Ogunwale [Thu, 11 Aug 2016 21:05:45 +0000 (21:05 +0000)]
Clear WS.mDestroying on AWT.clearAnimatingFlags
am:
3c0d44e633
Change-Id: I7188dc89d20ee7d96f99e0116cef0eaa4b1bcc4e
Chong Zhang [Thu, 11 Aug 2016 21:05:17 +0000 (21:05 +0000)]
Some fixes for transition animation selection
am:
808621ca54
Change-Id: I9ded235ab5d8942ba66e4dbcb769169565eb4304
Phil Weaver [Thu, 11 Aug 2016 21:04:01 +0000 (21:04 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev am:
364580d20a
am:
f933858b07
Change-Id: I22e571503489cd6300a9f475a3faca58da528883
Phil Weaver [Thu, 11 Aug 2016 21:03:28 +0000 (21:03 +0000)]
Limit capabilities of a11y gesture dispatch. am:
a8918f23c7
am:
0e97bb6c1a
Change-Id: Ibb5b330e3ffe8530c6a506311146bc3597bd512b
Phil Weaver [Thu, 11 Aug 2016 21:03:22 +0000 (21:03 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev am:
aefa892035
am:
4e1d6f439a
Change-Id: Id2fbc3ae31e60d2940be6c9fbf01147f5d3d376d
Phil Weaver [Thu, 11 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Don't preserve a11y focus in hierarchy state. am:
f40ee509c6
am:
711d7260ba
Change-Id: I7b2f1b2955c279f21f8f7a5ffc7b615ddaa50ff5
Chong Zhang [Thu, 11 Aug 2016 20:55:17 +0000 (20:55 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev am:
b1dfc3e7e1
am:
c88f140ee4
Change-Id: I7889b6239c319d5f5d456c383e659b56796376e5
Chong Zhang [Thu, 11 Aug 2016 20:55:12 +0000 (20:55 +0000)]
Dump out last real used app transit type am:
60091a978f
am:
3d2bf37da1
Change-Id: Ia31640768df6a5fb05efaa4307066e7dd8c461af
Phil Weaver [Thu, 11 Aug 2016 20:53:47 +0000 (20:53 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev
am:
364580d20a
Change-Id: I84aef92197ee41a92351a32df7326fd91801e8f3
Phil Weaver [Thu, 11 Aug 2016 20:53:44 +0000 (20:53 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
a8918f23c7
Change-Id: I8c14c8b8ada7e7c53b17be2df63c14c4e0e10c83
Phil Weaver [Thu, 11 Aug 2016 20:53:40 +0000 (20:53 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev
am:
aefa892035
Change-Id: Ic2403a6e01ee7e35bc364b2f8fec5f4fcc37a24f
Phil Weaver [Thu, 11 Aug 2016 20:53:37 +0000 (20:53 +0000)]
Don't preserve a11y focus in hierarchy state.
am:
f40ee509c6
Change-Id: I14ba7354058eef6942286483b3f61ea0404135ea
Amith Yamasani [Thu, 11 Aug 2016 20:48:26 +0000 (20:48 +0000)]
Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
Wale Ogunwale [Thu, 11 Aug 2016 20:43:26 +0000 (20:43 +0000)]
Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev
* changes:
Clear WS.mDestroying on AWT.clearAnimatingFlags
Some fixes for transition animation selection
Chong Zhang [Thu, 11 Aug 2016 20:43:28 +0000 (20:43 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev
am:
b1dfc3e7e1
Change-Id: Iaab588bf3527920b754a2b8815d3d99ba3ce5cf7
Chong Zhang [Thu, 11 Aug 2016 20:43:27 +0000 (20:43 +0000)]
Dump out last real used app transit type
am:
60091a978f
Change-Id: Iafeb1d21ab90c9ea124bfb6911abc1ad9165895d
Chris Tate [Thu, 11 Aug 2016 20:35:48 +0000 (20:35 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev am:
dd59a27f2e
am:
949afd5eaf
Change-Id: I25f687dc7d87efd1da1bac45722b5581b0fe0683
Christopher Tate [Thu, 11 Aug 2016 20:35:43 +0000 (20:35 +0000)]
Check system & lock wallpaper backup eligibility independently am:
6172266154
am:
611afaf4ae
Change-Id: I5d8361f2854647fae86847828d58154af06618c8
Phil Weaver [Thu, 11 Aug 2016 20:35:11 +0000 (20:35 +0000)]
Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev
Phil Weaver [Thu, 11 Aug 2016 20:34:41 +0000 (20:34 +0000)]
Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev
TreeHugger Robot [Thu, 11 Aug 2016 20:29:41 +0000 (20:29 +0000)]
Merge "Dump out last real used app transit type" into nyc-mr1-dev
Chris Tate [Thu, 11 Aug 2016 20:28:48 +0000 (20:28 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev
am:
dd59a27f2e
Change-Id: I9b1f2951d80832182afb11e87a9e56acb80a302b
Christopher Tate [Thu, 11 Aug 2016 20:28:44 +0000 (20:28 +0000)]
Check system & lock wallpaper backup eligibility independently
am:
6172266154
Change-Id: I1bfe06d10c1a68b23d4ba8cb4648099f482a22e5
Chris Tate [Thu, 11 Aug 2016 20:20:08 +0000 (20:20 +0000)]
Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev
Tyler Gunn [Thu, 11 Aug 2016 20:13:51 +0000 (13:13 -0700)]
Add ImsReason codes and DisconnectCauses for data disconnects.
Adding reason code and disconnect causes for:
1. disconnects due to user disabling data.
2. disconnects due to data limit being reached.
Bug:
30702393
Change-Id: Id6ea5ee4f5aac1a8602094315f893e2f7b3cc8d6
Esteban Talavera [Thu, 11 Aug 2016 19:00:40 +0000 (19:00 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev am:
fd97e7bc8c
am:
5c96b0d1ab
Change-Id: Idbb8416e0f3e20e57568a5e3d0f2cb7a202f7742
Esteban Talavera [Thu, 11 Aug 2016 19:00:37 +0000 (19:00 +0000)]
Do not toggle OEM unlock if bootloader unlocked am:
c48b20f8f1
am:
83583bd596
Change-Id: Ib8293a02ca13587154133a939c4515de1a114bd9
Esteban Talavera [Thu, 11 Aug 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev
am:
fd97e7bc8c
Change-Id: I383fd638d92e62a1a83d91c2088b78c6fd4bba3f
Esteban Talavera [Thu, 11 Aug 2016 18:54:14 +0000 (18:54 +0000)]
Do not toggle OEM unlock if bootloader unlocked
am:
c48b20f8f1
Change-Id: Ic42a52cc9d71aa1192de0a052efb23a625673232
TreeHugger Robot [Thu, 11 Aug 2016 18:45:25 +0000 (18:45 +0000)]
Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev
Christopher Tate [Wed, 10 Aug 2016 23:13:14 +0000 (16:13 -0700)]
Check system & lock wallpaper backup eligibility independently
Bug
30751829
Change-Id: Ic94689dd63238449222d1aea07231d9fd29fc76d
John Reck [Thu, 11 Aug 2016 17:43:14 +0000 (10:43 -0700)]
Fix NPE in TextureView
Bug:
30779663
Change-Id: Ib3d40b60674ab3de8bfcfdd8489b89cf07b8d8b3
Android Build Merger (Role) [Thu, 11 Aug 2016 17:40:10 +0000 (17:40 +0000)]
Merge "Merge "Use colorAccent for profile_button." into nyc-mr1-dev am:
f679329412 am:
099d69999f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 11 Aug 2016 17:39:59 +0000 (17:39 +0000)]
Merge "Use colorAccent for profile_button. am:
ae01c57cb5 am:
d4c31c0649" into nyc-mr1-dev-plus-aosp
Andrew Sapperstein [Thu, 11 Aug 2016 17:39:28 +0000 (17:39 +0000)]
Merge "Use colorAccent for profile_button." into nyc-mr1-dev am:
f679329412
am:
099d69999f
Change-Id: Ia99ba941445e18a9eaf085d01a8bc72064a8919b
OSDN Git Service
