OSDN Git Service
Wale Ogunwale [Tue, 19 May 2015 16:27:27 +0000 (16:27 +0000)]
Merge "Send AppTransitionFinish notification when there was no animation" into mnc-dev
Xiyuan Xia [Tue, 19 May 2015 16:06:05 +0000 (16:06 +0000)]
Merge "No input instead of disabling password entry" into mnc-dev
Xiyuan Xia [Fri, 15 May 2015 18:01:30 +0000 (11:01 -0700)]
No input instead of disabling password entry
So that the keyboard does not come and go all the time.
Bug:
21271425
Change-Id: I9ba2fa7034777885a6e53f135eca31fc89568e9d
Alex Klyubin [Tue, 19 May 2015 15:55:09 +0000 (15:55 +0000)]
Merge "Document the security features of Android Keystore." into mnc-dev
Xiyuan Xia [Tue, 19 May 2015 15:44:41 +0000 (15:44 +0000)]
Merge "Abort swipe up gesture when long press is detected" into mnc-dev
Alex Klyubin [Tue, 12 May 2015 15:48:54 +0000 (08:48 -0700)]
Document the security features of Android Keystore.
Bug:
18088752
Change-Id: Iec995e39065d9c4f159cb4eea38486f9c75de072
Glenn Kasten [Tue, 19 May 2015 15:38:00 +0000 (15:38 +0000)]
Merge "send without timestamp is not equivalent to send now" into mnc-dev
Glenn Kasten [Mon, 18 May 2015 23:43:43 +0000 (16:43 -0700)]
send without timestamp is not equivalent to send now
Change-Id: I68decbd005932c762ccd376ee80b52ac9884fba4
Derek Sollenberger [Tue, 19 May 2015 14:38:51 +0000 (14:38 +0000)]
Merge "Check that the parcel contained the expected amount of region data." into mnc-dev
Abodunrinwa Toki [Tue, 19 May 2015 14:06:44 +0000 (14:06 +0000)]
Merge "Hide floating toolbar when user interacts with screen." into mnc-dev
Abodunrinwa Toki [Tue, 5 May 2015 19:04:34 +0000 (20:04 +0100)]
Hide floating toolbar when user interacts with screen.
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
is changing.
Bug:
20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
Paul Jensen [Tue, 19 May 2015 12:07:46 +0000 (12:07 +0000)]
Merge "Avoid surfacing "Sign in to network" notification if user selects "use as is" from captive portal app." into mnc-dev
Paul Jensen [Tue, 19 May 2015 12:07:03 +0000 (12:07 +0000)]
Merge "Make NetworkMonitor do exponential backoff between reevaluation attempts." into mnc-dev
Clara Bayarri [Tue, 19 May 2015 10:42:17 +0000 (10:42 +0000)]
Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev
Lorenzo Colitti [Tue, 19 May 2015 10:29:46 +0000 (10:29 +0000)]
Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
Robin Lee [Tue, 19 May 2015 10:14:55 +0000 (10:14 +0000)]
Merge "Support cross-user VPN calls (with permission)" into mnc-dev
Lorenzo Colitti [Thu, 14 May 2015 08:28:27 +0000 (17:28 +0900)]
Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.
1. Always keep ConnectivityService's validated bits current:
- Apply the validated bit whenever a NetworkAgent updates its
NetworkCapabilities.
- Set or clear the validated bit whenever lastValidated changes.
2. Send callbacks when the validation state of a network changes.
3. Delete getNetworkCapabilitiesAndValidation, removing code
duplication with getNetworkCapabilities.
4. Add the validated bit to NetworkCapabilities#toString.
Bug:
18591282
Bug:
20081183
Change-Id: I6aa53b61c15cc137f203f9fc6bbd4c16894be750
Jorim Jaggi [Tue, 19 May 2015 04:40:08 +0000 (04:40 +0000)]
Merge "Add setting to disable assist data (1/2)" into mnc-dev
Jorim Jaggi [Tue, 19 May 2015 00:35:26 +0000 (17:35 -0700)]
Add setting to disable assist data (1/2)
Bug:
20944446
Change-Id: I8050df3177b6d540829c3f0989a4e4b1381c87ec
Erik Kline [Tue, 19 May 2015 02:36:53 +0000 (02:36 +0000)]
Merge "Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing" into mnc-dev
Adam Powell [Tue, 19 May 2015 01:10:51 +0000 (01:10 +0000)]
Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev
Dianne Hackborn [Tue, 19 May 2015 01:05:52 +0000 (01:05 +0000)]
Merge "Remove screenshot APIs." into mnc-dev
Dianne Hackborn [Tue, 19 May 2015 00:48:40 +0000 (17:48 -0700)]
Remove screenshot APIs.
Change-Id: I1efdb7945bd52f5f43c7103480be3d7dac60018b
Alan Viverette [Tue, 19 May 2015 00:37:02 +0000 (00:37 +0000)]
Merge "Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"" into mnc-dev
Alan Viverette [Tue, 19 May 2015 00:36:53 +0000 (00:36 +0000)]
Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"
This reverts commit
9b115a9870a184e32bdbd07f792f9b8c956c75ca.
Change-Id: Ief148510472e129f992cf52ef8b8a25b5e17e05f
Joe Fernandez [Tue, 19 May 2015 00:31:27 +0000 (00:31 +0000)]
am
e7e9d177: am
2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '
e7e9d1771525f14027602546e396c0e707bc9de0':
docs: M Preview landing page updates
Rich Slogar [Tue, 19 May 2015 00:31:21 +0000 (00:31 +0000)]
am
80f67b62: am
3f3cde41: am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
80f67b621247cf120dd885a544e1c2d7eb1d8b90':
docs: emulator updates
Glenn Kasten [Tue, 19 May 2015 00:28:19 +0000 (00:28 +0000)]
Merge "Update documentation for short transfer counts" into mnc-dev
Joe Fernandez [Tue, 19 May 2015 00:16:51 +0000 (00:16 +0000)]
am
2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '
2b18c39dacd6a14a677b13556e3c8bafa8e110d6':
docs: M Preview landing page updates
Rich Slogar [Tue, 19 May 2015 00:16:46 +0000 (00:16 +0000)]
am
3f3cde41: am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
3f3cde41d178267aeff9a41ec56bc95ce1ad45bf':
docs: emulator updates
Svet Ganov [Tue, 19 May 2015 00:13:21 +0000 (00:13 +0000)]
Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev
Joe Fernandez [Tue, 19 May 2015 00:07:58 +0000 (00:07 +0000)]
Merge "docs: M Preview landing page updates" into mnc-preview-docs
Joe Fernandez [Tue, 19 May 2015 00:02:57 +0000 (17:02 -0700)]
docs: M Preview landing page updates
- Simplify the action links
- Remove data binding section: this is too much emphasis on that tool
Change-Id: Ic81cef14985a6cc3f14bc9176dd8311ef265d9da
Rich Slogar [Tue, 19 May 2015 00:05:35 +0000 (00:05 +0000)]
am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
a01f2e737c23ea8a45d34b9709b9a1010385b4c5':
docs: emulator updates
Erik Kline [Sat, 16 May 2015 12:10:29 +0000 (21:10 +0900)]
Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing
Note that this change is not sufficient to force probing in all cases,
but does cause probing to occur on Linux if the target node hasn't been
confirmed as reachable in the past 5 seconds (delay_first_probe_time).
Bug:
18581716
Bug:
19866451
Bug:
20944464
Change-Id: I29393897118311b48c966c41e2cddb7a784f136f
Vladislav Kaznacheev [Mon, 18 May 2015 23:54:08 +0000 (23:54 +0000)]
am
d2368d07: Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
* commit '
d2368d07a71fa77edc07be4ada89f70065bc940f':
Make VPA.setInterpolator(null) unset the interpolator.
Adrian Roos [Mon, 18 May 2015 23:48:14 +0000 (23:48 +0000)]
Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
Rich Slogar [Mon, 18 May 2015 23:45:33 +0000 (23:45 +0000)]
am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
c03a39ab74f5d4c6f62d5323d4049855758fdfcf':
docs: emulator updates
Adrian Roos [Thu, 14 May 2015 23:14:29 +0000 (16:14 -0700)]
Prevent EmergencyDialer restart from Keyguard
Fixes a flicker caused by clearing the emergency
dialer task when it was already launched. Instead
we now only clear activities on top of the dialer.
Bug:
20728640
Change-Id: I8a1214c4726e4848587a81e9050a6ab63759b64f
Vladislav Kaznacheev [Mon, 18 May 2015 23:32:55 +0000 (23:32 +0000)]
Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
Stefan Kuhne [Mon, 18 May 2015 23:26:46 +0000 (16:26 -0700)]
Fixing build breakage
There was a merge conflict due to 2 overlapping CL's.
Bug:
20763296
Change-Id: Ib5e8476587dfd1354d288150501771df4b3b7ec8
Adam Powell [Mon, 18 May 2015 23:07:42 +0000 (16:07 -0700)]
Migrate uses of config_windowIsRound to Configuration.isScreenRound
Move existing code that previously relied on config_windowIsRound to
use the new Configuration.isScreenRound() method. Also move the system
property override for emulators over to the initial setup of a Display
so that the configuration property is consistent with existing
expectations.
Remove config_windowIsRound from symbols.xml. The symbol now only
exists as a default value redirect for overlays already configured to
supply this value.
Change-Id: I24e6564030a6051c3ac7262868983b43e13eee65
Stefan Kuhne [Mon, 18 May 2015 23:05:10 +0000 (23:05 +0000)]
Merge "Revert "Backup/restore recents task list"" into mnc-dev
Stefan Kuhne [Mon, 18 May 2015 17:33:45 +0000 (10:33 -0700)]
Revert "Backup/restore recents task list"
Reverts commits
92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3,
18795a2299fefd88ee16393f22324b999ace6ce4, and
ac6a3a5e9d90edb533e5b377a4a14ef514be955a which make-up
changes required for backing-up and restoring recent
tasks from one device to another.
The implementation had too many unresolved issues including
the ordering of the restored recent tasks which was depending
on when the task package is installed on the new device that
puts the restored recents list out of order compared to the
old device.
Bug:
15986349
Bug:
19014377
Bug:
20763296
Change-Id: I06fd35a43036ef0b7260cf4db9c42890df63b95d
Selim Cinek [Mon, 18 May 2015 22:16:08 +0000 (15:16 -0700)]
Fixed a bug that the more card was gone
Bug:
21155295
Change-Id: I7e332df71980b5a553e66b928c3e994849470ab3
Jeff Brown [Mon, 18 May 2015 22:47:45 +0000 (22:47 +0000)]
Merge "Rename file descriptor listener API." into mnc-dev
Robin Lee [Tue, 12 May 2015 17:14:58 +0000 (18:14 +0100)]
Support cross-user VPN calls (with permission)
Settings and SystemUI need to act on other users than USER_OWNER.
This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing
CONTROL_VPN checks, so the number of processes able to interfere with
other profiles' VPNs should be quite small.
Bug:
20692490
Bug:
20747154
Bug:
20872408
Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
Alan Viverette [Mon, 18 May 2015 22:32:56 +0000 (22:32 +0000)]
Merge "Update ripple drawable target radius on bounds change" into mnc-dev
Alan Viverette [Mon, 18 May 2015 22:24:38 +0000 (22:24 +0000)]
Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
Jim Miller [Mon, 18 May 2015 22:15:52 +0000 (22:15 +0000)]
Merge "Attempt to fix bug with setActiveGroup() in FingerprintService." into mnc-dev
Svet Ganov [Wed, 13 May 2015 02:13:36 +0000 (19:13 -0700)]
Do not report WiFi and Bluetooth MAC addresses - framework.
As a part of the new runtime permissions work we are limiting
the PII apps can access. BT and WiFi MAC addresses are PII and
based on our research there is no valid use case for app dev
to get these addresses aside of user tracking which we are
trying to limit.
bug:
21078858
Change-Id: Ib48223b272c0fd4f5c36acc889d4f44df204b309
xin He [Mon, 18 May 2015 22:11:02 +0000 (22:11 +0000)]
Merge "hal based pno and lazy roam implementation" into mnc-dev
Pierre Vandwalle [Mon, 11 May 2015 20:20:48 +0000 (13:20 -0700)]
hal based pno and lazy roam implementation
cherry-picked from mirror-m-wireless-internal-release
3655257 - hal based pno and lazy roam implementation
Change-Id: Ib58d40796c896a6d0dad856e0cb86c716c7aee7f
Deepanshu Gupta [Mon, 18 May 2015 22:04:22 +0000 (22:04 +0000)]
Merge "Show better error message for color attr not found." into mnc-dev
Jose Lima [Mon, 18 May 2015 21:50:23 +0000 (14:50 -0700)]
Make all icon fields & extras sent to listeners backward-compatible.
This also had to be done for when retrieving existing notifications.
For final release, we will only be doing this for
notification listeners targeting older SDKs.
Bug:
21207612
Change-Id: I351f9e13cd052410e7355c956c750c3859f972cb
Chris Wren [Mon, 18 May 2015 21:51:11 +0000 (21:51 +0000)]
Merge "log notification longevity and freshness" into mnc-dev
Deepanshu Gupta [Mon, 18 May 2015 21:39:03 +0000 (14:39 -0700)]
Show better error message for color attr not found.
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
Adam Powell [Mon, 18 May 2015 21:30:15 +0000 (21:30 +0000)]
Merge "Add Configuration data for round displays" into mnc-dev
Adam Powell [Mon, 18 May 2015 21:30:15 +0000 (21:30 +0000)]
Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-dev
Daniel Sandler [Sat, 16 May 2015 03:59:36 +0000 (23:59 -0400)]
Make all icon fields & extras sent to listeners backward-compatible.
For final release, we will only be doing this for
notification listeners targeting older SDKs.
Bug:
21207612
Change-Id: I28fdaa5666698150ab455f9bfb63251b9418519e
Dirk Dougherty [Mon, 18 May 2015 21:22:24 +0000 (21:22 +0000)]
am
905bc335: am
bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
* commit '
905bc335a5f5e180ef52361d72a608bde4657b03':
Doc change: edits and image updates.
Rich Slogar [Mon, 18 May 2015 21:22:19 +0000 (21:22 +0000)]
am
54f2ca6e: am
348d105e: am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
54f2ca6ed4c8c224da932f2f63fdf2fbe03eea64':
docs: build-cmd-line-updates
Dirk Dougherty [Mon, 18 May 2015 21:17:51 +0000 (14:17 -0700)]
resolved conflicts for merge of
ab6d5376 to mnc-dev
Change-Id: Ice8e511bffa6a0bc3aec9e44c059a7dfde91d65f
Adam Powell [Thu, 14 May 2015 23:18:53 +0000 (16:18 -0700)]
Add Configuration data for round displays
Add round values to the screenLayout field for Configuration
and a convenience method to check roundness.
Plumb this through the DisplayManager, making roundness the property
of a DisplayAdapter. The built-in main display will read the
configuration resource config_mainBuiltInDisplayIsRound to determine
its roundness. Device-specific resource overlays should set this to
true for devices with round primary displays.
By default, this config resource inherits from the existing
config_windowIsRound value currently used by some Android Wear
device configurations.
This change awaits another for aapt/native resources code to make the
resource filtering system aware of this property.
Change-Id: I1daced7ca6d6e172789e7c32bebfd43753bfa2ae
Glenn Kasten [Tue, 12 May 2015 20:16:55 +0000 (13:16 -0700)]
Update documentation for short transfer counts
Bug:
10891562
Change-Id: I6e24917a508aa29f1f6f00aa8c891ad4978dc3e6
Jim Miller [Mon, 18 May 2015 20:55:00 +0000 (13:55 -0700)]
Attempt to fix bug with setActiveGroup() in FingerprintService.
This attempts to fix a crash where setActiveGroup is crashing because
there's no fingerprint hardware.
Attempt to fix bug
21224390
Change-Id: Iff1c6ebb68deb6662fcb4a58248b5a562d9da2c2
Zhijun He [Mon, 18 May 2015 20:42:11 +0000 (20:42 +0000)]
Merge "Camera2: stop log spamming when closing a closed camera" into mnc-dev
Glenn Kasten [Mon, 18 May 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Minor cleanup of comments and code" into mnc-dev
Daniel Sandler [Mon, 18 May 2015 20:21:23 +0000 (20:21 +0000)]
Merge "Make all icon fields & extras sent to listeners backward-compatible." into mnc-dev
Dan Sandler [Mon, 18 May 2015 20:11:23 +0000 (20:11 +0000)]
Merge "Remove references to nonexistant @android:string/ellipsis." into mnc-dev
Zhijun He [Mon, 18 May 2015 20:04:34 +0000 (13:04 -0700)]
Camera2: stop log spamming when closing a closed camera
Bug:
21268174
Change-Id: I711380c52f5ce9829a660c6e1b999b0377ea6c7b
Riley Andrews [Mon, 11 May 2015 23:11:01 +0000 (16:11 -0700)]
Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
Bug
21037890
Change-Id: Ieb29be3ff68f3db3f07df02f171325ed77915fdf
Riley Andrews [Thu, 13 Nov 2014 00:33:52 +0000 (16:33 -0800)]
Make return of screenshotApplications an ashmem immutable bitmap.
Bug
21037890
Change-Id: I47a2ba11d26ec03a6e2e847f5af61b44efa2aa69
Riley Andrews [Mon, 11 May 2015 23:08:22 +0000 (16:08 -0700)]
Add internal bitmap api for creating immutable ashmem backed bitmaps.
Bug
21037890
Change-Id: I827e83dd75e301e7d93ead5efdd744f0d8435ae5
Riley Andrews [Fri, 14 Nov 2014 01:43:25 +0000 (17:43 -0800)]
Use ashmem to optimize all bitmap copies.
Bug
21037890
Change-Id: Ie32ca3a0c527755f1a1b77db7548cb9629e2001b
Olawale Ogunwale [Mon, 18 May 2015 19:52:37 +0000 (19:52 +0000)]
Merge "Use the correct parent size to initialize animations" into mnc-dev
Paul Jensen [Mon, 18 May 2015 19:41:08 +0000 (19:41 +0000)]
Merge "Don't leak NetworkListens in captive portal app." into mnc-dev
Deepanshu Gupta [Mon, 18 May 2015 19:30:57 +0000 (19:30 +0000)]
Merge "Fix nav bar spacing for tablets." into mnc-dev
Deepanshu Gupta [Mon, 18 May 2015 18:58:31 +0000 (11:58 -0700)]
Fix nav bar spacing for tablets.
Change-Id: Ieee2c2174a3041a0f967cc75bbe74d8bf882ced7
Joe Fernandez [Mon, 18 May 2015 18:49:31 +0000 (18:49 +0000)]
am
71bbd81f: am
a06ac3a0: docs: M Preview Content Sync #1
* commit '
71bbd81f54f19eab99dd97f955e3de37e3f8e0a3':
docs: M Preview Content Sync #1
Luan Nguyen [Mon, 18 May 2015 18:49:24 +0000 (18:49 +0000)]
am
304ed716: am
e14ffac6: am
193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
* commit '
304ed7162de489cd1393b770460fe58a0ae91beb':
docs: Add tag heuer logo to wear landing page
Joe Fernandez [Mon, 18 May 2015 18:49:04 +0000 (18:49 +0000)]
am
14ba009a: am
6b4c3fed: docs: Refactor Google Services pages for site redesign
* commit '
14ba009a51cede3f3f4b0ae1d1e701939e3dd1dc':
docs: Refactor Google Services pages for site redesign
Dirk Dougherty [Mon, 18 May 2015 18:44:23 +0000 (18:44 +0000)]
am
bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
* commit '
bd5cf5de84d802d7858371cf1f06b47c7f7b56cf':
Doc change: edits and image updates.
Dirk Dougherty [Mon, 18 May 2015 18:33:16 +0000 (18:33 +0000)]
Merge "Doc change: edits and image updates." into mnc-preview-docs
Dirk Dougherty [Mon, 18 May 2015 18:32:09 +0000 (11:32 -0700)]
Doc change: edits and image updates.
Change-Id: Ic09da0c7cab676aa8ad4da9eae22e9c631fc288e
Derek Sollenberger [Mon, 18 May 2015 18:29:02 +0000 (14:29 -0400)]
Check that the parcel contained the expected amount of region data.
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
Jae Seo [Mon, 18 May 2015 18:10:29 +0000 (18:10 +0000)]
Merge "TIF: Pass the playback params as a whole" into mnc-dev
Jae Seo [Mon, 18 May 2015 18:05:33 +0000 (18:05 +0000)]
Merge "Make PlaybackParams parcelable" into mnc-dev
Jae Seo [Sat, 16 May 2015 00:15:48 +0000 (17:15 -0700)]
Make PlaybackParams parcelable
Bug:
21170699
Change-Id: I31b446e0b772bdfb65166564e48aa93cf73b74ae
Rich Slogar [Mon, 18 May 2015 17:39:00 +0000 (17:39 +0000)]
am
348d105e: am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
348d105e3590b167330356d2ae98d341d98cb18e':
docs: build-cmd-line-updates
Derek Sollenberger [Mon, 18 May 2015 17:37:06 +0000 (17:37 +0000)]
Merge "Ensure that unparcelling Region only reads the expected number of bytes" into mnc-dev
Lajos Molnar [Mon, 18 May 2015 17:32:14 +0000 (17:32 +0000)]
Merge "media: clarify valid values in PlaybackParams and SyncParams" into mnc-dev
Rich Slogar [Mon, 18 May 2015 17:24:50 +0000 (17:24 +0000)]
am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
4e793fba568950ee2b3758e1482006661430440e':
docs: build-cmd-line-updates
Eric Laurent [Mon, 18 May 2015 17:20:11 +0000 (17:20 +0000)]
Merge "AudioService: add missing audio becoming noisy intent" into mnc-dev
Rich Slogar [Mon, 18 May 2015 17:12:46 +0000 (17:12 +0000)]
Merge "docs: emulator updates" into lmp-docs
Rich Slogar [Mon, 18 May 2015 17:12:22 +0000 (17:12 +0000)]
Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
Abodunrinwa Toki [Mon, 18 May 2015 17:12:18 +0000 (17:12 +0000)]
Merge "Hide the floating toolbar faster." into mnc-dev
Jason Monk [Mon, 18 May 2015 17:07:31 +0000 (17:07 +0000)]
Merge "Show data icon when appropriate." into mnc-dev
Abodunrinwa Toki [Mon, 18 May 2015 16:56:53 +0000 (16:56 +0000)]
Merge "Support min/max height for FloatingToolbar overflow." into mnc-dev
Paul Jensen [Mon, 18 May 2015 16:48:28 +0000 (12:48 -0400)]
Don't leak NetworkListens in captive portal app.
Bug:
21146632
Change-Id: I934044a2eec89a47185add881a74de5669cd0f89