OSDN Git Service
Neil Fuller [Fri, 17 Oct 2014 14:59:41 +0000 (14:59 +0000)]
am
9b0109eb: am
c7aa8fe6: Merge "Removing some more FloatMath references"
* commit '
9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
Removing some more FloatMath references
Neil Fuller [Fri, 17 Oct 2014 14:54:17 +0000 (14:54 +0000)]
am
c7aa8fe6: Merge "Removing some more FloatMath references"
* commit '
c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
Removing some more FloatMath references
Neil Fuller [Fri, 17 Oct 2014 14:48:16 +0000 (14:48 +0000)]
Merge "Removing some more FloatMath references"
Jim Miller [Fri, 17 Oct 2014 09:35:06 +0000 (09:35 +0000)]
am
7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev
* commit '
7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
Fix getStorageEncryptionStatus() in DevicePolicyManager
Jim Miller [Fri, 17 Oct 2014 09:31:03 +0000 (09:31 +0000)]
Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev
Dirk Dougherty [Fri, 17 Oct 2014 09:24:36 +0000 (09:24 +0000)]
am
22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
* commit '
22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640':
Doc change: Add Lollipop to platform versions table.
Dirk Dougherty [Fri, 17 Oct 2014 09:21:28 +0000 (09:21 +0000)]
Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
Dirk Dougherty [Fri, 17 Oct 2014 09:16:58 +0000 (02:16 -0700)]
Doc change: Add Lollipop to platform versions table.
Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
smain@google.com [Fri, 17 Oct 2014 09:15:41 +0000 (09:15 +0000)]
am
c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev
* commit '
c8cef6ccbb470b66b99ec9286728bc875ead6ce7':
time to forget about honeycomb and gingerbread.
smain@google.com [Fri, 17 Oct 2014 09:15:37 +0000 (09:15 +0000)]
am
8adb5fd1: Merge "fix links on preview page" into lmp-dev
* commit '
8adb5fd14dae51faeb5b85b8cbcfc0930094e73f':
fix links on preview page
Dan Albert [Fri, 17 Oct 2014 09:02:25 +0000 (09:02 +0000)]
am
b9734228: (-s ours) am
69c8d39d: Merge "Clean up unused parameter warnings."
* commit '
b9734228046d541539ae7ce4f5ba22b9e2153e77':
Clean up unused parameter warnings.
smain@google.com [Fri, 17 Oct 2014 08:37:15 +0000 (08:37 +0000)]
Merge "time to forget about honeycomb and gingerbread." into lmp-dev
smain@google.com [Fri, 17 Oct 2014 08:35:12 +0000 (01:35 -0700)]
time to forget about honeycomb and gingerbread.
Change-Id: I74a1a62109f28b6ed08acee4761e25bfe8278257
smain@google.com [Fri, 17 Oct 2014 08:33:01 +0000 (08:33 +0000)]
Merge "edits to the lollipop highlights" into lmp-dev
automerge:
f19f639
* commit '
f19f639773e64289ed7345b8a1ea4dd244aa4882':
edits to the lollipop highlights
smain@google.com [Fri, 17 Oct 2014 08:32:19 +0000 (08:32 +0000)]
Merge "fix links on preview page" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 08:31:24 +0000 (01:31 -0700)]
fix links on preview page
Change-Id: If2c3380dcb3ecc2770ba84fd6599ba69ea0a33f2
smain@google.com [Fri, 17 Oct 2014 08:18:46 +0000 (08:18 +0000)]
Merge "edits to the lollipop highlights" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 08:06:37 +0000 (01:06 -0700)]
edits to the lollipop highlights
Change-Id: I7efaae064780c3f778f25d11e9378852c11eb5eb
Joe Fernandez [Fri, 17 Oct 2014 07:50:30 +0000 (07:50 +0000)]
am
e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev
* commit '
e7cc9e8089db48fd0d3d61e0494b2567d87dd711':
docs: Android TV docs fixes for L SDK release
Joe Fernandez [Fri, 17 Oct 2014 07:43:01 +0000 (07:43 +0000)]
Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev
Dan Albert [Fri, 17 Oct 2014 07:38:20 +0000 (07:38 +0000)]
am
69c8d39d: Merge "Clean up unused parameter warnings."
* commit '
69c8d39d1f9ebb55844ad7794d12fedf8b5be5bf':
Clean up unused parameter warnings.
Joe Fernandez [Fri, 17 Oct 2014 07:01:58 +0000 (00:01 -0700)]
docs: Android TV docs fixes for L SDK release
Change-Id: Ie37c2056844e1c04542ed4e556a6577640e13819
smain@google.com [Fri, 17 Oct 2014 07:10:17 +0000 (07:10 +0000)]
Merge "add TV quality page to Develop landing carousel" into lmp-dev
automerge:
4561be0
* commit '
4561be01934cdc462570b56afb4c602cbf3295c4':
add TV quality page to Develop landing carousel
Scott Rowe [Fri, 17 Oct 2014 07:09:17 +0000 (07:09 +0000)]
docs: Notifications changes for L
automerge:
dd88668
* commit '
dd88668392839509c812a544b1132185b3825b69':
docs: Notifications changes for L
Joe Fernandez [Fri, 17 Oct 2014 07:08:22 +0000 (07:08 +0000)]
Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
automerge:
4deed3e
* commit '
4deed3ecc3b47d520ca6084f2fa6ad7a9dc8c018':
docs: Android TV App Quality Requirements v2
smain@google.com [Fri, 17 Oct 2014 06:51:42 +0000 (06:51 +0000)]
Merge "add TV quality page to Develop landing carousel" into lmp-dev
Scott Rowe [Mon, 6 Oct 2014 18:49:54 +0000 (11:49 -0700)]
docs: Notifications changes for L
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
Scott Rowe [Fri, 17 Oct 2014 06:40:37 +0000 (06:40 +0000)]
docs: Displaying a Now Playing Card
automerge:
6bd081c
* commit '
6bd081ca8a555fd71fbe856374b8efe68ede6144':
docs: Displaying a Now Playing Card
Joe Fernandez [Fri, 17 Oct 2014 06:38:36 +0000 (06:38 +0000)]
Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
Joe Fernandez [Sat, 11 Oct 2014 04:36:46 +0000 (21:36 -0700)]
docs: Android TV App Quality Requirements v2
Change-Id: I54c53d90faf1605945bb8397278b9057a9c687f4
Scott Rowe [Wed, 15 Oct 2014 21:27:25 +0000 (14:27 -0700)]
docs: Displaying a Now Playing Card
Change-Id: I68cd305618caff24cf2de564d7b085c663702d0c
smain@google.com [Fri, 17 Oct 2014 06:17:52 +0000 (23:17 -0700)]
add TV quality page to Develop landing carousel
Change-Id: I736654e248645bfda7f94156b8c0f520a8be4bac
Joe Fernandez [Fri, 17 Oct 2014 05:49:27 +0000 (05:49 +0000)]
Merge "docs: Recents screen for tasks and activities" into lmp-dev
automerge:
321e764
* commit '
321e7645c305dbc4f7444d364c879bad8946da2b':
docs: Recents screen for tasks and activities
Joe Fernandez [Fri, 17 Oct 2014 05:40:42 +0000 (05:40 +0000)]
Merge "docs: Recents screen for tasks and activities" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 05:33:46 +0000 (05:33 +0000)]
Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
automerge:
c640089
* commit '
c6400892b56ee217ed01a41abb769fb1aebc9830':
add Lollipop highlights and revision to 5.0 API overview intro
Joe Fernandez [Fri, 17 Oct 2014 05:33:00 +0000 (05:33 +0000)]
Merge "Android 5.0 changes to IME switching" into lmp-dev
automerge:
d664dc9
* commit '
d664dc93f47e32df865384718055b200585e0e88':
Android 5.0 changes to IME switching
smain@google.com [Fri, 17 Oct 2014 05:17:01 +0000 (05:17 +0000)]
Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
Scott Rowe [Mon, 15 Sep 2014 21:08:44 +0000 (14:08 -0700)]
docs: Recents screen for tasks and activities
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
smain@google.com [Fri, 17 Oct 2014 05:15:18 +0000 (22:15 -0700)]
add Lollipop highlights and revision to 5.0 API overview intro
Change-Id: Ic50db6ea2ea9893088f271ce2427ccda69fc6b75
Joe Fernandez [Fri, 17 Oct 2014 05:04:44 +0000 (05:04 +0000)]
Merge "docs: Update Android TV home for L announcement" into lmp-dev
automerge:
c49acf0
* commit '
c49acf029e65928d07815631a0160fe179458add':
docs: Update Android TV home for L announcement
David Friedman [Fri, 17 Oct 2014 05:03:52 +0000 (05:03 +0000)]
Merge "Notificiations Design for Android L Release" into lmp-dev
automerge:
c2a556f
* commit '
c2a556ffe8a5949a0e3d7baf8122ea38b4ae1d30':
Notificiations Design for Android L Release
David Friedman [Fri, 17 Oct 2014 05:03:06 +0000 (05:03 +0000)]
Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev
automerge:
597d386
* commit '
597d3861298d8c3e2bc50c92ecffb4003cd265f7':
NDK-r10c release notes (change log) for publication to NDK page on DAC.
Joe Fernandez [Fri, 17 Oct 2014 05:01:02 +0000 (05:01 +0000)]
Merge "Android 5.0 changes to IME switching" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 04:58:02 +0000 (04:58 +0000)]
Merge "docs: Update Android TV home for L announcement" into lmp-dev
David Friedman [Wed, 8 Oct 2014 17:38:31 +0000 (10:38 -0700)]
Android 5.0 changes to IME switching
Change-Id: I158736ee36706889a5277f02a652162194289514
David Friedman [Fri, 17 Oct 2014 04:48:31 +0000 (04:48 +0000)]
Merge "Notificiations Design for Android L Release" into lmp-dev
David Friedman [Thu, 2 Oct 2014 22:23:45 +0000 (15:23 -0700)]
Notificiations Design for Android L Release
Change-Id: I32723dafa2d3bd455da9c6e03c09c668b2bd6446
Joe Fernandez [Fri, 10 Oct 2014 05:18:03 +0000 (22:18 -0700)]
docs: Update Android TV home for L announcement
Change-Id: Ie98da5efa59dd3c797dda38bb465b7cc66b4d2e7
David Friedman [Fri, 17 Oct 2014 04:30:27 +0000 (04:30 +0000)]
Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev
David Friedman [Tue, 14 Oct 2014 04:45:44 +0000 (21:45 -0700)]
NDK-r10c release notes (change log) for publication to NDK page on DAC.
Change-Id: I0f8bc87b741ec1ef978c3fc22954d43519172299
smain@google.com [Fri, 17 Oct 2014 02:12:42 +0000 (02:12 +0000)]
update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
automerge:
271078f
* commit '
271078f50dc730e0fda8e80c66b81ac2442f64f0':
update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
Ricardo Cervera [Fri, 17 Oct 2014 02:11:44 +0000 (02:11 +0000)]
Merge "docs: Migrating material design info from the Preview site" into lmp-dev
automerge:
2e57c2c
* commit '
2e57c2c956588b3f08111c323e811d4cbe46dabd':
docs: Migrating material design info from the Preview site
smain@google.com [Fri, 10 Oct 2014 00:00:20 +0000 (17:00 -0700)]
update L preview landing page for 5.0 SDK launch
includes new system images
also update the DAC homepage announcement
Change-Id: I6e249e4ec5ef4b4329b145b334b31cfe11dd136c
Ricardo Cervera [Fri, 17 Oct 2014 01:06:05 +0000 (01:06 +0000)]
Merge "docs: Migrating material design info from the Preview site" into lmp-dev
Quddus Chong [Fri, 17 Oct 2014 00:59:03 +0000 (00:59 +0000)]
Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
automerge:
67b5c8e
* commit '
67b5c8ebc4a9895e065a9314cb9afbf8e3e60197':
docs: Updates to Android 5.0 API Overview.
Ricardo Cervera [Thu, 9 Oct 2014 00:00:30 +0000 (17:00 -0700)]
docs: Migrating material design info from the Preview site
Change-Id: I3a2f71e41cc1371b8cce2d8860b116cf0f8b8ed2
Quddus Chong [Fri, 17 Oct 2014 00:39:30 +0000 (00:39 +0000)]
Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
Dan Albert [Fri, 17 Oct 2014 00:03:05 +0000 (00:03 +0000)]
Merge "Clean up unused parameter warnings."
Dan Albert [Thu, 16 Oct 2014 23:55:29 +0000 (16:55 -0700)]
Clean up unused parameter warnings.
Change-Id: Ifbf310a0c10bd6afc3099bcad1026990bd1e6a22
Christopher Tate [Thu, 16 Oct 2014 21:31:54 +0000 (21:31 +0000)]
am
040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
* commit '
040d89bb0a4563d93073b7a27b3f201ce11dcf58':
Eliminate race condition around backup completion + resumption
Christopher Tate [Thu, 16 Oct 2014 21:26:25 +0000 (21:26 +0000)]
Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 21:14:32 +0000 (21:14 +0000)]
am
6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev
* commit '
6b53fb6227b884db2761fa146ed2f4f28100962d':
docs: Updating support library pages for v.21.
Andrew Solovay [Thu, 16 Oct 2014 21:10:19 +0000 (21:10 +0000)]
Merge "docs: Updating support library pages for v.21." into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 21:09:45 +0000 (21:09 +0000)]
am
4461e926: Merge "docs: Restored the preview license." into lmp-dev
* commit '
4461e9268ba010f9cd6e8881a57b7af7b031ea31':
docs: Restored the preview license.
Andrew Solovay [Thu, 16 Oct 2014 21:01:06 +0000 (21:01 +0000)]
Merge "docs: Restored the preview license." into lmp-dev
Andrew Solovay [Tue, 14 Oct 2014 19:23:31 +0000 (12:23 -0700)]
docs: Restored the preview license.
Added the preview license back, with changes as previously negotiated
with legal.
See first comment for staging directory link.
Change-Id: Ibc23d4d89b4380546d61ed052ba15dc81b8b1336
Christopher Tate [Thu, 16 Oct 2014 20:44:00 +0000 (13:44 -0700)]
Eliminate race condition around backup completion + resumption
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state. Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.
Bug
17931760
Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
Rich Slogar [Thu, 16 Oct 2014 20:45:28 +0000 (20:45 +0000)]
am
60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
* commit '
60e74b4924dee6d033ca61854cac42768006ced5':
:docs Platform Tools Rel Note Nexus 6/9 dpi updates
Rich Slogar [Thu, 16 Oct 2014 20:41:17 +0000 (20:41 +0000)]
Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev
Svet Ganov [Thu, 16 Oct 2014 19:40:16 +0000 (19:40 +0000)]
am
b22552c3: Merge "Send accessibility events with no window." into lmp-dev
* commit '
b22552c35bc939619c2e7c967e4eae618d8b93cc':
Send accessibility events with no window.
Svet Ganov [Thu, 16 Oct 2014 19:35:40 +0000 (19:35 +0000)]
Merge "Send accessibility events with no window." into lmp-dev
Rich Slogar [Thu, 16 Oct 2014 19:07:35 +0000 (12:07 -0700)]
:docs Platform Tools Rel Note Nexus 6/9 dpi updates
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
Scott Rowe [Thu, 16 Oct 2014 18:32:17 +0000 (18:32 +0000)]
am
447369f2: am
a1e3063e: am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
447369f2d2b02f78d01d4a4923fedfca96c1950f':
docs: update reference to FragmentRetainInstance
Joe Fernandez [Thu, 16 Oct 2014 18:32:13 +0000 (18:32 +0000)]
am
7e19b402: am
2f9ea27c: am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
7e19b402c6651112a56ab8569ea53a7004a3a552':
Typo fixed in sample code
Scott Rowe [Thu, 16 Oct 2014 18:23:42 +0000 (18:23 +0000)]
am
a1e3063e: am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
a1e3063ebe04c8c304f48a02117085962f75cb63':
docs: update reference to FragmentRetainInstance
Joe Fernandez [Thu, 16 Oct 2014 18:23:18 +0000 (18:23 +0000)]
am
2f9ea27c: am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
2f9ea27c6c95fa53eef0228edc0b3f63dbeb21e7':
Typo fixed in sample code
David Friedman [Thu, 16 Oct 2014 18:10:38 +0000 (18:10 +0000)]
am
d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
* commit '
d12e6de645a39e6e902785d544100fb1963aa203':
OpenGL 3.1 and AEP documentation for L-release.
David Friedman [Thu, 16 Oct 2014 18:05:59 +0000 (18:05 +0000)]
Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
Quddus Chong [Thu, 16 Oct 2014 01:03:27 +0000 (18:03 -0700)]
docs: Updates to Android 5.0 API Overview.
Change-Id: I0dcbb134fc499da0172bfe8d79c5aaa1a4b3ef75
Svet Ganov [Thu, 16 Oct 2014 16:18:34 +0000 (09:18 -0700)]
Send accessibility events with no window.
An app can send an accessibility event by calling the send methods
on view or directly asking the accessibility manager to do that.
While the recommened way to send such events is calling the methods
on view a legacy app or app whose developer did not read the docs
carefully may be calling the accessibility manager APIs directly.
In such a case the event does not have assigned window id and does
not get send. Since events fired by using the accessibility manager
directly lack context to determine whether thier source is important
for accessibility we assume they come from an important view to
avoid breaking backwards compatibility.
bug:
18001711
Change-Id: Ie1c298fa5a0670cbeaedfcd64f820961c296b6ca
Andrew Solovay [Thu, 2 Oct 2014 18:23:42 +0000 (11:23 -0700)]
docs: Updating support library pages for v.21.
For doc stage location, see my comment of Oct 13 3:47 PM.
Change-Id: I4da98448cd95451c82b4e8198dcd95edf64398b8
Rich Slogar [Thu, 16 Oct 2014 17:15:35 +0000 (17:15 +0000)]
am
70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
* commit '
70807ab128c544b972f3710e53eeedd0d40dce2a':
docs:Build and Platform Tools Updates for Android 5
Rich Slogar [Thu, 16 Oct 2014 17:10:47 +0000 (17:10 +0000)]
Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
Andrew Solovay [Thu, 16 Oct 2014 17:08:20 +0000 (17:08 +0000)]
am
34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
* commit '
34ef4ff9b7a3625477b0eccd20db15129f2732f3':
Moved TV Input Framework (TIF) page out of preview.
Andrew Solovay [Thu, 16 Oct 2014 17:03:01 +0000 (17:03 +0000)]
Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev
Rich Slogar [Thu, 9 Oct 2014 22:45:25 +0000 (15:45 -0700)]
docs:Build and Platform Tools Updates for Android 5
Change-Id: Ib7adf35c302d24a1c2394a89b3a04ca8d77cd296
Scott Rowe [Thu, 16 Oct 2014 17:01:04 +0000 (17:01 +0000)]
am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
ab64919c0e683dcd0f32f95f580f0d95ce29476d':
docs: update reference to FragmentRetainInstance
Scott Rowe [Thu, 16 Oct 2014 16:56:54 +0000 (16:56 +0000)]
Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
Scott Rowe [Thu, 16 Oct 2014 16:45:05 +0000 (16:45 +0000)]
am
8f93624e: docs: delete preview pages
* commit '
8f93624eafd3518d97c88506bbb9a93c81eb7f03':
docs: delete preview pages
Scott Rowe [Wed, 8 Oct 2014 23:39:36 +0000 (16:39 -0700)]
docs: delete preview pages
Change-Id: I76b6b8545bfed3ad0604043105ccf4795ab8be62
Prerepa Viswanadham [Thu, 16 Oct 2014 16:11:36 +0000 (16:11 +0000)]
am
248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
* commit '
248edc3e969217aec1fcce7f324cbae6c46da0a3':
Update javadoc comments for getBluetoothLeAdvertiser()
Prerepa Viswanadham [Wed, 15 Oct 2014 23:36:01 +0000 (16:36 -0700)]
Update javadoc comments for getBluetoothLeAdvertiser()
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities
bug:
18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
Joe Fernandez [Thu, 16 Oct 2014 14:39:16 +0000 (14:39 +0000)]
am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
58c64870a8f3505d032ec7c5ac0fc4faba08347a':
Typo fixed in sample code
Joe Fernandez [Thu, 16 Oct 2014 14:34:46 +0000 (14:34 +0000)]
Merge "Typo fixed in sample code" into klp-modular-docs
Neil Fuller [Thu, 16 Oct 2014 09:32:33 +0000 (09:32 +0000)]
am
8a3785ca: am
fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '
8a3785cafec4b47fe8d61614b04a0e193d616428':
Replacing FloatMath native implementation with calls to Math
Neil Fuller [Thu, 16 Oct 2014 09:24:18 +0000 (09:24 +0000)]
am
fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '
fd2d41b742339d278f4a66f78a7c161108985ed8':
Replacing FloatMath native implementation with calls to Math
Lorenzo Colitti [Thu, 16 Oct 2014 09:22:52 +0000 (09:22 +0000)]
am
b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit '
b7d8514822aefbf8274f5464dc12cee151e2b78b':
Allow root and system to bypass the always-on VPN firewall rules
Lorenzo Colitti [Thu, 16 Oct 2014 09:22:47 +0000 (09:22 +0000)]
am
917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '
917c547beb9adecf2e7d2b355e85e37c2557c5d3':
Don't make lockdown VPN source firewall rules over-broad.
Lorenzo Colitti [Thu, 16 Oct 2014 09:22:42 +0000 (09:22 +0000)]
am
28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '
28dcf0345b2857884c1f1639fadb720318445187':
Propagate network state changes to the LockdownVpnTracker.
Lorenzo Colitti [Thu, 16 Oct 2014 08:46:03 +0000 (08:46 +0000)]
Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev