OSDN Git Service
Quddus Chong [Mon, 20 Apr 2015 23:29:30 +0000 (23:29 +0000)]
am
b1c838e0: am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
b1c838e03bf9f828e59deed57a7e7445cc2ad9e8':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 23:15:17 +0000 (23:15 +0000)]
am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
6f14200880a79a9813f3448c15fe7097c3b7733b':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 23:03:32 +0000 (23:03 +0000)]
am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
220f360e02ae833fcadc342756932f76f6780626':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 22:51:40 +0000 (22:51 +0000)]
am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
900831f303beb4a67a871d969ac822d8b6d36460':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Fri, 17 Apr 2015 22:01:16 +0000 (15:01 -0700)]
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
bug:
20304402
Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
Alex Klyubin [Mon, 20 Apr 2015 18:34:05 +0000 (18:34 +0000)]
am
c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '
c77c14c23d5617b7e4d69dccff890f3b1b55b567':
Make MediaPlayer fail fast on UnknownServiceException.
Alex Klyubin [Mon, 20 Apr 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Make MediaPlayer fail fast on UnknownServiceException."
Alex Klyubin [Mon, 20 Apr 2015 17:11:57 +0000 (10:11 -0700)]
Make MediaPlayer fail fast on UnknownServiceException.
This makes MediaPlayer's network streaming code fail fast when an
UnknownServiceException is encountered. This currently occurs when the
application declares that it does not perform cleartext network
traffic and tries to load media over cleartext HTTP. Without this CL,
MediaPlayer blocks for 30 seconds because it treats this error as
recoverable and goes into a ten retry loop with a three second delay
before each retry.
The result at MediaPlayer client level is
MediaPlayer.MEDIA_ERROR_UNKNOWN error. This error code is used for
non-recoverable situations such as when an invalid redirect is
encountered or the destination is unreachable.
Bug:
20026006
Change-Id: I10f0dadb7740902f8c7c73d0df96cfff31f08ada
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:55:05 +0000 (00:55 +0000)]
am
3d1a37e9: am
38d969c5: am
558907f7: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
3d1a37e9ecffd89f61de27d924b0469a6a09ea8c':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:44:42 +0000 (00:44 +0000)]
am
38d969c5: am
558907f7: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:32:53 +0000 (00:32 +0000)]
am
558907f7: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
558907f702ab21d4166d5d7f7986cb18c4a993bd':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:22:51 +0000 (00:22 +0000)]
am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
0d2f280310458d23618edf6550818f8f9cfa6b47':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:15:09 +0000 (00:15 +0000)]
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:54:58 +0000 (23:54 +0000)]
am
488e5bbc: am
1696552f: am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
488e5bbc2333adb1c84be90b797e1a8d36d070c3':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:43:54 +0000 (23:43 +0000)]
am
1696552f: am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
1696552f127c82aed9036eb1fa6b44c826d57eec':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:32:46 +0000 (23:32 +0000)]
am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
6e141199874f0c5603dee4fccc728412dad07d61':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:22:48 +0000 (23:22 +0000)]
am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:11:40 +0000 (23:11 +0000)]
Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Mon, 10 Nov 2014 19:50:41 +0000 (11:50 -0800)]
Doc change: distribute landing page.
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
Sean Wan [Fri, 17 Apr 2015 23:55:21 +0000 (23:55 +0000)]
am
b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
* commit '
b792f43301c61cce996dd5bac4589b4720a37bec':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Sean Wan [Fri, 17 Apr 2015 23:45:37 +0000 (23:45 +0000)]
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
Sean Wan [Tue, 14 Apr 2015 21:26:40 +0000 (14:26 -0700)]
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Bug:
19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
Dmitriy Ivanov [Fri, 17 Apr 2015 19:20:22 +0000 (19:20 +0000)]
am
b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
b0557acebc7a47f6d8a3653c376165160fc68105':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dmitriy Ivanov [Fri, 17 Apr 2015 19:01:40 +0000 (19:01 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:29 +0000 (11:50 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
It is no longer needed.
Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
Dan Albert [Fri, 17 Apr 2015 18:06:54 +0000 (18:06 +0000)]
am
fef8bcf9: Merge "Explicitly use clang."
* commit '
fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
Explicitly use clang.
Dan Albert [Fri, 17 Apr 2015 17:43:35 +0000 (17:43 +0000)]
Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 17:40:48 +0000 (10:40 -0700)]
Explicitly use clang.
This was implicitly enabled by using ASAN.
Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
Rich Slogar [Fri, 17 Apr 2015 17:37:51 +0000 (17:37 +0000)]
am
c1002dfc: am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
c1002dfc52ec2827d24b6c4722a47abbb99b7f16':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:37:45 +0000 (17:37 +0000)]
am
1252b4b8: am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
1252b4b8694a69150b79ecfd801ed62c6929edf3':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:27:13 +0000 (17:27 +0000)]
am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
71a616e05065e39a5a13b483b031a2040dc52eda':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:27:07 +0000 (17:27 +0000)]
am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:14:48 +0000 (17:14 +0000)]
am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
203a47395dfc17ba9e9b6b46c65bfbde002312f6':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:14:43 +0000 (17:14 +0000)]
am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
684f3aa264e678affc1b33b27602493c96ee7eac':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:03:04 +0000 (17:03 +0000)]
am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:02:59 +0000 (17:02 +0000)]
am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
efe861a4a7081da795fe6a0843308ca7cef26277':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 16:53:33 +0000 (16:53 +0000)]
Merge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 16:52:44 +0000 (16:52 +0000)]
Merge "docs: hierarchyviewer updates" into lmp-docs
Olawale Ogunwale [Fri, 17 Apr 2015 16:13:03 +0000 (16:13 +0000)]
am
c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit '
c0c8d1983c5d7c9bc9469944a9d46856aff95ab9':
[ActivityManager] Fix activity always visible.
Olawale Ogunwale [Fri, 17 Apr 2015 15:50:46 +0000 (15:50 +0000)]
Merge "[ActivityManager] Fix activity always visible."
Martijn Coenen [Fri, 17 Apr 2015 07:25:27 +0000 (07:25 +0000)]
am
e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
* commit '
e386f7f5108e9c2aa7547394f23d5936d7993cfe':
Expose peer LLCP version in NDEF callbacks.
Martijn Coenen [Fri, 17 Apr 2015 07:02:54 +0000 (07:02 +0000)]
Merge "Expose peer LLCP version in NDEF callbacks."
Ryosuke Matsuuchi [Tue, 14 Apr 2015 09:44:35 +0000 (18:44 +0900)]
doc: Add Korean version of DAC/distribute/ page.
Bug:
20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
Filip Gruszczynski [Fri, 17 Apr 2015 00:59:39 +0000 (00:59 +0000)]
am
4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit '
4544b927d7f3575bf609490b42d521a12bf95a07':
Hold a wake lock while dozing when wallpaper draws.
Chad Brubaker [Thu, 16 Apr 2015 22:23:29 +0000 (22:23 +0000)]
am
e5e49a17: Merge "Support KM_LONG_REP"
* commit '
e5e49a175c27b95d6b8928ab435bfde9f9db3c81':
Support KM_LONG_REP
Filip Gruszczynski [Thu, 16 Apr 2015 20:18:58 +0000 (13:18 -0700)]
Hold a wake lock while dozing when wallpaper draws.
This mimics what ViewRootImpl does before drawing.
Bug:
20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
Chad Brubaker [Thu, 16 Apr 2015 21:56:10 +0000 (21:56 +0000)]
Merge "Support KM_LONG_REP"
Chad Brubaker [Thu, 16 Apr 2015 21:30:30 +0000 (14:30 -0700)]
Support KM_LONG_REP
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
Alex Klyubin [Thu, 16 Apr 2015 20:09:05 +0000 (20:09 +0000)]
am
499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
* commit '
499126c43385ba7bce9b8547b61bafd0c6311147':
Add Keymaster KM_ORIGIN_UNKNOWN constant.
Alex Klyubin [Thu, 16 Apr 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
Deepanshu Gupta [Thu, 16 Apr 2015 17:41:54 +0000 (17:41 +0000)]
am
1f3c7f3f: am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
1f3c7f3f500bdbfd790c20872961d84ef617f066':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Deepanshu Gupta [Thu, 16 Apr 2015 17:31:34 +0000 (17:31 +0000)]
am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Brian Carlstrom [Thu, 16 Apr 2015 17:31:34 +0000 (17:31 +0000)]
am
14a982aa: Merge "Document hprof-conv -z"
* commit '
14a982aa7a38fa89c916c252996632d401b1d043':
Document hprof-conv -z
Deepanshu Gupta [Thu, 16 Apr 2015 17:19:42 +0000 (17:19 +0000)]
am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Deepanshu Gupta [Thu, 16 Apr 2015 17:12:41 +0000 (17:12 +0000)]
Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev
* changes:
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Brian Carlstrom [Thu, 16 Apr 2015 17:07:58 +0000 (17:07 +0000)]
Merge "Document hprof-conv -z"
Brian Carlstrom [Fri, 27 Mar 2015 05:41:45 +0000 (22:41 -0700)]
Document hprof-conv -z
Bug:
18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
Alex Klyubin [Thu, 16 Apr 2015 16:57:12 +0000 (16:57 +0000)]
am
b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit '
b9a78c7939e9b31c807106166cafe65dc5af777d':
Add IV-related Keymaster error codes.
Alex Klyubin [Thu, 16 Apr 2015 16:57:05 +0000 (16:57 +0000)]
am
216d18b9: Merge "Remove IV auto-generation workaround."
* commit '
216d18b997eb929c2c3af9b2102595f4ec694c20':
Remove IV auto-generation workaround.
Alex Klyubin [Thu, 16 Apr 2015 16:39:30 +0000 (16:39 +0000)]
Merge "Add IV-related Keymaster error codes."
Alex Klyubin [Thu, 16 Apr 2015 16:39:07 +0000 (16:39 +0000)]
Merge "Remove IV auto-generation workaround."
Miao Wang [Thu, 16 Apr 2015 02:21:37 +0000 (02:21 +0000)]
am
782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '
782b43394ef48e7cf8e75404c534a46074d42d4e':
[RenderScript] typo fix in Allocation.java
Miao Wang [Thu, 16 Apr 2015 02:03:26 +0000 (02:03 +0000)]
Merge "[RenderScript] typo fix in Allocation.java"
Deepanshu Gupta [Wed, 15 Apr 2015 00:26:09 +0000 (17:26 -0700)]
Update golden image for tests.
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
Deepanshu Gupta [Tue, 14 Apr 2015 23:39:41 +0000 (16:39 -0700)]
Update to using LayoutlibCallback.
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
Deepanshu Gupta [Tue, 14 Apr 2015 22:17:07 +0000 (15:17 -0700)]
Remove implementation of deprecated method.
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.
Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
Deepanshu Gupta [Mon, 30 Mar 2015 21:53:38 +0000 (14:53 -0700)]
Add @empty support.
Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
Miao Wang [Thu, 16 Apr 2015 00:44:32 +0000 (17:44 -0700)]
[RenderScript] typo fix in Allocation.java
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
Alex Klyubin [Thu, 16 Apr 2015 00:20:23 +0000 (17:20 -0700)]
Remove IV auto-generation workaround.
This workaround prevents use of keys with randomized encryption
(IND-CPA). Since randomized encryption is on by default, it's better
to keep it working and break non-randomized encryption (until
Keymaster is fixed).
Bug:
18088752
Change-Id: I4b11ce72cff705be41d3e66f28b507d6ddc1da79
Alex Klyubin [Thu, 16 Apr 2015 00:16:23 +0000 (17:16 -0700)]
Add IV-related Keymaster error codes.
Bug:
18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
Tim Murray [Wed, 15 Apr 2015 22:50:11 +0000 (22:50 +0000)]
am
7f72f747: Merge "Add BNNM intrinsic."
* commit '
7f72f74766fed73ae9816fec6031a199f70d1428':
Add BNNM intrinsic.
Rich Slogar [Tue, 31 Mar 2015 23:49:01 +0000 (16:49 -0700)]
docs: hierarchyviewer updates
b/
19955159
Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
Tim Murray [Wed, 15 Apr 2015 22:30:12 +0000 (22:30 +0000)]
Merge "Add BNNM intrinsic."
Shawn Willden [Wed, 15 Apr 2015 17:59:41 +0000 (17:59 +0000)]
am
71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
* commit '
71ba4e461f7a492b44632e282e6480345ac4b9c8':
Unbreak obtaining symmetric keys from AndroidKeyStore.
Shawn Willden [Wed, 15 Apr 2015 17:37:35 +0000 (17:37 +0000)]
Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
Rich Slogar [Wed, 11 Feb 2015 00:18:59 +0000 (16:18 -0800)]
docs: studio remove gradle tasks dialog
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
Michael Wright [Wed, 15 Apr 2015 11:10:58 +0000 (11:10 +0000)]
am
150e0e87: Merge "fix return value scale of notifyANR()"
* commit '
150e0e87e1faa01f927cfe8c7110ef843612a1df':
fix return value scale of notifyANR()
Michael Wright [Wed, 15 Apr 2015 10:53:20 +0000 (10:53 +0000)]
Merge "fix return value scale of notifyANR()"
Martijn Coenen [Tue, 14 Apr 2015 09:38:21 +0000 (11:38 +0200)]
Expose peer LLCP version in NDEF callbacks.
Change-Id: I98b9a9764b66345f842c1f845c8a386161d965f5
Martijn Coenen [Wed, 15 Apr 2015 09:37:56 +0000 (09:37 +0000)]
am
6a47a861: Merge "Add getPrefixAids()."
* commit '
6a47a86112e271d200f77d5ec66f5f50979135ca':
Add getPrefixAids().
Martijn Coenen [Wed, 15 Apr 2015 08:00:10 +0000 (08:00 +0000)]
Merge "Add getPrefixAids()."
Martijn Coenen [Fri, 23 Jan 2015 19:29:54 +0000 (11:29 -0800)]
Add getPrefixAids().
Bug:
19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
Alex Klyubin [Wed, 15 Apr 2015 02:00:35 +0000 (19:00 -0700)]
Unbreak obtaining symmetric keys from AndroidKeyStore.
This tracks
59f977c6988e21b3b8aa6c83428bd6ee1a98816d due to which
AndroidKeyStore is unable to provide symmetric keys because it
assumes that the digest field is not repeating.
Bug:
18088752
Change-Id: Ie8ed01449280b7c759e81aeaf2066953b0abaf2a
baik.han [Wed, 15 Apr 2015 01:21:05 +0000 (10:21 +0900)]
fix return value scale of notifyANR()
fix return value scale of notifyANR()
from milliseconds to nanoseconds when windowState is not null
This prevent unintended frequent method calls of notifyANR()
in a very short time.
Change-Id: Icc1f363b3ed3538821a42c080809567473bfb833
Signed-off-by: Baik Han <baik.han@lge.com>
Joe Fernandez [Wed, 15 Apr 2015 00:55:08 +0000 (00:55 +0000)]
am
726466c2: am
11002022: am
5b6e91a6: am
af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '
726466c22517a1dc4d549edfd32fc5447794d29e':
docs: Add Cross-References to Material Design Spec
Joe Fernandez [Wed, 15 Apr 2015 00:45:20 +0000 (00:45 +0000)]
am
11002022: am
5b6e91a6: am
af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '
110020229e0a31b060a329dfe55181f98a31e802':
docs: Add Cross-References to Material Design Spec
Hiroshi Yamauchi [Wed, 15 Apr 2015 00:11:01 +0000 (00:11 +0000)]
am
82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()."
* commit '
82992b7270842637d1af3dcc7c9ae954bdfa312c':
Fix javadoc error in Debug.getRuntimeStats().
Hiroshi Yamauchi [Tue, 14 Apr 2015 23:49:02 +0000 (23:49 +0000)]
Merge "Fix javadoc error in Debug.getRuntimeStats()."
Dan Albert [Tue, 14 Apr 2015 23:44:51 +0000 (23:44 +0000)]
am
571c5a26: Merge "Fix UB in ResourceTable::stringToInt."
* commit '
571c5a26f767f67118f34ca0d426aeeb4a287b2c':
Fix UB in ResourceTable::stringToInt.
Dan Albert [Tue, 14 Apr 2015 23:25:26 +0000 (23:25 +0000)]
Merge "Fix UB in ResourceTable::stringToInt."
Hiroshi Yamauchi [Tue, 14 Apr 2015 23:07:26 +0000 (16:07 -0700)]
Fix javadoc error in Debug.getRuntimeStats().
Bug:
19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
Tim Murray [Wed, 1 Apr 2015 18:07:16 +0000 (11:07 -0700)]
Add BNNM intrinsic.
Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
Alex Klyubin [Tue, 14 Apr 2015 20:43:46 +0000 (20:43 +0000)]
am
d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec."
* commit '
d693690aee3ee94878ab59ee86d8db8ce5bb3789':
No need to specify EC curve name in EcIesParameterSpec.
Alex Klyubin [Tue, 14 Apr 2015 20:22:51 +0000 (20:22 +0000)]
Merge "No need to specify EC curve name in EcIesParameterSpec."
Alex Klyubin [Tue, 14 Apr 2015 20:20:57 +0000 (20:20 +0000)]
am
ecfda064: Merge "Make specifying self-signed cert parameters optional."
* commit '
ecfda06461b8c4a770eb47edb2f7052d7bd0c62d':
Make specifying self-signed cert parameters optional.
Joe Fernandez [Tue, 14 Apr 2015 20:14:32 +0000 (20:14 +0000)]
am
5b6e91a6: am
af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '
5b6e91a6717c4d6aa34adbbb2f2b5d6625c0802d':
docs: Add Cross-References to Material Design Spec
Joe Fernandez [Tue, 14 Apr 2015 20:04:56 +0000 (20:04 +0000)]
am
af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '
af5f200038d377033a5c22e6f93bc49a9e67444d':
docs: Add Cross-References to Material Design Spec
Alex Klyubin [Tue, 14 Apr 2015 19:59:02 +0000 (19:59 +0000)]
Merge "Make specifying self-signed cert parameters optional."
Alex Klyubin [Tue, 14 Apr 2015 19:48:17 +0000 (12:48 -0700)]
Make specifying self-signed cert parameters optional.
This removes the need to specify the three parameters of the
self-signed certificate (serial number, subject, validity range) when
generating key pairs in AndroidKeyStore. This is achieved by
providing sensible defaults for these parameters:
* serial number: 1
* subject: CN=fake
* validity range: Jan 1 1970 to Jan 1 2048.
Bug:
18088752
Change-Id: I5df918b1ef8b26ed3ddd43828c4c78c9fa58cd43
Joe Fernandez [Tue, 14 Apr 2015 19:55:35 +0000 (19:55 +0000)]
Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
OSDN Git Service
