git.osdn.net Git - android-x86/frameworks-base.git/log

am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
Keep snapshot order matching the shared elements.

Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:57:12 +0000 (23:57 +0000)]

am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

* commit '130e30fe247c85aeb777a0f60b31885fef613930':
AAPT: Add custom transition classes to Proguard keep set

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:50:49 +0000 (23:50 +0000)]

Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:48:31 +0000 (23:48 +0000)]

am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

* commit '3bec50908b8438c04a654a3bb806f05a01402ce7':
Properly recognize repeating wakeup alarms

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:48:26 +0000 (23:48 +0000)]

am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev

* commit '99391361217cd9234ddc0570055677863cb6fb34':
Midnight should mean midnight

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:44:18 +0000 (23:44 +0000)]

Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:43:58 +0000 (23:43 +0000)]

Merge "Midnight should mean midnight" into lmp-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 22:50:21 +0000 (14:50 -0800)]

AAPT: Add custom transition classes to Proguard keep set

Bug:18590044
Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:37:55 +0000 (23:37 +0000)]

am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev

* commit 'd72901f0d47d2339d8cedb6af0b4d8c58b3178ae':
Update drawable container constant state following clone

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:37:47 +0000 (23:37 +0000)]

am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

* commit '9a888816de21c4e146acbd608fdea110a299f42d':
Deprecate one-arg getDrawableForDensity, update currents.txt

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:31:08 +0000 (23:31 +0000)]

Merge "Update drawable container constant state following clone" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:30:52 +0000 (23:30 +0000)]

Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:26:33 +0000 (15:26 -0800)]

Deprecate one-arg getDrawableForDensity, update currents.txt

BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff

am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

* commit 'cdd3356da9386bff842d9a29fad09a1d5edc1e73':
Allow more space for the printer spinner to avoid truncation.

Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:11:36 +0000 (23:11 +0000)]

am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '1b33396ee4047e79777495a8682b9117e88bba5c':
Deprecate Resources.getDrawable(int) in favor of the two-arg version

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:11:30 +0000 (23:11 +0000)]

am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '152470a29212479c8ccc9e2c1a9f26188a5b7411':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:07:01 +0000 (23:07 +0000)]

Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:05:07 +0000 (23:05 +0000)]

am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '8c71df8dd89c68128e709eab60da8105772d6194':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 22:58:08 +0000 (14:58 -0800)]

Deprecate Resources.getDrawable(int) in favor of the two-arg version

This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 22:56:38 +0000 (22:56 +0000)]

am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit 'f9b8bd5e73cdb694eab1b158e7b313be60534820':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 22:50:48 +0000 (22:50 +0000)]

am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a':
docs: Long press to dismiss fix by Wayne

Keep snapshot order matching the shared elements.

Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f

am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '92ad4dd017a13364b4001bdb04911202932f81c2':
Import translations. DO NOT MERGE

am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585':
Import translations. DO NOT MERGE

am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '6774911ee2954eebf2b2003e97b949be6bdbd836':
Import translations. DO NOT MERGE

am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '30460ae37e2d4f8ffda646af471b7039b519d65a':
Import translations. DO NOT MERGE

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

Import translations. DO NOT MERGE

Change-Id: I6acd5c2437f73dcbeca9cf6746c0a7c23c98eebc
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

Change-Id: I59cdaeb46767c757f817f3e15b7794e7773aa41d
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

Change-Id: I1fa46bb80033e1eee5de30cbf0d0d5d07ae4147c
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

Change-Id: I5bfbdcf0a1631d7a0d6c19acabaa89f454ac177e
Auto-generated-cl: translation import

am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

* commit 'fb020862e0d8740d31ead217fd4d308450b4170d':
CEC: Set the parameter of <System Audio Mode Request> right

Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

Allow more space for the printer spinner to avoid truncation.

The save to PDF option is truncated in Russian. While the printer
name can be arbitrarily long, the Save to PDF printer should not
be truncated.

bug:18546218

Change-Id: Id35bd638c505783a2288c1602960e8d74ec3b882

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 21:20:17 +0000 (21:20 +0000)]

am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 21:13:58 +0000 (21:13 +0000)]

Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

* commit '4e779ecd56faad5901854e030f593c5d4ad3dee8':
Subscription Info density-dependent text size and localized SIM slot index

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 21:08:10 +0000 (13:08 -0800)]

docs: Long press to dismiss fix by Wayne

Bug: 17924105

Change-Id: Ifbc26b923771e7389e4df6abe9005bc3f0269c1e

Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 20:25:14 +0000 (12:25 -0800)]

Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

