Android Build Merger (Role)
dcf46a89cf
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp am: 5fc76d5a89"
2017-07-06 17:31:17 +00:00
Android Build Merger (Role)
587eafe5d8
Merge "Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp am: 5fc76d5a89"
2017-07-06 17:31:02 +00:00
Daniel Nishi
9a3388a998
Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
...
am: 5fc76d5a89
Change-Id: Iae43593a56ce435759739ce16769fcbc3940ced4
2017-07-06 17:29:49 +00:00
Daniel Nishi
59e68a47e1
Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
...
am: 5fc76d5a89
Change-Id: Ief44b840ccc0d2c9fbc3b0771950f2dbc6aefbf1
2017-07-06 17:29:39 +00:00
Android Build Merger (Role)
363a3374b8
Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db
am: a223ee4890"
2017-07-06 17:29:11 +00:00
Daniel Nishi
43433c2df0
Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db
...
am: a223ee4890
Change-Id: Iab9d00ff5ae668aff8475c4134bab8caeac7e651
2017-07-06 17:27:16 +00:00
Daniel Nishi
842bcf5081
Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db
...
am: a223ee4890
Change-Id: I4a4dbe87c52a2c53abd2489143d9183c72d2c4cf
2017-07-06 17:27:05 +00:00
Android Build Merger (Role)
5fc76d5a89
Merge "Merge "Unify storage calculations." into oc-dr1-dev am: 947cb367db" into oc-dr1-dev-plus-aosp
2017-07-06 17:18:56 +00:00
Daniel Nishi
3c365e732e
Merge "Unify storage calculations." into oc-dr1-dev
...
am: 947cb367db
Change-Id: Ia5e4650eb1922e59ee1e95b04df7377668f0538a
2017-07-06 17:17:27 +00:00
Daniel Nishi
a223ee4890
Merge "Unify storage calculations." into oc-dr1-dev
...
am: 947cb367db
Change-Id: I3923a04104b949281e487b0b8fc5a55601536e93
2017-07-06 17:15:40 +00:00
Daniel Nishi
947cb367db
Merge "Unify storage calculations." into oc-dr1-dev
2017-07-06 17:04:53 +00:00
Android Build Merger (Role)
08da5d84c0
Merge "Merge "Render enhanced battery projection curves." into oc-dr1-dev am: 32812e6121
am: d69f7cddb6"
2017-07-06 14:11:12 +00:00
Alex Kulesza
f85fcb9fe5
Merge "Render enhanced battery projection curves." into oc-dr1-dev am: 32812e6121
...
am: d69f7cddb6
Change-Id: Ib9a4b036a4e94d5bdbb0abf7ae1f78f03120351e
2017-07-06 14:10:49 +00:00
Alex Kulesza
7ef10c410b
Merge "Render enhanced battery projection curves." into oc-dr1-dev am: 32812e6121
...
am: d69f7cddb6
Change-Id: Id226cd9d3c2ea5bbbbc1dcedfbd273938ac477ef
2017-07-06 14:10:06 +00:00
Alex Kulesza
d69f7cddb6
Merge "Render enhanced battery projection curves." into oc-dr1-dev
...
am: 32812e6121
Change-Id: I9ad8579fd76516b2c3ab89571b20ac2b28a2d161
2017-07-06 14:07:47 +00:00
Alex Kulesza
32812e6121
Merge "Render enhanced battery projection curves." into oc-dr1-dev
2017-07-06 14:02:26 +00:00
Philipp Weiß
7072a82a3e
Merge "When Remove Account is disallowed, show dialog"
2017-07-06 08:08:43 +00:00
Android Build Merger (Role)
3c5a53752a
Merge "Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf" into oc-dr1-dev-plus-aosp am: 27f1eedd19"
2017-07-06 06:40:46 +00:00
Lorenzo Colitti
92efc7b861
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf" into oc-dr1-dev-plus-aosp
...
am: 27f1eedd19
Change-Id: Id63799878efd885b16319abc7d9290d10dcab7ea
2017-07-06 06:40:31 +00:00
Android Build Merger (Role)
3771b93597
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
am: 413d0ac41e"
2017-07-06 06:40:27 +00:00
Lorenzo Colitti
8919fc1a09
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
...
am: 413d0ac41e
Change-Id: Ia521baee61838cde773c38e2fe0ee03954a62a20
2017-07-06 06:37:29 +00:00
Lorenzo Colitti
ad25a47e92
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
...
am: 413d0ac41e
Change-Id: I1521f1a914b7d8514d9eb976f56d5b856caa2a83
2017-07-06 06:36:46 +00:00
Android Build Merger (Role)
27f1eedd19
Merge "Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf" into oc-dr1-dev-plus-aosp
2017-07-06 06:33:29 +00:00
Lorenzo Colitti
11c2ea3a96
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
...
am: dcc15eabdf
Change-Id: I3e5eb9cbcd7cdee2f0ee28579fc8f9d707b8e471
2017-07-06 06:30:32 +00:00
Lorenzo Colitti
413d0ac41e
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
...
am: dcc15eabdf
Change-Id: I28e2de31fafa533e35655a2d5f2ec9b1e3554eee
2017-07-06 06:30:31 +00:00
TreeHugger Robot
dcc15eabdf
Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
2017-07-06 06:13:55 +00:00
Daniel Sheng
c059710378
Removed camera lift gesture settings UI. am: 9a16e473ab
...
am: 89efcf0c0b
-s ours
Change-Id: I75ac1a917b9c198cde18cdc704c76c6723f59471
2017-07-06 05:41:17 +00:00
Daniel Sheng
89efcf0c0b
Removed camera lift gesture settings UI.
...
am: 9a16e473ab
Change-Id: I7fe06ff066878b725be5a8ac6132ee9fa9ff3a81
2017-07-06 05:39:34 +00:00
Daniel Sheng
720dd1ec61
Merge "Added suggestions for gestures." into oc-dr1-dev am: f8e0963f78
...
am: 34887c8355
-s ours
Change-Id: I691786771b1ba32d6b804534880e65559431c168
2017-07-06 03:37:56 +00:00
Android Build Merger (Role)
45877c9952
Merge "Merge "Bluetooth: Use string in remote device summary am: 04f5967c95" into oc-dr1-dev-plus-aosp am: 05be6e07d9"
2017-07-06 03:35:43 +00:00
Jack He
8c744c3ec0
Merge "Bluetooth: Use string in remote device summary am: 04f5967c95" into oc-dr1-dev-plus-aosp
...
am: 05be6e07d9
Change-Id: Ic6d5c86151c221bc1bc94a5f348c8cfabab6892c
2017-07-06 03:33:39 +00:00
Android Build Merger (Role)
1134302080
Merge "Bluetooth: Use string in remote device summary am: 04f5967c95
am: d79f6af9ae"
2017-07-06 03:32:52 +00:00
Jack He
8e9add2ff1
Bluetooth: Use string in remote device summary am: 04f5967c95
...
am: d79f6af9ae
Change-Id: I27ee59e2213ab069466c92e26493222ebd865b66
2017-07-06 03:30:51 +00:00
Daniel Sheng
34887c8355
Merge "Added suggestions for gestures." into oc-dr1-dev
...
am: f8e0963f78
Change-Id: If48fd6cbbc1e8a90afd12da39df8752c4ff301f4
2017-07-06 03:30:33 +00:00
Jack He
bbe2cf45ac
Bluetooth: Use string in remote device summary am: 04f5967c95
...
am: d79f6af9ae
Change-Id: If95cf2c89469d5b9220e3f2741e8c7f9288b655a
2017-07-06 03:29:58 +00:00
Android Build Merger (Role)
05be6e07d9
Merge "Bluetooth: Use string in remote device summary am: 04f5967c95" into oc-dr1-dev-plus-aosp
2017-07-06 03:27:09 +00:00
Jack He
b3499f34cd
Bluetooth: Use string in remote device summary
...
am: 04f5967c95
Change-Id: Idc084b72529a7408edf3ed7cb74496851e65d053
2017-07-06 03:25:08 +00:00
Daniel Sheng
9a16e473ab
Removed camera lift gesture settings UI.
...
Bug: 37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 20:24:12 -07:00
Jack He
d79f6af9ae
Bluetooth: Use string in remote device summary
...
am: 04f5967c95
Change-Id: Ib8673c03e6875d4661015f9fa0eb25b658090ad2
2017-07-06 03:23:43 +00:00
Daniel Sheng
f8e0963f78
Merge "Added suggestions for gestures." into oc-dr1-dev
2017-07-06 03:19:57 +00:00
Lorenzo Colitti
03c4a7401e
Add a developer offload for tethering hardware acceleration.
...
Bug: 32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
2017-07-06 12:13:11 +09:00
Daniel Sheng
9e958b6dfc
Merge "Removed camera lift gesture settings UI."
2017-07-06 02:56:12 +00:00
TreeHugger Robot
6e6d775c1b
Merge "Follow framework change."
2017-07-06 02:02:16 +00:00
Android Build Merger (Role)
3d4ffb1deb
Merge "Make utility methods static. am: 43d4fefb36
am: cc56b1aa04"
2017-07-06 01:36:55 +00:00
Alex Kulesza
049e81e918
Make utility methods static. am: 43d4fefb36
...
am: cc56b1aa04
Change-Id: Iab792e2213736194cbdccbb680830fc3444e9bbb
2017-07-06 01:36:38 +00:00
Alex Kulesza
f30915e860
Make utility methods static. am: 43d4fefb36
...
am: cc56b1aa04
Change-Id: Ia1ebdff4fcd82f829e90f76bf7d49b0adbc8febc
2017-07-06 01:36:33 +00:00
Alex Kulesza
cc56b1aa04
Make utility methods static.
...
am: 43d4fefb36
Change-Id: If15b946499c572a693712607bc818d143875290f
2017-07-06 01:24:46 +00:00
Jack He
04f5967c95
Bluetooth: Use string in remote device summary
...
* Use String in connected device summary instead of resource id
* This allows dynamic strings to be built by CachedBluetoothDevice
such as ones involve battery level percentages
Bug: 35874078
Test: make, unit test, test with Bluetooth devices
Change-Id: I583eac73280ca17387b215a4e7095e27de399998
2017-07-06 01:22:35 +00:00
Rajeev Kumar
e72113a5a8
Merge "Some cleanups in DataUsageSummary class: 1. Get rid of unused constants. 2. Fix typo in instance variable name. 3. Convert an instance variable to a local variable. 4. Use Java8 lambda for SummaryProviderFactory instance."
2017-07-06 01:20:45 +00:00
Daniel Sheng
11d240c300
Removed camera lift gesture settings UI.
...
Bug: 37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 18:04:10 -07:00