OSDN Git Service
Geoff Mendal [Wed, 3 Feb 2016 15:44:40 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 15:42:52 +0000 (10:42 -0500)]
Import translations. DO NOT MERGE
Change-Id: I801233d391712c477e3b38b912465333b483a78b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 15:24:32 +0000 (15:24 +0000)]
Import translations. DO NOT MERGE
am:
a3144a52c6 -s ours
* commit '
a3144a52c63a8f69f0f79fe05070fd181bc70b1d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 14:57:33 +0000 (09:57 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3f9c8af09874bbdb5473ffb49a49f21c2d3bc12a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 00:39:57 +0000 (00:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 00:38:12 +0000 (06:08 +0530)]
Import translations. DO NOT MERGE
Change-Id: I24df236c3b028751bda9de734b4ecdb754246fd5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 00:13:12 +0000 (00:13 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 00:11:42 +0000 (05:41 +0530)]
Import translations. DO NOT MERGE
Change-Id: I0cd1e1d434b84d3942b5ff847a0880f34aa2b430
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 00:10:01 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 00:09:39 +0000 (00:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Wed, 3 Feb 2016 00:06:59 +0000 (05:36 +0530)]
Import translations. DO NOT MERGE
Change-Id: Icc12ee999dcfdf4681e26eb59e6f464a6f0486d8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 00:01:35 +0000 (05:31 +0530)]
Import translations. DO NOT MERGE
Change-Id: I03579eb40aaf682aebcf9fe18f24be37b493f5d3
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:52:53 +0000 (23:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:49:05 +0000 (05:19 +0530)]
Import translations. DO NOT MERGE
Change-Id: Ia5f398b681822bea28cdda74811bd413da9f3c86
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:46:39 +0000 (23:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:46:19 +0000 (23:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:46:03 +0000 (23:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:45:28 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:45:09 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:44:52 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:44:33 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:44:15 +0000 (05:14 +0530)]
Import translations. DO NOT MERGE
Change-Id: I60ec1238671e5e2a7b78b3c89aba68542b6c88ee
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:39:18 +0000 (05:09 +0530)]
Import translations. DO NOT MERGE
Change-Id: I3ebfbc8cccde140f585db710ccc8f7c91bd47cd5
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:34:29 +0000 (05:04 +0530)]
Import translations. DO NOT MERGE
Change-Id: Ibf6b1c318c013377d837a50a749fec32f4d19742
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:29:17 +0000 (04:59 +0530)]
Import translations. DO NOT MERGE
Change-Id: I4e9f959b3a04dee69bfca04ad71af34783897726
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:24:24 +0000 (04:54 +0530)]
Import translations. DO NOT MERGE
Change-Id: I26681000284f7238a694490e0a84c0d087fcd662
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:19:17 +0000 (04:49 +0530)]
Import translations. DO NOT MERGE
Change-Id: I33f38f6afc185393cc34048ad3b57e32306f2cde
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 23:14:14 +0000 (04:44 +0530)]
Import translations. DO NOT MERGE
Change-Id: Id5e09da7c8c9a540e6280c24a6e372927d347184
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:48:24 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
c0297abd93 -s ours
* commit '
c0297abd931306368939f0d93ce28fc82584705e':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:46:54 +0000 (21:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
4a27667bf5 -s ours
* commit '
4a27667bf582b349dc9403c7d10efa5904577620':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:45:55 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
091513d6e8 -s ours
* commit '
091513d6e84a1a28f1de1174532e42784d3ce584':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:44:53 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
1974686db5 -s ours
* commit '
1974686db5089e9b899f3700fb66a4269758d082':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:40:54 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:40:04 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
063357312c -s ours
* commit '
063357312c77681ca7093f4416ed12ff0ae04c83':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:40:03 +0000 (13:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9f019cebdea7b7e4b3600f936e7913cbeffc5a63
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:38:02 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
3122eedcd3 -s ours
* commit '
3122eedcd3f2e378a96d9486d6418449414059ac':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:36:04 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
b697973e2a -s ours
* commit '
b697973e2a408f8485d10fe53b22146da8670517':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:34:39 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
21e0a012d8 -s ours
* commit '
21e0a012d811af456bbeb9289012676dac11a49e':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:33:44 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
497300badb -s ours
* commit '
497300badb86c3e253d1ef25b3e290b9bf5c355e':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:32:16 +0000 (21:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
9561ec3353 -s ours
* commit '
9561ec3353753c9b79b03a910725b33d2628c7ab':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:30:50 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
6f63adbe93 -s ours
* commit '
6f63adbe936cf9b3e690c4b40b0ac2e8d41f371b':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:29:47 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
26b12b719d -s ours
* commit '
26b12b719d317ae8d57f5b43bd9cd1e96b2cad5d':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 21:28:40 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:28:20 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:28:02 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:27:36 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:27:10 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:55 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:38 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:16 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:02 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:25:44 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:25:27 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:21:58 +0000 (13:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6cd7603e8c73642eaa89a1aa5dd6250bf74d5342
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:18:46 +0000 (13:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9e8858c1ec9732e1e9f9a9a7cb212a958629fc2e
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:15:01 +0000 (13:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1bc273863dc43f37c3c48e76c5136d48e2434188
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:06:29 +0000 (13:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I522dbce84a7dad42bb0159d365fe3f2049679207
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:03:26 +0000 (13:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieaafa87030d49b1db501a2837e152e7bf3450c22
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:00:39 +0000 (13:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3811fe74ac702597cf4ba9db60bc035f28632b28
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:57:33 +0000 (12:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea8b528da87c3a0e12d2f0d782334390b1876a2b
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:54:05 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8278f026b87460de08b62ea54c36b024eb4f49f8
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:50:58 +0000 (12:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I011c83fb945b04260dd0564f22874dd3eab57047
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:47:33 +0000 (12:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec3ba1c073c38dedce355d0cf19dbb93e8281692
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:44:13 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9244271734b04d738787da42879d0a5fa95ebe6f
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 18:16:26 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE
am:
34affa2303 -s ours
* commit '
34affa2303e959275eb66d91e2a416d7a69fc520':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 18:09:58 +0000 (10:09 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26887781
Change-Id: I2f77e533633815badf267419addb9d5f7686a200
Geoff Mendal [Tue, 2 Feb 2016 16:16:45 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
ef9f2cbc84 -s ours
* commit '
ef9f2cbc843c580f6de12aed0a94aeeeadb85ac7':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:12:16 +0000 (16:12 +0000)]
Import translations. DO NOT MERGE
am:
3dab749b31 -s ours
* commit '
3dab749b317485bbee345e08cebf91e9ac80b59d':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:09:01 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 16:04:49 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:03:45 +0000 (08:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I125fdf9cff416791a54d42450e6ef63ffec48a6f
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 16:00:13 +0000 (17:00 +0100)]
Import translations. DO NOT MERGE
Change-Id: If53700bcc5370eda1b87001b00f039a4d5fa016a
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 15:57:06 +0000 (07:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I491375fe7c3f4bafb6a310830c12cd1459072670
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 15:54:58 +0000 (16:54 +0100)]
Import translations. DO NOT MERGE
Change-Id: If918aa7c054de6b991dbce81ec459d7ca88dc71b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 23:30:56 +0000 (23:30 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours am:
94d9f3c788 -s ours
am:
5aec202998 -s ours
* commit '
5aec202998dfc1f72159b25892358c9f477d35f5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 23:26:05 +0000 (23:26 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours
am:
94d9f3c788 -s ours
* commit '
94d9f3c78856217a1d7c6444fb7f9bc47ce96adc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 23:21:45 +0000 (23:21 +0000)]
Import translations. DO NOT MERGE
am:
73ecaf0881 -s ours
* commit '
73ecaf0881121522831c33563c5dcdcfda11f895':
Import translations. DO NOT MERGE
Bart Sears [Mon, 1 Feb 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev
am:
29700949ad
* commit '
29700949ad981bde8d35219914161f6424e7757b':
Hack to get devices booting again.
Bart Sears [Mon, 1 Feb 2016 22:17:49 +0000 (22:17 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev
Geoff Mendal [Mon, 1 Feb 2016 21:24:23 +0000 (13:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I25920d1a09b527c9e2868537f68d994a40a85e6a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 21:10:47 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 1 Feb 2016 21:08:15 +0000 (13:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I22adb9c9dea51a632471abe8623deea91ba90b25
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 20:44:05 +0000 (20:44 +0000)]
Import translations. DO NOT MERGE am:
f544fc21d0 -s ours
am:
b2628caab6 -s ours
* commit '
b2628caab626bac41e551556cabf34c0770cec9b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:41:25 +0000 (20:41 +0000)]
Import translations. DO NOT MERGE
am:
f544fc21d0 -s ours
* commit '
f544fc21d0a4d74a13e385d981a805f8add8cebb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:37:44 +0000 (12:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5942cf8f289103e9a78b93e69211bf17a47b344
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 20:26:24 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE
am:
9ff5be7674 -s ours
* commit '
9ff5be7674e3a925dc371bc812b220f3c476c501':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:21:06 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26887782
Change-Id: If6bc1bd3f277f0289aecb7c063f899363079c248
Jeff Sharkey [Fri, 29 Jan 2016 17:45:45 +0000 (10:45 -0700)]
Hack to get devices booting again.
If we try scheduling a pass before the system is ready, record a
pending event and dispatch once we're actually ready.
Bug:
26863668
Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc
(cherry picked from commit
538c11cf2175d4e30337e8776401bfede85866be)
Adam Lesinski [Thu, 28 Jan 2016 19:24:44 +0000 (19:24 +0000)]
Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev
am:
c46f6db46e
* commit '
c46f6db46ed5474fbe8312a1229b59debbbae994':
Don't change screen on time on time changes
Adam Lesinski [Thu, 28 Jan 2016 19:20:49 +0000 (19:20 +0000)]
Merge "Don't change screen on time on time changes" into mnc-dr1.5-dev
Adam Lesinski [Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)]
Don't change screen on time on time changes
Screen on time should be measured in elapsed realtime, not wallclock.
Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).
When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/
22716352)
Bug:
26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
Joe LaPenna [Thu, 28 Jan 2016 01:12:36 +0000 (01:12 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient. am:
7528f57c4d -s ours
am:
2bccc45cec -s ours
* commit '
2bccc45cec5201c5b613134ebb0b398bc45483ef':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
Joe LaPenna [Thu, 28 Jan 2016 01:06:28 +0000 (01:06 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
am:
7528f57c4d -s ours
* commit '
7528f57c4ddbde1c6d0a2a352bd8a1af43711013':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
Joe LaPenna [Fri, 22 Jan 2016 15:11:49 +0000 (07:11 -0800)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
See thread: "key presses & Ambient"
BUG:
25964771
BUG:
26524301
Change-Id: I914edd447c38678a06d27677be4597c0ee384635
Nick Vaccaro [Tue, 26 Jan 2016 20:21:37 +0000 (20:21 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours
am:
3e413dfcdd -s ours
* commit '
3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:16:15 +0000 (20:16 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
am:
907108ca0f -s ours
* commit '
907108ca0f4e69dd170a507c5830591712ec5967':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:13:26 +0000 (20:13 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
Peng Xu [Fri, 22 Jan 2016 08:44:28 +0000 (00:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug:
26481493
Bug:
26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
Wei Liu [Tue, 26 Jan 2016 01:57:31 +0000 (01:57 +0000)]
Add a null check before reference networkInfo. am:
b8eaf45e1d
am:
dca8f10031
* commit '
dca8f10031f33c7c85577fa1abcc26d560c90388':
Add a null check before reference networkInfo.
Wei Liu [Tue, 26 Jan 2016 01:52:12 +0000 (01:52 +0000)]
Add a null check before reference networkInfo.
am:
b8eaf45e1d
* commit '
b8eaf45e1df007fc4f5a11bb58491abaef39cd57':
Add a null check before reference networkInfo.
OSDN Git Service