Windows that had FLAG_SHOW_WHEN_LOCKED and FLAG_DISMISS_KEYGUARD set
would ignore the FLAG_DISMISS_KEYGUARD if the lockscreen was
insecure. This change adds a test for insecure keyguards when the
two flags are set together.

Fixes bug 18563298.

Change-Id: I3027c7ec476d3ac15978f7e6a78b3c2050cbab02

commit | commitdiff | tree

Paul Lawrence [Tue, 2 Dec 2014 20:22:18 +0000 (20:22 +0000)]

am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* commit '75f304f922dcb27e57dcbea17a36d426f6b223a7':
Add mechanism for securely returning parameters though NativeDaemonConnector
Revert "DO NOT MERGE: Don't log passwords returned from vdc"

commit | commitdiff | tree

Paul Lawrence [Tue, 2 Dec 2014 20:17:32 +0000 (20:17 +0000)]

Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev

* changes:
Add mechanism for securely returning parameters though NativeDaemonConnector
Revert "DO NOT MERGE: Don't log passwords returned from vdc"

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:49:54 +0000 (19:49 +0000)]

am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'affe473213deb4b2d1b9354cc57e2f517840e21a':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 19:48:53 +0000 (11:48 -0800)]

Properly recognize repeating wakeup alarms

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral. Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427

am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

* commit 'dad13577e5c699ab34e4243204cf767de4a0f0cd':
Update dark mode on notifications when content is updated

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:41:30 +0000 (19:41 +0000)]

am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'aa59bf2dd81e974c37eff8be3b529ed48b0b59c3':
docs: Layout fixes for the Custom UI on Wear class

Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 2 Dec 2014 19:33:28 +0000 (19:33 +0000)]

am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

* commit '221b545cdaba2522fbb299428ac048641410c284':
Fix issue #18510117: Returning from an activity started with...

am d537987b: Changing AUDIO_TURNED_ON constant.

* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
Changing AUDIO_TURNED_ON constant.

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:32:49 +0000 (19:32 +0000)]

am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit 'a107b5150b38a8c6585631b1773d6c10f682f42b':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Dianne Hackborn [Tue, 2 Dec 2014 19:22:06 +0000 (19:22 +0000)]

Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev

Changing AUDIO_TURNED_ON constant.

Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:13:54 +0000 (19:13 +0000)]

am 64f49162: docs: Layout fixes for the Custom UI on Wear class

* commit '64f49162460eaddf49f9d56c5dc6a01f472e790c':
docs: Layout fixes for the Custom UI on Wear class

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 19:12:24 +0000 (19:12 +0000)]

am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit 'fcae79f65d60069f75c4db92a68d56c9eb8b5213':
Sensor documentation fixes.

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 19:05:22 +0000 (11:05 -0800)]

docs: Layout fixes for the Custom UI on Wear class

Change-Id: I7e499374b5903fb3412c9c42a44c75f7a0bf28f0

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 19:01:22 +0000 (19:01 +0000)]

am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit 'd5412e35801243e14123f2a0f03759073eb20fb6':
Sensor documentation fixes.

am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

* commit '4ef369fce92d0e140189f305783855d8ae27067d':
Rename VoLTE capability to HD audio.

commit | commitdiff | tree

Christoph Studer [Tue, 2 Dec 2014 18:59:26 +0000 (18:59 +0000)]

am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev

* commit '27ef018846fc88122bcb2c30ba86e99a5b3039d6':
NoMan/SysUI: Clear LEDs only when entering the shade

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 18:55:09 +0000 (10:55 -0800)]

Midnight should mean midnight

...not noon-or-midnight. Fix the initial fstrim delay to properly refer
to midnight rather than ambiguous 12-hour "zero" so that fstrim job
consideration always starts overnight rather than possibly at the following
day's noon, depending on when the device was booted.

Bug 18076397

Change-Id: Ife3cd5bdeb14c7832b6e2a2de88dcfd1ba731b67

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 18:53:20 +0000 (18:53 +0000)]

am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
Sensor documentation fixes.

Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev

am eaaf0512: Crash in print spooler when back pressed before content update complted.

* commit 'eaaf0512fcbf03b926cdbbbb7f54df474ecf861a':
Crash in print spooler when back pressed before content update complted.

commit | commitdiff | tree

Christoph Studer [Tue, 2 Dec 2014 18:49:49 +0000 (18:49 +0000)]

Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 18:46:30 +0000 (18:46 +0000)]

am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit '1108b845f940debde0c1959a9293cafdc264afcc':
Sensor documentation fixes.

am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev

* commit '5aeed158df65847edac69761630dcd66b8f66eaa':
Added explicit sort order when fetching accounts.

Crash in print spooler when back pressed before content update complted.

