Muyuan Li
|
38a4c8ade8
|
update navbar assets for sw900dp device. am: b3152ab966
am: dd804d6b3a
Change-Id: Ia6a13f26bee3341482bad0606afd670ca89d0cc3
|
2017-01-14 00:37:01 +00:00 |
|
Chris Craik
|
ffed3de159
|
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev am: 4638ef17d5
am: f56832a949
Change-Id: I0dd2a5226276dc74addf01d683d2a64cb55fa9a4
|
2017-01-14 00:36:02 +00:00 |
|
Chris Craik
|
2553b92c0c
|
Support shadows and reordering in ViewOverlay am: 36d9a6dfba
am: 2369a6d753
Change-Id: I1f6574a4b9a1d24ccd4fc78cbc7e3368d815f8f5
|
2017-01-14 00:35:02 +00:00 |
|
Andrew Scull
|
74ebc576b4
|
Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: eadd29ffa6" into nyc-mr2-dev-plus-aosp
am: e688b70eb2
Change-Id: I48bfc9548432bdf41021d956617b1b37cc3c46ff
|
2017-01-14 00:33:43 +00:00 |
|
Andrew Scull
|
8e94c7b397
|
Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: eadd29ffa6
am: 833bed16ba
Change-Id: I67c391cd59f53682267b98a4db961cc9f9cf08fa
|
2017-01-14 00:33:31 +00:00 |
|
Andrew Scull
|
7b2b3ad337
|
Merge "resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 9af145dcc4" into nyc-mr2-dev-plus-aosp
am: 6d85c8a833
Change-Id: I39820d0ae4d6f7b9c04451bb0969976004e6f133
|
2017-01-14 00:31:59 +00:00 |
|
Andrew Scull
|
5b2a939d01
|
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 9af145dcc4
am: 4c349b67aa
Change-Id: I4718d7e2c73a5f84ca43789a09db5f3ab9a6b5d6
|
2017-01-14 00:31:51 +00:00 |
|
Andrew Scull
|
3ff37effcf
|
Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: 32992b4049" into nyc-mr2-dev-plus-aosp
am: c697ffe98b
Change-Id: I79d4ec95100e09eb6225cbfe900bceb357ee6b71
|
2017-01-14 00:30:22 +00:00 |
|
Andrew Scull
|
a78e32c324
|
Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: 32992b4049
am: bc94427593
Change-Id: I7e3cc5845ddafa4299f3bec1c2d40c05a66ffa99
|
2017-01-14 00:30:15 +00:00 |
|
Andrew Scull
|
1232590006
|
Merge "resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 3c9b36482f" into nyc-mr2-dev-plus-aosp
am: 0877a45f02
Change-Id: I8b4a708f5204346e791f5450bfaa4501afa3704b
|
2017-01-14 00:28:46 +00:00 |
|
Andrew Scull
|
c4347a5450
|
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 3c9b36482f
am: 8203155664 -s ours
Change-Id: I920c10e52faef95e0d3d55e075fdc85610b358c0
|
2017-01-14 00:28:39 +00:00 |
|
Zak Cohen
|
9013325c3a
|
Merge changes from topic 'vrmode'
* changes:
Set ui mode in UiModeManagerService to vrheadset when VR mode is enabled.
Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.
|
2017-01-13 23:15:00 +00:00 |
|
Muyuan Li
|
dd804d6b3a
|
update navbar assets for sw900dp device.
am: b3152ab966
Change-Id: I79b810a896ae17423b5fa36cac27a1933f2e758b
|
2017-01-13 22:11:14 +00:00 |
|
Chris Craik
|
f56832a949
|
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
am: 4638ef17d5
Change-Id: I240d4b7397d06d3994fd17f4e3694ceef58c16f3
|
2017-01-13 22:07:52 +00:00 |
|
Chris Craik
|
2369a6d753
|
Support shadows and reordering in ViewOverlay
am: 36d9a6dfba
Change-Id: I1e7c33d68b5e2350b8b0ac589c46fdc250424b1a
|
2017-01-13 22:07:43 +00:00 |
|
Roger Xue
|
e446c98bd1
|
Merge "move PreferenceController into settingLib/core"
|
2017-01-13 21:59:15 +00:00 |
|
Chris Craik
|
4638ef17d5
|
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
|
2017-01-13 21:46:55 +00:00 |
|
Philip P. Moltmann
|
ed2aca84e7
|
Merge changes from topic 'am-72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
am: 7dfd0b9843
Change-Id: I8a7ab11326864e25a993c4e4daecc3c280adf1a2
|
2017-01-13 21:45:55 +00:00 |
|
Philip P. Moltmann
|
4465e36ef9
|
Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4 am: 0dfa7b58b8
am: af5875d1be
Change-Id: Ia85f754316e9f003dfffdfb17efa8622d49068f2
|
2017-01-13 21:45:49 +00:00 |
|
Philip P. Moltmann
|
320991457d
|
Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e -s ours am: 2288ee6b01
am: 44ee186c79
Change-Id: I81498bb620cd0a2c3bfac8654d5536ed38ba4d4b
|
2017-01-13 21:44:50 +00:00 |
|
Joachim Sauer
|
3b4abbd4df
|
Merge "Add java.time APIs." am: 0938b22c0a am: d05e19954b am: 88002e8e38
am: b26cc7f971
Change-Id: Ib52d788a1787fa3689c14135673de044e2a7c989
|
2017-01-13 21:41:52 +00:00 |
|
Erik Kline
|
7ee5fe36b7
|
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am: caf62d305e am: a94e66868c am: 21a148550d
am: c8c42637d9
Change-Id: Ia6a834e00d3f681dd7558d096f157f1c8f279bea
|
2017-01-13 21:40:47 +00:00 |
|
Erik Kline
|
901ba07eed
|
Move explicit mobile request handling into UpstreamNetworkMonitor am: fdd4111ef6 am: 7340e272c3 am: ca6d265bbe
am: 930ff60ca8
Change-Id: I307f0c83c09dd5962bd4b6e929083aff9f6f6f05
|
2017-01-13 21:39:45 +00:00 |
|
Chen Xu
|
66d2aa05d5
|
Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e am: c90dc2072c
am: 10839091d9
Change-Id: I2a09577e0912c1d6ff324f0471b4a2012656749a
|
2017-01-13 21:38:45 +00:00 |
|
Philip P. Moltmann
|
e9bb5137e0
|
Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4 am: 764a7901e6
am: 1156bf1dc1
Change-Id: I4559bb240589f523ab035c42b09be2bf17fbe599
|
2017-01-13 21:37:36 +00:00 |
|
Philip P. Moltmann
|
aa288c1049
|
Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e am: 0aa5138861 -s ours
am: 6a1dcd17e4
Change-Id: Iffc426e95d47559bf1a01e0cf4b9c5c0f160d33b
|
2017-01-13 21:36:33 +00:00 |
|
Justin Klaassen
|
3a6605cbf6
|
Merge "Add support for carrier demo mode" into nyc-mr2-dev am: 482ba6b831
am: 84d0b9ea6b
Change-Id: I52df2e1fd79db3b324406215c4d6b32dc832f2cd
|
2017-01-13 21:34:59 +00:00 |
|
Justin Klaassen
|
de17548f76
|
Add support for carrier demo mode am: b632c55469
am: b4be8c8df1 -s ours
Change-Id: Ief253b88502ec5bd2092e4d20956a3098202cec6
|
2017-01-13 21:33:45 +00:00 |
|
Rob Carr
|
1ce0793ab4
|
Merge "Expose SurfaceControl method to screenshot to GraphicBuffer."
|
2017-01-13 21:29:09 +00:00 |
|
Android Build Merger (Role)
|
e688b70eb2
|
Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: eadd29ffa6" into nyc-mr2-dev-plus-aosp
|
2017-01-13 21:27:24 +00:00 |
|
Andrew Scull
|
833bed16ba
|
Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd
am: eadd29ffa6
Change-Id: I1147b961e3413d845b4b95e7f2b0c2f6cd10dd65
|
2017-01-13 21:26:45 +00:00 |
|
Android Build Merger (Role)
|
6d85c8a833
|
Merge "resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 9af145dcc4" into nyc-mr2-dev-plus-aosp
|
2017-01-13 21:26:28 +00:00 |
|
Andrew Scull
|
4c349b67aa
|
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1
am: 9af145dcc4
Change-Id: I15cb7dbf619355f22f27e81aa1465683bac7e619
|
2017-01-13 21:25:50 +00:00 |
|
Android Build Merger (Role)
|
c697ffe98b
|
Merge "Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd am: 32992b4049" into nyc-mr2-dev-plus-aosp
|
2017-01-13 21:24:58 +00:00 |
|
Andrew Scull
|
bc94427593
|
Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c am: b2db3761cd
am: 32992b4049
Change-Id: I2acaf1bd0a03e04611ec29cd9afd04e130e832d0
|
2017-01-13 21:24:22 +00:00 |
|
Android Build Merger (Role)
|
0877a45f02
|
Merge "resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 3c9b36482f" into nyc-mr2-dev-plus-aosp
|
2017-01-13 21:24:07 +00:00 |
|
Andrew Scull
|
8203155664
|
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1
am: 3c9b36482f
Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13
|
2017-01-13 21:23:27 +00:00 |
|
Android Build Merger (Role)
|
7dfd0b9843
|
Merge changes from topic 'am-72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
* changes:
Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4 am: 0dfa7b58b8
Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e -s ours am: 2288ee6b01
|
2017-01-13 21:23:09 +00:00 |
|
Philip P. Moltmann
|
af5875d1be
|
Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4
am: 0dfa7b58b8
Change-Id: I64d9e83dbabdf1f3f3574cea135488cb86d4a2c1
|
2017-01-13 21:22:16 +00:00 |
|
Philip P. Moltmann
|
44ee186c79
|
Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e -s ours
am: 2288ee6b01
Change-Id: Idcd4200ad47c5fd7d007b2a717941cec5db08595
|
2017-01-13 21:21:11 +00:00 |
|
Joachim Sauer
|
b26cc7f971
|
Merge "Add java.time APIs." am: 0938b22c0a am: d05e19954b
am: 88002e8e38
Change-Id: I82a83e52e96bff1b43ca8bca7afe9b32877c3ecb
|
2017-01-13 21:19:56 +00:00 |
|
Erik Kline
|
c8c42637d9
|
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am: caf62d305e am: a94e66868c
am: 21a148550d
Change-Id: I04b03ff7cee505e8322320ec3d0ee10e6dbf2b09
|
2017-01-13 21:17:39 +00:00 |
|
Andrew Scull
|
32992b4049
|
Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c
am: b2db3761cd
Change-Id: I166a09f1b41c32bb69e2859ef262b9d46996ac87
|
2017-01-13 21:17:23 +00:00 |
|
Erik Kline
|
930ff60ca8
|
Move explicit mobile request handling into UpstreamNetworkMonitor am: fdd4111ef6 am: 7340e272c3
am: ca6d265bbe
Change-Id: Ia761aeaa897538666cc690aac61092f38bb9b425
|
2017-01-13 21:16:46 +00:00 |
|
Andrew Scull
|
3c9b36482f
|
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969
am: 3aac3ebee1
Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
|
2017-01-13 21:16:31 +00:00 |
|
Chen Xu
|
10839091d9
|
Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e
am: c90dc2072c
Change-Id: Ie694f05799bfeb123c7d12477855237444dff415
|
2017-01-13 21:15:55 +00:00 |
|
Philip P. Moltmann
|
0dfa7b58b8
|
Do not write if apply() did not change the file. am: 1f99f81bdc
am: 331a4bb8d4
Change-Id: If200192c12477a4410b0b358e6c7b430c23d1499
|
2017-01-13 21:15:18 +00:00 |
|
Philip P. Moltmann
|
1156bf1dc1
|
Do not write if apply() did not change the file. am: 1f99f81bdc am: 331a4bb8d4
am: 764a7901e6
Change-Id: I845318f60eadb6c31f9795024cf10df33a15dc20
|
2017-01-13 21:14:41 +00:00 |
|
Philip P. Moltmann
|
2288ee6b01
|
Only persist last Shared Preferences state am: d15c4f1da5
am: 889a420a9e -s ours
Change-Id: I1e440bdfc8d12f30eb6db95b365c15b66479d95d
|
2017-01-13 21:14:17 +00:00 |
|
Philip P. Moltmann
|
6a1dcd17e4
|
Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e
am: 0aa5138861 -s ours
Change-Id: Ide515ec901a5a85c3ef04bc6cff172464144877d
|
2017-01-13 21:13:46 +00:00 |
|