OSDN Git Service
Filip Gruszczynski [Fri, 17 Apr 2015 01:20:09 +0000 (01:20 +0000)]
am
47e743b9: am
4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit '
47e743b9e276d89ded2b9c50af61db2ce5529706':
Hold a wake lock while dozing when wallpaper draws.
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:31:00 +0000 (22:31 +0000)]
am
a9d74000: am
e5e49a17: Merge "Support KM_LONG_REP"
* commit '
a9d740003fe2ca0a809918e14b4c72d66c6dfc44':
Support KM_LONG_REP
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:20:15 +0000 (20:20 +0000)]
am
51884f0e: am
499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
* commit '
51884f0e066bcf1ba5e039cd8a24a87139b5a01c':
Add Keymaster KM_ORIGIN_UNKNOWN constant.
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:55:03 +0000 (17:55 +0000)]
am
c4affce9: am
1f3c7f3f: am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
c4affce9df0817b84df3e61c3932f53b77ee0986':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
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.
Brian Carlstrom [Thu, 16 Apr 2015 17:41:44 +0000 (17:41 +0000)]
am
40955edf: am
14a982aa: Merge "Document hprof-conv -z"
* commit '
40955edf9dc1e90b337af89543919eec4868dbe0':
Document hprof-conv -z
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"
Alex Klyubin [Thu, 16 Apr 2015 17:07:51 +0000 (17:07 +0000)]
am
a2607ee4: am
b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit '
a2607ee4ebef49f88b5656e2eca2db362b32c70d':
Add IV-related Keymaster error codes.
Alex Klyubin [Thu, 16 Apr 2015 17:07:47 +0000 (17:07 +0000)]
am
28a9089f: am
216d18b9: Merge "Remove IV auto-generation workaround."
* commit '
28a9089f5b79e20ca5b023830255cf438a9cded7':
Remove IV auto-generation workaround.
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:32:59 +0000 (02:32 +0000)]
am
2b300a99: am
782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '
2b300a99bbb133090b7ec39e64dd65ba2bb8f18d':
[RenderScript] typo fix in Allocation.java
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 23:04:41 +0000 (23:04 +0000)]
am
91d2f27b: am
7f72f747: Merge "Add BNNM intrinsic."
* commit '
91d2f27bc7dad2232d3f59c71f1402b86cb9f514':
Add BNNM intrinsic.
Tim Murray [Wed, 15 Apr 2015 22:50:11 +0000 (22:50 +0000)]
am
7f72f747: Merge "Add BNNM intrinsic."
* commit '
7f72f74766fed73ae9816fec6031a199f70d1428':
Add BNNM intrinsic.
Tim Murray [Wed, 15 Apr 2015 22:30:12 +0000 (22:30 +0000)]
Merge "Add BNNM intrinsic."
Shawn Willden [Wed, 15 Apr 2015 18:10:04 +0000 (18:10 +0000)]
am
1cb119d3: am
71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
* commit '
1cb119d3f0945f2194d400b7f186df92bbb25567':
Unbreak obtaining symmetric keys from AndroidKeyStore.
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."
Geoff Mendal [Wed, 15 Apr 2015 14:28:29 +0000 (07:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic858a50c432b07464acba53ea9775aab3e98c633
Auto-generated-cl: translation import
Michael Wright [Wed, 15 Apr 2015 11:21:06 +0000 (11:21 +0000)]
am
99e23088: am
150e0e87: Merge "fix return value scale of notifyANR()"
* commit '
99e23088843eddede29d0fc5ca30a83f147f31b0':
fix return value scale of notifyANR()
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 [Wed, 15 Apr 2015 09:51:52 +0000 (09:51 +0000)]
am
895f3c27: am
6a47a861: Merge "Add getPrefixAids()."
* commit '
895f3c27269d14ec53ff3ae8526342f9b57a10e1':
Add getPrefixAids().
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 01:15:23 +0000 (01:15 +0000)]
am
e635f9b5: am
726466c2: am
11002022: am
5b6e91a6: am
af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs
* commit '
e635f9b5e078e9e6f15f5828832acffb497c05e7':
docs: Add Cross-References to Material Design Spec
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:24:58 +0000 (00:24 +0000)]
am
d83a598c: am
82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()."
* commit '
d83a598c392af8daf9c82f28b5c920955712f528':
Fix javadoc error in Debug.getRuntimeStats().
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().
Dan Albert [Tue, 14 Apr 2015 23:55:35 +0000 (23:55 +0000)]
am
44d7989a: am
571c5a26: Merge "Fix UB in ResourceTable::stringToInt."
* commit '
44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d':
Fix UB in ResourceTable::stringToInt.
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:55:34 +0000 (20:55 +0000)]
am
6a38c86d: am
d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec."
* commit '
6a38c86dd892b272a354d2b1164e78eebaaf907e':
No need to specify EC curve name in EcIesParameterSpec.
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:31:02 +0000 (20:31 +0000)]
am
888f5cb7: am
ecfda064: Merge "Make specifying self-signed cert parameters optional."
* commit '
888f5cb7166936f468831d64ac88197c15f0584f':
Make specifying self-signed cert parameters optional.
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
Joe Fernandez [Fri, 3 Apr 2015 06:48:38 +0000 (23:48 -0700)]
docs: Add Cross-References to Material Design Spec
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
Hiroshi Yamauchi [Tue, 14 Apr 2015 19:37:56 +0000 (19:37 +0000)]
am
04143fdd: am
e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit '
04143fdd55196886e5dbf1a1c7fe334115e81a42':
Add Debug.getRuntimeStat().
Hiroshi Yamauchi [Tue, 14 Apr 2015 19:26:51 +0000 (19:26 +0000)]
am
e38ee9df: Merge "Add Debug.getRuntimeStat()."
* commit '
e38ee9df26c93415303152ec3f6ed50d847557c8':
Add Debug.getRuntimeStat().
Hiroshi Yamauchi [Tue, 14 Apr 2015 19:08:30 +0000 (19:08 +0000)]
Merge "Add Debug.getRuntimeStat()."
Alex Klyubin [Tue, 14 Apr 2015 17:52:34 +0000 (10:52 -0700)]
Add Keymaster KM_ORIGIN_UNKNOWN constant.
This tracks
d359b044830b292f492f8a8df5471f869e358399 from
hardware/libhardware.
Bug:
18088752
Change-Id: I9a7bd8bdee51c18ae0427eff4efe036213d2b175
Hiroshi Yamauchi [Thu, 2 Apr 2015 19:26:10 +0000 (12:26 -0700)]
Add Debug.getRuntimeStat().
Export runtime stats (currently GC stats) through this method.
Bug:
19825248
Change-Id: I147a0e9bc6bdfe4dc29d74e44f0af6349c51d9f8
Yang Ni [Tue, 14 Apr 2015 16:50:22 +0000 (16:50 +0000)]
am
6ca1e45a: am
8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '
6ca1e45aab5b4a1b229c6493780a04976db12817':
Add name to ScriptGroup2.Builder.create() method
Yang Ni [Tue, 14 Apr 2015 16:36:36 +0000 (16:36 +0000)]
am
8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '
8704ae464a001e17275257d19eae688ff3a28892':
Add name to ScriptGroup2.Builder.create() method
Yang Ni [Tue, 14 Apr 2015 16:15:54 +0000 (16:15 +0000)]
Merge "Add name to ScriptGroup2.Builder.create() method"
Erik Kline [Tue, 14 Apr 2015 09:44:25 +0000 (09:44 +0000)]
am
402f2501: am
3312c6b9: Merge "Add android.net.IpPrefix#contains()"
* commit '
402f2501ac73adba86ec3973ef81e6911fbcd564':
Add android.net.IpPrefix#contains()
Erik Kline [Tue, 14 Apr 2015 09:29:56 +0000 (09:29 +0000)]
am
3312c6b9: Merge "Add android.net.IpPrefix#contains()"
* commit '
3312c6b9f3e9c83865eeec2af609338ce74a0a10':
Add android.net.IpPrefix#contains()
Erik Kline [Tue, 14 Apr 2015 07:58:32 +0000 (07:58 +0000)]
Merge "Add android.net.IpPrefix#contains()"
Erik Kline [Mon, 13 Apr 2015 06:33:34 +0000 (15:33 +0900)]
Add android.net.IpPrefix#contains()
This was originally to avoid RuntimeException in RouteInfo#matches():
When an IPv6 prefix with a length greater than the max permitted
for IPv4 is matched against an Inet4Address, the call to
NetworkUtils throws RuntimeException.
Change-Id: I92e2bd19a4e7d656cf682fd27678da07e211850d
Dirk Dougherty [Tue, 14 Apr 2015 05:03:13 +0000 (05:03 +0000)]
am
f2a57c69: am
cda895c5: am
c578bff7: am
a80fc040: am
00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
* commit '
f2a57c69d4af3f7b1368e6edb6801b1cf2058dd8':
Doc change: add new pages for Designed for Families.
Dirk Dougherty [Tue, 14 Apr 2015 04:54:32 +0000 (04:54 +0000)]
am
cda895c5: am
c578bff7: am
a80fc040: am
00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
* commit '
cda895c53d22496001ae59fae36f751cf04af3ed':
Doc change: add new pages for Designed for Families.
Dirk Dougherty [Tue, 14 Apr 2015 04:43:06 +0000 (04:43 +0000)]
am
c578bff7: am
a80fc040: am
00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
* commit '
c578bff74acdaf103c05794f39acf9ea49e4621d':
Doc change: add new pages for Designed for Families.
Dirk Dougherty [Tue, 14 Apr 2015 04:33:27 +0000 (04:33 +0000)]
am
a80fc040: am
00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
* commit '
a80fc040ea814af2a1d3f2cbfa5efb8eaa898697':
Doc change: add new pages for Designed for Families.
Dirk Dougherty [Tue, 14 Apr 2015 04:22:27 +0000 (04:22 +0000)]
am
00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
* commit '
00f857c5a132555774bd286c254dade281473427':
Doc change: add new pages for Designed for Families.
Dirk Dougherty [Tue, 14 Apr 2015 04:12:56 +0000 (04:12 +0000)]
Merge "Doc change: add new pages for Designed for Families." into lmp-docs
Dirk Dougherty [Wed, 1 Apr 2015 03:11:16 +0000 (20:11 -0700)]
Doc change: add new pages for Designed for Families.
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
Mathieu Chartier [Tue, 14 Apr 2015 02:55:17 +0000 (02:55 +0000)]
am
869c5490: am
2f0dc155: am
2c871d2c: am
17781b68: am
473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
* commit '
869c5490214c99cacb05024cfc72efa4cffb9208':
Update "Investigating your RAM usage" for ART
smain@google.com [Tue, 14 Apr 2015 02:55:13 +0000 (02:55 +0000)]
am
c9393a5d: am
2b92e18b: am
76c9e47e: am
4301dd04: am
d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs
* commit '
c9393a5d707529a465fe68ee96d9929deb8ef3c8':
initial batch of NDK files for skeleton site build
Rich Slogar [Tue, 14 Apr 2015 02:55:09 +0000 (02:55 +0000)]
am
f828c92c: am
6b9e30fe: am
12020cf4: am
3e664c3b: am
bdc20109: Merge "docs: systrace update" into lmp-docs
* commit '
f828c92c5ebbcba3204581b49e91b5b80f8ed2b4':
docs: systrace update
Rich Slogar [Tue, 14 Apr 2015 02:55:04 +0000 (02:55 +0000)]
am
9e58689d: am
9761530b: am
8f68c77c: am
6656ea46: am
880460a7: Merge "docs: nexus usb driver update" into lmp-docs
* commit '
9e58689da633b5ec4517ac17bd7274510992143d':
docs: nexus usb driver update
docs: remove adb install option
Mathieu Chartier [Tue, 14 Apr 2015 02:55:00 +0000 (02:55 +0000)]
am
32b675b9: am
d4bcbcfa: am
dd9e4140: am
f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev
* commit '
32b675b9f56210afb0254b866235ebfa7908d39c':
Update "Investigating your RAM usage" for ART
Mathieu Chartier [Tue, 14 Apr 2015 02:44:26 +0000 (02:44 +0000)]
am
2f0dc155: am
2c871d2c: am
17781b68: am
473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
* commit '
2f0dc1551958088fdf20f89eb98f34d00b21bf3d':
Update "Investigating your RAM usage" for ART
smain@google.com [Tue, 14 Apr 2015 02:44:14 +0000 (02:44 +0000)]
am
2b92e18b: am
76c9e47e: am
4301dd04: am
d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs
* commit '
2b92e18b4bf70c88662dfa1137c4901daae4d4d5':
initial batch of NDK files for skeleton site build
Rich Slogar [Tue, 14 Apr 2015 02:43:56 +0000 (02:43 +0000)]
am
6b9e30fe: am
12020cf4: am
3e664c3b: am
bdc20109: Merge "docs: systrace update" into lmp-docs
* commit '
6b9e30fe959e6c67687c52eeb152de623368695d':
docs: systrace update