We are updating the printed content asynchronously. If the user cancels
printing before the first update is complete the spooler components are
in a destroyed state but we attempt to handle the completed update resulting
in a crash. Now if printing is cancelled we ignore the update result.

bug:18525491

Change-Id: I1ef47a17de19896cba2c7a1dd2bfc205065e0a5a

Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 2 Dec 2014 18:33:48 +0000 (18:33 +0000)]

Merge "Sensor documentation fixes." into lmp-docs

commit | commitdiff | tree

Dianne Hackborn [Tue, 2 Dec 2014 18:33:14 +0000 (10:33 -0800)]

Fix issue #18510117: Returning from an activity started with...

...startActivityForResult causes SecurityExpcetion

The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.

Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa

Added explicit sort order when fetching accounts.

In SQLite, if a sort order is not specified then the ordering is
undefined. In pre-L, SQLite would order accounts by the primary key.
But in L, the newer SQLite version appears to be ordering accounts by
the name.

Bug 18453759

Change-Id: I6bf2b0de59eca4c69472b4279b9e4194c3d3471e

am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev

* commit 'ef6178a99c57b6de3dc02455e570f932b154b8e1':
Add hasMatchedTetherApnSetting to telmgr API.

Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev

am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs

* commit 'dc1baa16b1c559b07d392f7d899fcfe18fa7036c':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 2 Dec 2014 17:17:06 +0000 (17:17 +0000)]

am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev

* commit '57457b98cfec197283c42585a3bc4abb1b21d05b':
AudioMix address and type, rule exclusion API, dynamic source

am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs

* commit '2711a5394950f2c61d2cd2ca7f9cfa141a96df34':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 2 Dec 2014 17:09:28 +0000 (17:09 +0000)]

Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev

am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev

* commit '81defc6a840367dcf9591d14b827f2d8d756ef00':
Sync ViewOverlay size init with RenderNode

am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs

* commit '16d0ab86eba2e4f596ac1b96b53391dd0f146b57':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.

Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev

am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs

* commit '6cd78bb2613260b0eb8341748d5cebe4a46f10e5':
docs: Update getting started creating Wearable apps with proper prereqs and instructions.

Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs

am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev

* commit 'e47dc36071884600c2b3c1dfe1ffe031fc9f0fde':
SysUI: Actual MSIM status bar support

commit | commitdiff | tree

Christoph Studer [Wed, 26 Nov 2014 14:32:20 +0000 (15:32 +0100)]

NoMan/SysUI: Clear LEDs only when entering the shade

Don't clear notification LEDs when seeing notifications on the
lockscreen.

Also fix a bug where the LED didn't continue flashing after
the screen turned off.

For devices with doze capability, ensure that the LED continuing
to flash after screen off doesn't cause an immediate pulses, but
delay the first pulse by 10s.

Bug: 15449039
Change-Id: Id34d51a2c91ceaf069e49add1ab690bb855f9638

Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev

commit | commitdiff | tree

Christoph Studer [Tue, 2 Dec 2014 15:45:01 +0000 (15:45 +0000)]

am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev

* commit 'ff02faf8f3db791956a99ff0bb87eafb52f333d4':
NoMan: Optimize grouped notifications

commit | commitdiff | tree

Christoph Studer [Tue, 2 Dec 2014 15:40:07 +0000 (15:40 +0000)]

Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev

SysUI: Actual MSIM status bar support

Expand SignalClusterView and NetworkController to handle multiple
SIMs. It does this by creating multiple MobileSignalControllers
for each of the active subscriptions on the device.

Also some minor changes for followup on the NetworkController
refactor that went in before this.

Bug: 18222975
Change-Id: Ic7a857cfc5cadb46d51bb9ded0df8187eea799f7

am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev

* commit 'fbeeac8266c190afba084cfc1164385ff5020fce':
Add a tag to separate paragraphs in Javadoc

Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev

am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar

* commit 'c3056190ae1a6d29ce5943d45ab4711e1e49620c':
Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar

Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar

Bug: 18518939
Bug: 17691219
Change-Id: I90b9afbbb1a550b5328a581b4fb6aadfa3ff2559

Add a tag to separate paragraphs in Javadoc

Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456

am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev

* commit '8f52135f2c555ae0a13393b60ed0552ee9e149da':
Allow apps from managed profles to close notification shade.

Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev

commit | commitdiff | tree

Andre Eisenbach [Tue, 2 Dec 2014 08:07:48 +0000 (08:07 +0000)]

am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev

* commit 'a1a6c300afffebfb46e84dc1941f6bddca145a8f':
Add server-side callback for change in MTU (4/4)