Nick Kralevich
7bdcbd8bfc
am a508d399: am 01e00c8c: am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev
...
* commit 'a508d399e720b3a535832ce0b2554680197944af':
UsbDeviceManager: fix b/21429947 regression
2015-07-24 05:11:28 +00:00
Chris Wren
26ed7e6dfa
am 3a66153f: am 99547e49: am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
...
* commit '3a66153f2a8185d0a4ca0de23c70cd81178e0eea':
Don't crash sysui when advisory calls fail.
2015-07-24 05:11:16 +00:00
Tim Kilbourn
96f346cf14
am 865ecdb4: am d8f08d65: am cd03be66: am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
...
* commit '865ecdb4d2129ad8c3037caf2b9a92d52d8d3bc9':
Miss USB device Interface from UsbManager.getDeviceList().
2015-07-24 05:11:06 +00:00
Alan Viverette
1b4acc8389
am 444883e9: am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
...
* commit '444883e9a1b7c38f11d631601a857da78f0b9bfa':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
2015-07-24 05:10:58 +00:00
Fyodor Kupolov
21574a240b
am aa32a0b5: am 5192e4b2: am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev
...
* commit 'aa32a0b5c6f87fe92ef0b1980b86e3612400db54':
Added a note about location permission
2015-07-24 05:10:41 +00:00
xin He
ebc30c04b0
am 261b6942: am b76cc910: am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
...
* commit '261b69429493943ee99730966701f9b483d9bcb9':
Angler Should Not Use Channel 11 for SoftAP
2015-07-24 05:10:32 +00:00
Jeff Sharkey
5b98249e67
am 5080e90a: am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
...
* commit '5080e90a62445f3ddf2dcff4adabe2d251d25932':
More info to support CTS, fix reconcile bug.
2015-07-24 05:10:15 +00:00
Jason Monk
180dff0bae
am bb8b0368: am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
...
* commit 'bb8b0368c5b4ddf5cbf3cb5c0c9bbe9027bc617b':
Add metrics to tuner
Move tuner enable point to QS
2015-07-24 05:10:01 +00:00
Jorim Jaggi
1997eb104d
am b3544372: am 929a82c8: am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped
...
* commit 'b3544372ba519f96b37f77b3d986d7db1312f975':
Partially fix that beginning of animation is skipped
2015-07-24 05:09:53 +00:00
Dianne Hackborn
96cc2b3050
am 1d8b0a29: am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630 : Ensure SMS/Call delivery during Doze" into mnc-dev
...
* commit '1d8b0a29ab369cac21d9f3a643244dc8c6dec0c8':
Fix issue #22612630 : Ensure SMS/Call delivery during Doze
2015-07-24 05:09:39 +00:00
Nick Kralevich
a508d399e7
am 01e00c8c: am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev
...
* commit '01e00c8ce01c9c9242843b3bc6cec52ad9d89dd2':
UsbDeviceManager: fix b/21429947 regression
2015-07-24 04:02:23 +00:00
Chris Wren
3a66153f2a
am 99547e49: am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
...
* commit '99547e494a832d2b9d87ce13573150495e6ba3f8':
Don't crash sysui when advisory calls fail.
2015-07-24 04:02:17 +00:00
Tim Kilbourn
865ecdb4d2
am d8f08d65: am cd03be66: am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
...
* commit 'd8f08d651f78ca0a66b123ce16250c390c105e07':
Miss USB device Interface from UsbManager.getDeviceList().
2015-07-24 04:02:10 +00:00
Alan Viverette
444883e9a1
am 35b1674a: am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
...
* commit '35b1674a24354421701856a9c7b89abb008c911f':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
2015-07-24 04:02:04 +00:00
Fyodor Kupolov
aa32a0b5c6
am 5192e4b2: am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev
...
* commit '5192e4b2c05bb684454c5cc0fc8c80c2e7c72f08':
Added a note about location permission
2015-07-24 04:01:58 +00:00
xin He
261b694294
am b76cc910: am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
...
* commit 'b76cc9105d8dd42157f4c32d34d846e7425fa701':
Angler Should Not Use Channel 11 for SoftAP
2015-07-24 04:01:52 +00:00
Jeff Sharkey
5080e90a62
am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
...
* commit 'aebcf3b7efadca1fb5eedbf2cf9f0895d93ba8e8':
More info to support CTS, fix reconcile bug.
2015-07-24 04:01:46 +00:00
Jason Monk
bb8b0368c5
am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
...
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
Add metrics to tuner
Move tuner enable point to QS
2015-07-24 04:01:38 +00:00
Jorim Jaggi
b3544372ba
am 929a82c8: am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped
...
* commit '929a82c81fe778319f04b03e73328724528c8521':
Partially fix that beginning of animation is skipped
2015-07-24 04:01:30 +00:00
Dianne Hackborn
1d8b0a29ab
am 14aca8e8: am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630 : Ensure SMS/Call delivery during Doze" into mnc-dev
...
* commit '14aca8e87a3dc6e8fa783b3c45718a81f9f5e67a':
Fix issue #22612630 : Ensure SMS/Call delivery during Doze
2015-07-24 04:01:24 +00:00
Nick Kralevich
01e00c8ce0
am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev
...
* commit 'e4f10de7d2170b319dc987c1cd4e2ad3c464ead9':
UsbDeviceManager: fix b/21429947 regression
2015-07-24 03:35:19 +00:00
Chris Wren
99547e494a
am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
...
* commit 'b86df334f778eecbf4beaaa9127e7e523e55fb6c':
Don't crash sysui when advisory calls fail.
2015-07-24 03:35:13 +00:00
Tim Kilbourn
d8f08d651f
am cd03be66: am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
...
* commit 'cd03be66e86d43ac64e487826b27e9c2c9a5b634':
Miss USB device Interface from UsbManager.getDeviceList().
2015-07-24 03:35:07 +00:00
Alan Viverette
35b1674a24
am 9b4917a6: am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
...
* commit '9b4917a6f8ccd3a9faac08859d263f58e33f6357':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
2015-07-24 03:35:00 +00:00
Fyodor Kupolov
5192e4b2c0
am 030f2735: am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev
...
* commit '030f273550eb0f0f53c43c3852d40433a0315649':
Added a note about location permission
2015-07-24 03:34:53 +00:00
xin He
b76cc9105d
am 4a4e0647: am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
...
* commit '4a4e06477b9af816c15c2a212f028053285df5ef':
Angler Should Not Use Channel 11 for SoftAP
2015-07-24 03:34:47 +00:00
Jeff Sharkey
aebcf3b7ef
am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
...
* commit '23fdb6355ee4cc1230d88447d3925f2b504e4f4e':
More info to support CTS, fix reconcile bug.
2015-07-24 03:34:41 +00:00
Jason Monk
dea13a9623
am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
...
* commit 'c063146fb2de35908183a52b2ff50934ad40c653':
Add metrics to tuner
Move tuner enable point to QS
2015-07-24 03:34:32 +00:00
Jorim Jaggi
929a82c81f
am a0d142d9: am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped
...
* commit 'a0d142d9425e542b58721cbfcf7a032e7c503521':
Partially fix that beginning of animation is skipped
2015-07-24 03:34:25 +00:00
Dianne Hackborn
14aca8e87a
am 63ff4a77: am 419f2177: am 6f64e737: Merge "Fix issue #22612630 : Ensure SMS/Call delivery during Doze" into mnc-dev
...
* commit '63ff4a77f35d578f2c543cefeb0e6175365c60bb':
Fix issue #22612630 : Ensure SMS/Call delivery during Doze
2015-07-24 03:34:19 +00:00
Nick Kralevich
e4f10de7d2
am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev
...
* commit 'dd856a3f0df6e076b815ae208f000e28de235353':
UsbDeviceManager: fix b/21429947 regression
2015-07-24 03:06:14 +00:00
Chris Wren
b86df334f7
am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
...
* commit 'e6deaca693c530f7cc3298efc2c53849b9e6cd01':
Don't crash sysui when advisory calls fail.
2015-07-24 03:06:09 +00:00
Tim Kilbourn
cd03be66e8
am ad49498e: am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev
...
* commit 'ad49498e91883099ffda2155e96ebaf495ba579a':
Miss USB device Interface from UsbManager.getDeviceList().
2015-07-24 03:06:04 +00:00
Alan Viverette
9b4917a6f8
am be01800d: am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev
...
* commit 'be01800d76ac786a4617e1cecac71c297acf23e4':
Fix handling of RelativeLayout measurement using UNSPECIFIED spec
2015-07-24 03:05:58 +00:00
Fyodor Kupolov
030f273550
am 2a37b2ff: am 5ef70b02: Merge "Added a note about location permission" into mnc-dev
...
* commit '2a37b2fff27c67454a59048c286b2a7e6329eb07':
Added a note about location permission
2015-07-24 03:05:53 +00:00
xin He
4a4e06477b
am 13bb6812: am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev
...
* commit '13bb68122fae6cded11e576c41a81cd2baffb3f7':
Angler Should Not Use Channel 11 for SoftAP
2015-07-24 03:05:47 +00:00
Jeff Sharkey
23fdb6355e
am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
...
* commit 'e87dc6dba58e55c60f387a86468a57a5109a97ac':
More info to support CTS, fix reconcile bug.
2015-07-24 03:05:42 +00:00
Jason Monk
c063146fb2
am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
...
* commit '72548325019cc168a5d98fe7de93dc9ee679a4b7':
Add metrics to tuner
Move tuner enable point to QS
2015-07-24 03:05:33 +00:00
Jorim Jaggi
a0d142d942
am 5091ca9c: am ac73f1ef: Partially fix that beginning of animation is skipped
...
* commit '5091ca9c825c32336ce42d7b70eef323ddb9cb3c':
Partially fix that beginning of animation is skipped
2015-07-24 03:05:28 +00:00
Dianne Hackborn
63ff4a77f3
am 419f2177: am 6f64e737: Merge "Fix issue #22612630 : Ensure SMS/Call delivery during Doze" into mnc-dev
...
* commit '419f2177c8565f80489d00463aea630568251f4d':
Fix issue #22612630 : Ensure SMS/Call delivery during Doze
2015-07-24 03:05:22 +00:00
Steve McKay
30e743b607
Merge "Grid item fixups."
2015-07-24 01:44:11 +00:00
Steve McKay
d13f3c9742
Grid item fixups.
...
Use margin instead of padding (so clicks on empty space don't do unexpected things).
Make background of items white.
Change-Id: I98996c90276911535b7addad1aad4a3c9ca47156
2015-07-23 18:39:54 -07:00
Ying Wang
155f22692a
am 82826fa8: am 802da28f: am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
...
* commit '82826fa884b3eb4090ba0502dce9787c13ea8040':
Add phony source target in the generated dependency file of aidl.
2015-07-24 01:26:11 +00:00
Ying Wang
82826fa884
am 802da28f: am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
...
* commit '802da28f22f2869c810531b95ac90f7fa446df93':
Add phony source target in the generated dependency file of aidl.
2015-07-24 01:11:06 +00:00
Ying Wang
802da28f22
am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."
...
* commit '430c8c3e48b361f75d29d05b8fda3aac22ceb1f9':
Add phony source target in the generated dependency file of aidl.
2015-07-24 00:54:53 +00:00
Jun Mukai
9f5c66c6b3
Merge "Allow sticky immersive mode by mouse hover."
2015-07-24 00:43:21 +00:00
Ying Wang
430c8c3e48
Merge "Add phony source target in the generated dependency file of aidl."
2015-07-24 00:38:08 +00:00
David Stevens
6323fff7df
Merge "Add cmd to reset default component enabled setting"
2015-07-23 23:50:52 +00:00
Steve McKay
1bfa249e1f
Merge "Allow Files app to be enabled via overlay."
2015-07-23 23:43:48 +00:00
David Stevens
f6ec60dd1e
Add cmd to reset default component enabled setting
...
Change-Id: Ice5e366643bb5c536b579089dcc98e06c9bb5645
2015-07-23 16:42:29 -07:00