OSDN Git Service
Tobias Thierer [Wed, 17 Aug 2016 17:54:08 +0000 (17:54 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""
am:
7f5095ddfe
Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410
Tobias Thierer [Wed, 17 Aug 2016 17:11:01 +0000 (17:11 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.
This reverts commit
778321361132672ea1174e4ca3f5397477c32690.
Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
Phil Burk [Wed, 17 Aug 2016 17:03:47 +0000 (17:03 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()" am:
c5b376ab66
am:
86fbbfb6f0
Change-Id: I938d0365abffe9cb05a7c10d80562e3742290853
Tobias Thierer [Wed, 17 Aug 2016 17:03:44 +0000 (17:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60." am:
ec6a323da2
am:
17fea8b967
Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
Phil Burk [Wed, 17 Aug 2016 16:59:06 +0000 (16:59 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
am:
c5b376ab66
Change-Id: I20fcf969489fda53e60ad3642f955ae346ec9868
Tobias Thierer [Wed, 17 Aug 2016 16:54:30 +0000 (16:54 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
am:
ec6a323da2
Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
Tobias Thierer [Wed, 17 Aug 2016 16:54:08 +0000 (16:54 +0000)]
Revert "Track libcore update of Map classes to jdk8u60"
am:
7783213611
Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
Tobias Thierer [Wed, 17 Aug 2016 16:54:05 +0000 (16:54 +0000)]
Track libcore update of Map classes to jdk8u60
am:
fb2ade3dca
Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
Tobias Thierer [Wed, 17 Aug 2016 14:50:59 +0000 (14:50 +0000)]
Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.
Bug:
30911913
This reverts commit
fb2ade3dcab0962f18acab720875c75622f412ed.
Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
Treehugger Robot [Wed, 17 Aug 2016 13:57:33 +0000 (13:57 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
Tobias Thierer [Thu, 11 Aug 2016 18:47:02 +0000 (19:47 +0100)]
Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640
This CL requires base CLs, which will get merged from aosp-master,
in order to build.
Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
Tobias Thierer [Wed, 17 Aug 2016 10:03:52 +0000 (10:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
Phil Burk [Tue, 5 Apr 2016 18:25:36 +0000 (11:25 -0700)]
UsbMidiDevice: fix MIDI flush()
The proxy MidiReceiver in the USB device was not forwarding the flush
command to the event scheduler.
Bug:
25511696
Change-Id: I6a4759b71bc8f9ae3e20aed1238f62a2ed405e24
Signed-off-by: Phil Burk <philburk@google.com>
Tobias Thierer [Fri, 5 Aug 2016 18:58:02 +0000 (19:58 +0100)]
Track libcore update of Map classes to jdk8u60.
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.
Test: make update-api
Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:31:42 +0000 (02:31 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
ea537bf5b3
am:
9c0b881c9d
Change-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:23:48 +0000 (02:23 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
ea537bf5b3
Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4
Treehugger Robot [Tue, 16 Aug 2016 02:12:38 +0000 (02:12 +0000)]
Merge "Fix google-explicit-constructor warnings."
Dirk Dougherty [Tue, 16 Aug 2016 01:29:51 +0000 (01:29 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am:
114c09498d
Change-Id: I436715dc13b9b9e8abc8d5c84d04e1e203269e7a
Dirk Dougherty [Tue, 16 Aug 2016 01:29:47 +0000 (01:29 +0000)]
Doc change: escape lt char in generic type in pre block.
am:
1035b25825
Change-Id: Iecc647ac91d9d6d452091c214138a6e650babac0
Dirk Dougherty [Tue, 16 Aug 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Chih-Hung Hsieh [Mon, 15 Aug 2016 21:45:02 +0000 (14:45 -0700)]
Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
Julius D'souza [Mon, 15 Aug 2016 19:47:43 +0000 (19:47 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours
am:
f51dfc24d1 -s ours
Change-Id: I1afeaa3f5321c536cad22455881b36582b468748
Julius D'souza [Mon, 15 Aug 2016 19:33:29 +0000 (19:33 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours
am:
0903c5fe7a -s ours
Change-Id: Iba7ccc2ec071ea8c13d146b39aab48d2f4fc4977
Julius D'souza [Mon, 15 Aug 2016 19:25:33 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
am:
13edf0a70b -s ours
Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
Julius D'souza [Fri, 5 Aug 2016 21:34:38 +0000 (14:34 -0700)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.
Bug:
30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
David Gross [Mon, 15 Aug 2016 17:23:24 +0000 (17:23 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
am:
8cb4ca439e
Change-Id: I76c6a8ebc739daa1aa124fecccf6fcc341e8fd7a
David Gross [Mon, 15 Aug 2016 17:23:18 +0000 (17:23 +0000)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
am:
b50e856fc7
Change-Id: Iad5173dfd05c77284d74bbff2c095d91064a941f
David Gross [Mon, 15 Aug 2016 17:17:01 +0000 (17:17 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
Phil Weaver [Fri, 12 Aug 2016 21:05:00 +0000 (21:05 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
157f416a35
Change-Id: Ib6c15ab515cf7d2b4bd55453b195bf82d225f272
Elliott Hughes [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1
am:
2f4c6e3d0d
Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff
Elliott Hughes [Fri, 12 Aug 2016 19:58:55 +0000 (19:58 +0000)]
Merge "recvfrom takes a non-const pointer."
am:
96660b37a1
Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
Treehugger Robot [Fri, 12 Aug 2016 19:48:38 +0000 (19:48 +0000)]
Merge "recvfrom takes a non-const pointer."
Chih-Hung Hsieh [Fri, 12 Aug 2016 19:30:02 +0000 (19:30 +0000)]
resolve merge conflicts of
17bd236 to stage-aosp-master
am:
b3d46b44a3
Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62
Chih-Hung Hsieh [Fri, 12 Aug 2016 18:35:17 +0000 (11:35 -0700)]
resolve merge conflicts of
17bd236 to stage-aosp-master
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
David Gross [Fri, 12 Aug 2016 18:06:29 +0000 (11:06 -0700)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
to Android 2.3 (API level 9).
Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.
Miscellaneous minor editorial changes.
Bug:
27299393
Bug:
30000147
Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
(cherry picked from commit
05eef3040ed1bbd7640151b395072b8264b6d53d)
Chih-hung Hsieh [Fri, 12 Aug 2016 18:05:32 +0000 (18:05 +0000)]
Merge "Fix clang-tidy warnings in aapt and aapt2."
Elliott Hughes [Fri, 12 Aug 2016 17:53:48 +0000 (10:53 -0700)]
recvfrom takes a non-const pointer.
Change-Id: Ib2c8f2710cb333904106f849f492c83697fdd937
Chih-Hung Hsieh [Fri, 12 Aug 2016 00:31:29 +0000 (00:31 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
am:
ed935c32f4
Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:48:46 +0000 (16:48 -0700)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
Treehugger Robot [Thu, 11 Aug 2016 23:20:47 +0000 (23:20 +0000)]
Merge "Fix clang-tidy warnings in libs/hwui."
Jakub Pawlowski [Thu, 11 Aug 2016 23:05:49 +0000 (23:05 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master
am:
5aa4ba3776
Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872
Jakub Pawlowski [Thu, 11 Aug 2016 22:53:06 +0000 (15:53 -0700)]
resolve merge conflicts of
5671277 to stage-aosp-master
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
Jakub Pawlowski [Thu, 11 Aug 2016 22:32:22 +0000 (22:32 +0000)]
Merge "Add LE Secure Connection data parsing (1/4)"
Chih-Hung Hsieh [Wed, 10 Aug 2016 21:15:30 +0000 (14:15 -0700)]
Fix clang-tidy warnings in aapt and aapt2.
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug:
28341362
* Use const reference type for read-only parameters.
Bug:
30407689
* Use const reference type to avoid unnecessary copy.
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Jakub Pawlowski [Thu, 28 Jul 2016 12:21:36 +0000 (05:21 -0700)]
Add LE Secure Connection data parsing (1/4)
Bug:
30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
Phil Weaver [Fri, 5 Aug 2016 18:23:50 +0000 (11:23 -0700)]
Limit capabilities of a11y gesture dispatch.
Changing the service side to accept descriptions of
motion events, not motion events themselves, so we can
control their creation.
Bug:
30647115
Change-Id: Ia6772a1fc05df91818e3f88959d1e2b4a35fe0cc
(cherry picked from commit
a8918f23c712e97fa1dc4911f64827d64fc906e5)
Hans Boehm [Thu, 11 Aug 2016 17:32:34 +0000 (17:32 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am:
d0197ac340
am:
c97c9dbd96
Change-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d
Hans Boehm [Thu, 11 Aug 2016 17:28:07 +0000 (17:28 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter"
am:
d0197ac340
Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
Hans Boehm [Thu, 11 Aug 2016 17:18:21 +0000 (17:18 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter"
smain@google.com [Thu, 11 Aug 2016 16:42:50 +0000 (16:42 +0000)]
add info about how to return default values from android.jar bug:
30757670
am:
abfa7e2c65
Change-Id: I45cdaec2d7e1b3c4bfb7b283a8ac581e2c87df95
smain@google.com [Wed, 10 Aug 2016 19:59:24 +0000 (12:59 -0700)]
add info about how to return default values from android.jar
bug:
30757670
Change-Id: I84e1624cbe7ae8d5e4e2886d4e8f61d621729464
Hans Boehm [Thu, 11 Aug 2016 02:56:50 +0000 (19:56 -0700)]
Do not stack allocate RefBase object in AaptAssets::filter
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.
Bug:
30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
Chih-Hung Hsieh [Wed, 10 Aug 2016 21:08:35 +0000 (14:08 -0700)]
Fix clang-tidy warnings in libs/hwui.
* Add explicit keyword to conversion constructors.
Bug:
28341362
* Use const reference type for read-only parameters.
Bug:
30407689
Test: build with WITH_TIDY=1
Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Robert Greenwalt [Wed, 10 Aug 2016 21:29:31 +0000 (21:29 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am:
2438a33e54
am:
bda5769701
Change-Id: I921e50e48b0c93e31fa3d172c850629312f322e6
Robert Greenwalt [Wed, 10 Aug 2016 21:20:39 +0000 (21:20 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
am:
2438a33e54
Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71
Robert Greenwalt [Wed, 10 Aug 2016 21:07:25 +0000 (21:07 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
Chris Tate [Wed, 10 Aug 2016 18:04:07 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af am:
1d64d33ba8 -s ours
am:
924b57b42c
Change-Id: Icb2821341904697bb348220bb18c668cdc8dfddb
Christopher Tate [Wed, 10 Aug 2016 18:04:00 +0000 (18:04 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c am:
6ea7b630c2 -s ours
am:
5eac1c2544
Change-Id: I2e18c58c476c63535962c294c6a63716e536310b
Chris Tate [Wed, 10 Aug 2016 17:55:56 +0000 (17:55 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af
am:
1d64d33ba8 -s ours
Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a
Christopher Tate [Wed, 10 Aug 2016 17:55:47 +0000 (17:55 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c
am:
6ea7b630c2 -s ours
Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414
Chris Tate [Wed, 10 Aug 2016 17:44:52 +0000 (17:44 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c
am:
a8e21860af
Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1
Christopher Tate [Wed, 10 Aug 2016 17:44:50 +0000 (17:44 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107
am:
aac7d0442c
Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325
Chris Tate [Wed, 10 Aug 2016 17:28:30 +0000 (17:28 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
am:
72933c623c
Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c
Christopher Tate [Wed, 10 Aug 2016 17:28:28 +0000 (17:28 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M
am:
d6f3a11107
Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1
Chris Tate [Wed, 10 Aug 2016 17:15:26 +0000 (17:15 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
zhangshuxiao [Tue, 9 Aug 2016 10:48:04 +0000 (18:48 +0800)]
[NetworkPolicy]: Fixes the crash issues caused by null pointer.
When handleRegisterNetworkAgent in ConnectivityService,
the networkinfo of NetworkAgentInfo will be set to null.
So we need to handle the null pointer of state.networkInfo.
Change-Id: I2a278f1f1b2455057fd2ed323ff4df340c3cbca9
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
Hemal Patel [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6
am:
b6962dee09
Change-Id: Ifa4bcea1c47cfdfe00a36d8ad11c5aeaeeb71175
Hemal Patel [Tue, 9 Aug 2016 21:10:34 +0000 (21:10 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6
am:
dabee01e9b
Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
Hemal Patel [Tue, 9 Aug 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77
am:
3c49a4b761
Change-Id: I81d45c0ddc35a34da756808ccfb89017b286f261
Hemal Patel [Tue, 9 Aug 2016 21:10:24 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ic306fd462773e6b6b457a0f8c1ee4a5bd931be22
Hemal Patel [Tue, 9 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
am:
5ca44906c6
Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
Hemal Patel [Tue, 9 Aug 2016 21:03:13 +0000 (21:03 +0000)]
Docs: Fixed the link that loads Fragments guide
am:
a8e1c75bf6
Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
Hemal Patel [Tue, 9 Aug 2016 21:03:06 +0000 (21:03 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
am:
a70c722c77
Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
Hemal Patel [Tue, 9 Aug 2016 21:03:00 +0000 (21:03 +0000)]
Docs: Changed custom_toast to toast_layout
am:
3b7309d753
Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
Hemal Patel [Tue, 9 Aug 2016 20:55:34 +0000 (20:55 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
Hemal Patel [Tue, 9 Aug 2016 20:53:11 +0000 (20:53 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
Chad Brubaker [Tue, 9 Aug 2016 19:50:35 +0000 (19:50 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31
am:
6e1f860c6a
Change-Id: I5c1f4d9785e56777e37da614ed6515113ae277c1
Chad Brubaker [Tue, 9 Aug 2016 19:43:50 +0000 (19:43 +0000)]
Merge "Add stub isCTVerificationRequired methods"
am:
5b63231a31
Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
Shawn Willden [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I8f350a045c1eb301418a91edfd975a388298507b
Shawn Willden [Tue, 9 Aug 2016 19:38:20 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Ic680cc75dbe80b57876dae701551cacfe2022086
Chad Brubaker [Tue, 9 Aug 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Add stub isCTVerificationRequired methods"
Shawn Willden [Tue, 9 Aug 2016 19:01:04 +0000 (19:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
am:
3188f77658
Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99
Shawn Willden [Tue, 9 Aug 2016 19:01:00 +0000 (19:01 +0000)]
Fix @link tags in keystore doc
am:
3f0526ea09
Change-Id: I3162cbf57341ab231b84544c04e02d2062dbd304
TreeHugger Robot [Tue, 9 Aug 2016 18:35:07 +0000 (18:35 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
Yi Kong [Tue, 9 Aug 2016 18:15:56 +0000 (18:15 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee
am:
2ae4d32ca3
Change-Id: I279138f6f7d585b2358537f129561d04c531dd00
Yi Kong [Tue, 9 Aug 2016 18:07:29 +0000 (18:07 +0000)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
am:
19df48b93b
Change-Id: I7fba48c95191b4a53acff70e89d59e30d3eb8e90
Yi Kong [Tue, 9 Aug 2016 18:07:12 +0000 (18:07 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7"
am:
67aaa079ee
Change-Id: I8b0bb02aca968de0baa7864cf4e123e4dd60b594
Yi Kong [Tue, 9 Aug 2016 17:59:07 +0000 (17:59 +0000)]
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit
f646aa14cdbf34e8784c0411d0baca26e364c1dc)
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
Neil Fuller [Tue, 9 Aug 2016 16:26:46 +0000 (16:26 +0000)]
Merge "Tidy up MockWebServer usage" am:
294ab080f4
am:
d0dc901341
Change-Id: I611d9e21a8e70e2e99de078e5218e34961cf7ee7
Neil Fuller [Tue, 9 Aug 2016 16:16:54 +0000 (16:16 +0000)]
Merge "Tidy up MockWebServer usage"
am:
294ab080f4
Change-Id: Ia22ce1e949ba3b611c0f2be60b3dbbafef7e4bb6
Neil Fuller [Tue, 9 Aug 2016 16:05:38 +0000 (16:05 +0000)]
Merge "Tidy up MockWebServer usage"
Neil Fuller [Tue, 9 Aug 2016 10:54:32 +0000 (10:54 +0000)]
Merge "Add a finalize() method to StrictJarFile" am:
d0c0c8dcab
am:
2ffb7ebae2
Change-Id: Ie947e8447ecd8e9a61b6d1115174180e41d74311
Neil Fuller [Tue, 9 Aug 2016 10:49:58 +0000 (10:49 +0000)]
Merge "Add a finalize() method to StrictJarFile"
am:
d0c0c8dcab
Change-Id: Iccab49c98b105aff6105e21274fbc099d10ecb55
Neil Fuller [Tue, 9 Aug 2016 10:43:18 +0000 (10:43 +0000)]
Merge "Add a finalize() method to StrictJarFile"
Tobias Thierer [Tue, 9 Aug 2016 09:07:43 +0000 (09:07 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged." am:
f61a449ee9
am:
8431c55fb8
Change-Id: I9b75016ac643c5bab03589ec82a4946fc2d9720e
Tobias Thierer [Tue, 9 Aug 2016 09:02:27 +0000 (09:02 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
am:
f61a449ee9
Change-Id: I826c175547a73123cd438ebe6991efee39a433d0
Tobias Thierer [Tue, 9 Aug 2016 08:55:34 +0000 (08:55 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:16 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am:
87c2ed97b8
Change-Id: If031e6c264ecaf23b32b62ac8d0e1036959d242d