Elliott Hughes
4eb22e44b9
am 93cdf104: am 5cce4c75: Merge "Fix memory leak where we close the descriptor instead of the file."
...
* commit '93cdf1041e018bbf5bbe85ceb3b1ba018b99e526':
Fix memory leak where we close the descriptor instead of the file.
2014-11-10 17:00:56 +00:00
Andres Morales
9e19c118a1
am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
...
* commit '9467926bd14a2d7f92fcdfdc7207f84d951f6e1f':
Unhide DISALLOW_OUTGOING_BEAM
2014-11-10 16:58:53 +00:00
Ricardo Cervera
15da5f959d
am 1e01a9f7: am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
...
* commit '1e01a9f787738685c86342ced6c0e49fa2569699':
docs: Material design shadow fixes.
2014-11-10 16:57:43 +00:00
Geoff Mendal
b30af68761
Merge "Import translations. DO NOT MERGE"
2014-11-10 16:56:06 +00:00
Elliott Hughes
93cdf1041e
am 5cce4c75: Merge "Fix memory leak where we close the descriptor instead of the file."
...
* commit '5cce4c752eeeaed74f815b9154ec7f4f3f2397ec':
Fix memory leak where we close the descriptor instead of the file.
2014-11-10 16:55:44 +00:00
Geoff Mendal
fe1e4457a1
Merge "Import translations. DO NOT MERGE"
2014-11-10 16:55:04 +00:00
Geoff Mendal
6d204bc600
Import translations. DO NOT MERGE
...
Change-Id: I1295cefe0532ffce1200d977c98acb53b8d3599d
Auto-generated-cl: translation import
2014-11-10 08:53:55 -08:00
Andres Morales
9467926bd1
am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
...
* commit 'cc8d56f66c64a66002b90ed014bbd2fb46125f63':
Unhide DISALLOW_OUTGOING_BEAM
2014-11-10 16:53:18 +00:00
Ricardo Cervera
1e01a9f787
am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
...
* commit 'abf58f9865e21f95356f2c32c4e2029d38a3a6a4':
docs: Material design shadow fixes.
2014-11-10 16:51:51 +00:00
Geoff Mendal
ec579f8992
Import translations. DO NOT MERGE
...
Change-Id: Iba5058a1336ebec6e56a15a58c0bbbb94c1573ae
Auto-generated-cl: translation import
2014-11-10 08:49:10 -08:00
Andres Morales
cc8d56f66c
Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
2014-11-10 16:48:45 +00:00
Pete Gast
2f6cd6489f
am 2ad988aa: am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
...
* commit '2ad988aa6e6f7fa89affcfc5b81ac3c28ea525ee':
Expand WearableExtender to customize labels.
2014-11-10 16:48:29 +00:00
Adrian Roos
37d7a68de7
Fix inset hinting when adding window
...
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.
Also adds hinting for the stable insets.
Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
2014-11-10 17:46:57 +01:00
Ricardo Cervera
abf58f9865
am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
...
* commit '43f46ab99de710f9b39106e1ac4733f06188e74c':
docs: Material design shadow fixes.
2014-11-10 16:46:47 +00:00
Elliott Hughes
5cce4c752e
Merge "Fix memory leak where we close the descriptor instead of the file."
2014-11-10 16:46:44 +00:00
Pete Gast
2ad988aa6e
am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
...
* commit '642b4d93b9ce73866d7985172d31661a55aed7be':
Expand WearableExtender to customize labels.
2014-11-10 16:45:02 +00:00
Derek Sollenberger
c793fcb026
Fix memory leak where we close the descriptor instead of the file.
...
(cherry pick of 5cb769d99952ef9fb4f576abba70423fe157342b.)
bug: 17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
2014-11-10 08:44:46 -08:00
Ricardo Cervera
43f46ab99d
am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
...
* commit 'e627b94c76ad144abb0207efcdc6b1cb3855bc14':
docs: Material design shadow fixes.
2014-11-10 16:42:20 +00:00
Pete Gast
642b4d93b9
am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
...
* commit '705c9c131a6df977a2e9430cacb84788ef0cecbf':
Expand WearableExtender to customize labels.
2014-11-10 16:40:33 +00:00
Ricardo Cervera
e627b94c76
Merge "docs: Material design shadow fixes." into lmp-docs
2014-11-10 16:36:21 +00:00
Pete Gast
705c9c131a
Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
2014-11-10 16:35:57 +00:00
Jorim Jaggi
6db9400884
am 4974fae3: am 5a8f191c: am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev
...
* commit '4974fae3bae6eb08a3f735603a4eae1780be6c94':
Adjust owner info to spec
2014-11-10 15:52:43 +00:00
Jorim Jaggi
4974fae3ba
am 5a8f191c: am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev
...
* commit '5a8f191c12d7087d1a64d8f058d6b0c2351223c5':
Adjust owner info to spec
2014-11-10 15:47:54 +00:00
Jorim Jaggi
5a8f191c12
am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev
...
* commit '3e54ce273abafec3a0eca9e7064d5151ec096f0b':
Adjust owner info to spec
2014-11-10 15:44:25 +00:00
Jorim Jaggi
3e54ce273a
Merge "Adjust owner info to spec" into lmp-mr1-dev
2014-11-10 15:39:22 +00:00
George Mount
92de9c1d7e
am 98b4cbf2: am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
...
automerge: 47b4cf3
* commit '47b4cf3ac488af5b40cca819089905df98e17ab1':
Allow PathMotion to affect translations in ChangeTransform.
2014-11-10 15:36:28 +00:00
George Mount
47b4cf3ac4
am 98b4cbf2: am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
...
* commit '98b4cbf21b0be8a17d006b1b0ddad45510c7a7bf':
Allow PathMotion to affect translations in ChangeTransform.
2014-11-10 15:33:40 +00:00
George Mount
98b4cbf21b
am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
...
* commit '8f7d3715c5b26069a55464b1d3e517c6ecc600c7':
Allow PathMotion to affect translations in ChangeTransform.
2014-11-10 15:29:30 +00:00
George Mount
8f7d3715c5
Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
2014-11-10 15:25:10 +00:00
Geoff Mendal
0e5726566a
am ffb18904: (-s ours) am 2088ff5b: (-s ours) am 9cb3c000: (-s ours) am 547b9ba1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ffb18904fecb8cc7875a57037ba2ca4c98a0a548':
Import translations. DO NOT MERGE
2014-11-10 15:22:17 +00:00
Geoff Mendal
ffb18904fe
am 2088ff5b: (-s ours) am 9cb3c000: (-s ours) am 547b9ba1: (-s ours) Import translations. DO NOT MERGE
...
* commit '2088ff5ba92c7934cddf436fff4a5cd8bdfe9c06':
Import translations. DO NOT MERGE
2014-11-10 15:18:43 +00:00
Geoff Mendal
2088ff5ba9
am 9cb3c000: (-s ours) am 547b9ba1: (-s ours) Import translations. DO NOT MERGE
...
* commit '9cb3c0004da91da527657c829c957bf536f45d29':
Import translations. DO NOT MERGE
2014-11-10 15:13:28 +00:00
Geoff Mendal
62b7d5e04c
am a68e3188: (-s ours) am d4c590f4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'a68e318834b3486c0426689df4df686dd297a5dc':
Import translations. DO NOT MERGE
2014-11-10 15:13:25 +00:00
Geoff Mendal
9cb3c0004d
am 547b9ba1: (-s ours) Import translations. DO NOT MERGE
...
* commit '547b9ba1ec11d364d92e4dfea0f29aa24488ef7c':
Import translations. DO NOT MERGE
2014-11-10 15:10:05 +00:00
Geoff Mendal
a68e318834
am d4c590f4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'd4c590f4c0d753af39ca725958a22d9cc3e9ba71':
Import translations. DO NOT MERGE
2014-11-10 15:09:46 +00:00
Geoff Mendal
d4c590f4c0
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-10 15:04:50 +00:00
John Spurlock
cda982bc16
am f1c595e9: am a2416f7f: am 982e3be2: Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev
...
* commit 'f1c595e9fab80d9c3ee9e8f204ce75e134eb09cf':
Doze: Fix trigger sensor re-registration.
2014-11-10 15:03:56 +00:00
Geoff Mendal
ddfc619dc3
am 1ac3d5bf: (-s ours) am 06b0fb54: (-s ours) am 70eb9f64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '1ac3d5bf47d57da9f4d146b5378e56b81177e5cd':
Import translations. DO NOT MERGE
2014-11-10 15:03:52 +00:00
Geoff Mendal
547b9ba1ec
Import translations. DO NOT MERGE
...
Change-Id: I5f5fab81cb5dc43388dba446d704c6f50e0415d9
Auto-generated-cl: translation import
2014-11-10 07:03:14 -08:00
John Spurlock
f1c595e9fa
am a2416f7f: am 982e3be2: Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev
...
* commit 'a2416f7fc99a02a95320a793cc296b959f19acec':
Doze: Fix trigger sensor re-registration.
2014-11-10 14:58:09 +00:00
Geoff Mendal
1ac3d5bf47
am 06b0fb54: (-s ours) am 70eb9f64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '06b0fb547f7ed243a61d95d3e4a5417911109428':
Import translations. DO NOT MERGE
2014-11-10 14:58:04 +00:00
Geoff Mendal
9133cc0cac
Import translations. DO NOT MERGE
...
Change-Id: I412d51aa749f1a8a5264f9f9ee04c3e1f14c3849
Auto-generated-cl: translation import
2014-11-10 06:56:28 -08:00
John Spurlock
a2416f7fc9
am 982e3be2: Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev
...
* commit '982e3be2801bcb6b7bed1513cd757048795ddcc7':
Doze: Fix trigger sensor re-registration.
2014-11-10 14:54:09 +00:00
Geoff Mendal
06b0fb547f
am 70eb9f64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '70eb9f64a695f88433d5e0b294cffc76a8e981cb':
Import translations. DO NOT MERGE
2014-11-10 14:54:04 +00:00
John Spurlock
982e3be280
Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev
2014-11-10 14:52:37 +00:00
Paul Jensen
532b6143f6
Fix NetworkMonitor logging to include NetID.
...
This was broken when NetID selection was moved to after
NetworkAgentInfo construction time. NetworkMonitor inherits
from StateMachine whose log tag is immutable after construction
making it impossible to include the NetID. Instead define a
simple log function in NetworkMonitor that includes correct
NetID. This makes debugging via logs much easier and avoids
ambiguities that can make logs useless.
Change-Id: Ie72fc210b92bd425184d288b35ed476669e2e073
2014-11-10 09:50:02 -05:00
Geoff Mendal
70eb9f64a6
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-10 14:49:42 +00:00
Geoff Mendal
d453184829
Import translations. DO NOT MERGE
...
Change-Id: Ic5d0f862954931ce2134834256fcddda9d033ebc
Auto-generated-cl: translation import
2014-11-10 06:48:15 -08:00
John Spurlock
7850373483
Doze: Fix trigger sensor re-registration.
...
Bug: 17541271
Change-Id: I3f19f86165dd4e3677af5ed354e4fc120f9bb407
2014-11-10 09:46:14 -05:00
Geoff Mendal
995608676e
Merge "Import translations. DO NOT MERGE"
2014-11-10 14:41:32 +00:00