OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
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

9 years agoam 782b4339: Merge "[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

9 years agoMerge "[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"

9 years ago[RenderScript] typo fix in Allocation.java
Miao Wang [Thu, 16 Apr 2015 00:44:32 +0000 (17:44 -0700)]
[RenderScript] typo fix in Allocation.java

Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90

9 years agoam 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic."
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.

9 years agoam 7f72f747: Merge "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.

9 years agoMerge "Add BNNM intrinsic."
Tim Murray [Wed, 15 Apr 2015 22:30:12 +0000 (22:30 +0000)]
Merge "Add BNNM intrinsic."

9 years agoam 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
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.

9 years agoam 71ba4e46: Merge "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.

9 years agoMerge "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."

9 years agoImport translations. DO NOT MERGE
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

9 years agoam 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()"
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()

9 years agoam 150e0e87: Merge "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()

9 years agoMerge "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()"

9 years agoam 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."
Martijn Coenen [Wed, 15 Apr 2015 09:51:52 +0000 (09:51 +0000)]
am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()."

* commit '895f3c27269d14ec53ff3ae8526342f9b57a10e1':
  Add getPrefixAids().

9 years agoam 6a47a861: Merge "Add getPrefixAids()."
Martijn Coenen [Wed, 15 Apr 2015 09:37:56 +0000 (09:37 +0000)]
am 6a47a861: Merge "Add getPrefixAids()."

* commit '6a47a86112e271d200f77d5ec66f5f50979135ca':
  Add getPrefixAids().

9 years agoMerge "Add getPrefixAids()."
Martijn Coenen [Wed, 15 Apr 2015 08:00:10 +0000 (08:00 +0000)]
Merge "Add getPrefixAids()."

9 years agoAdd getPrefixAids().
Martijn Coenen [Fri, 23 Jan 2015 19:29:54 +0000 (11:29 -0800)]
Add getPrefixAids().

Bug: 19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3

9 years agoUnbreak obtaining symmetric keys from AndroidKeyStore.
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

9 years agofix return value scale of notifyANR()
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>
9 years agoam e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add...
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

9 years agoam 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References...
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

9 years agoam 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material...
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

9 years agoam d83a598c: am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()."
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().

9 years agoam 82992b72: Merge "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().

9 years agoam 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt."
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.

9 years agoMerge "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()."

9 years agoam 571c5a26: Merge "Fix UB in ResourceTable::stringToInt."
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.

9 years agoMerge "Fix UB in ResourceTable::stringToInt."
Dan Albert [Tue, 14 Apr 2015 23:25:26 +0000 (23:25 +0000)]
Merge "Fix UB in ResourceTable::stringToInt."

9 years agoFix javadoc error in Debug.getRuntimeStats().
Hiroshi Yamauchi [Tue, 14 Apr 2015 23:07:26 +0000 (16:07 -0700)]
Fix javadoc error in Debug.getRuntimeStats().

Bug: 19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054

9 years agoAdd BNNM intrinsic.
Tim Murray [Wed, 1 Apr 2015 18:07:16 +0000 (11:07 -0700)]
Add BNNM intrinsic.

Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404

9 years agoam 6a38c86d: am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec."
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.

9 years agoam d693690a: Merge "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.

9 years agoam 888f5cb7: am ecfda064: Merge "Make specifying self-signed cert parameters optional."
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.

9 years agoMerge "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."

9 years agoam ecfda064: Merge "Make specifying self-signed cert parameters optional."
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.

9 years agoam 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec...
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

9 years agoam af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp...
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

9 years agoMerge "Make specifying self-signed cert parameters optional."
Alex Klyubin [Tue, 14 Apr 2015 19:59:02 +0000 (19:59 +0000)]
Merge "Make specifying self-signed cert parameters optional."

9 years agoMake 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

9 years agoMerge "docs: Add Cross-References to Material Design Spec" into lmp-docs
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

9 years agodocs: Add Cross-References to Material Design Spec
Joe Fernandez [Fri, 3 Apr 2015 06:48:38 +0000 (23:48 -0700)]
docs: Add Cross-References to Material Design Spec

Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c

9 years agoam 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."
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().

9 years agoam e38ee9df: Merge "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().

9 years agoMerge "Add Debug.getRuntimeStat()."
Hiroshi Yamauchi [Tue, 14 Apr 2015 19:08:30 +0000 (19:08 +0000)]
Merge "Add Debug.getRuntimeStat()."

9 years agoAdd Debug.getRuntimeStat().
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

9 years agoam 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
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

9 years agoam 8704ae46: Merge "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

9 years agoMerge "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"

9 years agoam 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"
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()

9 years agoam 3312c6b9: Merge "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()

9 years agoMerge "Add android.net.IpPrefix#contains()"
Erik Kline [Tue, 14 Apr 2015 07:58:32 +0000 (07:58 +0000)]
Merge "Add android.net.IpPrefix#contains()"

9 years agoAdd 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

9 years agoam f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change...
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.

9 years agoam cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages...
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.

9 years agoam c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed...
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.

9 years agoam a80fc040: am 00f857c5: Merge "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.

9 years agoam 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp...
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.

9 years agoMerge "Doc change: add new pages for Designed for Families." into lmp-docs
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

9 years agoDoc change: add new pages for Designed for Families.
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

9 years agoam 869c5490: am 2f0dc155: am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Inves...
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

9 years agoam c9393a5d: am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch...
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

9 years agoam f828c92c: am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrac...
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

9 years agoam 9e58689d: am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus...
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

9 years agoam 32b675b9: am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating...
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

9 years agoam 2f0dc155: am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating...
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

9 years agoam 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files...
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

9 years agoam 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update...
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

9 years agoam 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver...
Rich Slogar [Tue, 14 Apr 2015 02:43:49 +0000 (02:43 +0000)]
am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs

* commit '9761530b3fbff0f2d686c4a0f48efa02c159a309':
  docs: nexus usb driver update
  docs: remove adb install option

9 years agoam d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage...
Mathieu Chartier [Tue, 14 Apr 2015 02:43:39 +0000 (02:43 +0000)]
am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev

* commit 'd4bcbcfa08502d6feafbe39e9dcb16a38e61f892':
  Update "Investigating your RAM usage" for ART

9 years agoam 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid...
Ruchi Kandoi [Tue, 14 Apr 2015 00:47:17 +0000 (00:47 +0000)]
am 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds."

* commit '1770f9cfa546dbacb622550ef845c2dcb7f9b995':
  BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds.

9 years agoam 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOut...
Ruchi Kandoi [Tue, 14 Apr 2015 00:35:03 +0000 (00:35 +0000)]
am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds."

* commit '3afca74a2a40b4e957630909fe5df76aa550da69':
  BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds.

9 years agoAdd name to ScriptGroup2.Builder.create() method
Yang Ni [Fri, 3 Apr 2015 00:47:56 +0000 (17:47 -0700)]
Add name to ScriptGroup2.Builder.create() method

This name will be used to name the .so file generated for the
script group with fused kernels.

Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf

9 years agoMerge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds."
Ruchi Kandoi [Tue, 14 Apr 2015 00:17:09 +0000 (00:17 +0000)]
Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds."

9 years agoam 7591574d: am 07cd641b: Merge "Add a name to ScriptGroup2.Builder.create method"
Yang Ni [Mon, 13 Apr 2015 23:21:54 +0000 (23:21 +0000)]
am 7591574d: am 07cd641b: Merge "Add a name to ScriptGroup2.Builder.create method"

* commit '7591574d8490e0c985a73372607addccb2b0282f':
  Add a name to ScriptGroup2.Builder.create method

9 years agoam 07cd641b: Merge "Add a name to ScriptGroup2.Builder.create method"
Yang Ni [Mon, 13 Apr 2015 23:10:58 +0000 (23:10 +0000)]
am 07cd641b: Merge "Add a name to ScriptGroup2.Builder.create method"

* commit '07cd641b6f832f939d5cccfe8604c230ddad4257':
  Add a name to ScriptGroup2.Builder.create method

9 years agoMerge "Add a name to ScriptGroup2.Builder.create method"
Yang Ni [Mon, 13 Apr 2015 22:52:30 +0000 (22:52 +0000)]
Merge "Add a name to ScriptGroup2.Builder.create method"

9 years agoAdd a name to ScriptGroup2.Builder.create method
Yang Ni [Mon, 6 Apr 2015 23:58:57 +0000 (16:58 -0700)]
Add a name to ScriptGroup2.Builder.create method

The name is not used in any meaningful way yet, but would be used
to name the file for generated code for fused kernels in other
coming CLs.

A script group name cannot be null or empty, or longer than 100
characters. It can only contain letters, digits, '-', or '_'.

Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b

9 years agoam 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage...
Mathieu Chartier [Mon, 13 Apr 2015 21:10:29 +0000 (21:10 +0000)]
am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs

* commit '2c871d2cce8e926c5300fdee33526eeb5e81810c':
  Update "Investigating your RAM usage" for ART

9 years agoam 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton...
smain@google.com [Mon, 13 Apr 2015 21:10:15 +0000 (21:10 +0000)]
am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs

* commit '76c9e47e9fb7e81a6bbebeee83a77efb55799b23':
  initial batch of NDK files for skeleton site build

9 years agoam 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into...
Mathieu Chartier [Mon, 13 Apr 2015 20:57:26 +0000 (20:57 +0000)]
am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs

* commit '17781b68df70a9c0bc446d91739be651d4c9a9e3':
  Update "Investigating your RAM usage" for ART

9 years agoam 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build...
smain@google.com [Mon, 13 Apr 2015 20:57:22 +0000 (20:57 +0000)]
am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs

* commit '4301dd0458a0789f6cc841d9e8b18e645e73c05d':
  initial batch of NDK files for skeleton site build

9 years agoam 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
Mathieu Chartier [Mon, 13 Apr 2015 20:52:51 +0000 (20:52 +0000)]
am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs

* commit '473989c35d9f0a42c6e7d3a56004dc76676b65b5':
  Update "Investigating your RAM usage" for ART

9 years agoam d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp...
smain@google.com [Mon, 13 Apr 2015 20:44:52 +0000 (20:44 +0000)]
am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs

* commit 'd60649c541931a5a9e5972cdceac48b9042eaff4':
  initial batch of NDK files for skeleton site build

9 years agoMerge "Update "Investigating your RAM usage" for ART" into lmp-docs
Mathieu Chartier [Mon, 13 Apr 2015 20:44:17 +0000 (20:44 +0000)]
Merge "Update "Investigating your RAM usage" for ART" into lmp-docs

9 years agoMerge "initial batch of NDK files for skeleton site build" into lmp-docs
smain@google.com [Mon, 13 Apr 2015 20:32:37 +0000 (20:32 +0000)]
Merge "initial batch of NDK files for skeleton site build" into lmp-docs

9 years agoinitial batch of NDK files for skeleton site build
smain@google.com [Sat, 11 Apr 2015 03:45:28 +0000 (20:45 -0700)]
initial batch of NDK files for skeleton site build

Change-Id: I00152e817377c072f529940743499a3b6d91f80d

9 years agoam 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:53:14 +0000 (18:53 +0000)]
am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs

* commit '12020cf4418fd5b0918b6df1d6a072be01aac622':
  docs: systrace update

9 years agoam 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into...
Rich Slogar [Mon, 13 Apr 2015 18:53:08 +0000 (18:53 +0000)]
am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs

* commit '8f68c77cec98a24fd43ad0a5e2d3946d2a16e15e':
  docs: nexus usb driver update

9 years agoam 6843ae30: am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into...
Rich Slogar [Mon, 13 Apr 2015 18:53:01 +0000 (18:53 +0000)]
am 6843ae30: am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs

* commit '6843ae308ea8d62aa44dda3e7ad95c6e292513af':
  docs: remove adb install option

9 years agoam 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:43:04 +0000 (18:43 +0000)]
am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs

* commit '3e664c3bda8ee1cb3b2819ba38a8195147ad448a':
  docs: systrace update

9 years agoam 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:42:58 +0000 (18:42 +0000)]
am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs

* commit '6656ea4607d8250a611eddb07de890213ea31426':
  docs: nexus usb driver update

9 years agoam c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:42:54 +0000 (18:42 +0000)]
am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs

* commit 'c0559808eeb881ce5afa368c51f3da3807359d56':
  docs: remove adb install option

9 years agoam bdc20109: Merge "docs: systrace update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:30:38 +0000 (18:30 +0000)]
am bdc20109: Merge "docs: systrace update" into lmp-docs

* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
  docs: systrace update

9 years agoam 880460a7: Merge "docs: nexus usb driver update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:30:33 +0000 (18:30 +0000)]
am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs

* commit '880460a704c79b0d81c1aa8af9b3c163c8adf16d':
  docs: nexus usb driver update

9 years agoam a7ade2f7: Merge "docs: remove adb install option" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:30:29 +0000 (18:30 +0000)]
am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs

* commit 'a7ade2f7f0c496cb12edfc4ae805fd08c9c2359d':
  docs: remove adb install option

9 years agoMerge "docs: systrace update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:14:04 +0000 (18:14 +0000)]
Merge "docs: systrace update" into lmp-docs

9 years agoMerge "docs: nexus usb driver update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:13:46 +0000 (18:13 +0000)]
Merge "docs: nexus usb driver update" into lmp-docs

9 years agoMerge "docs: remove adb install option" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:13:09 +0000 (18:13 +0000)]
Merge "docs: remove adb install option" into lmp-docs

9 years agoam dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into...
Mathieu Chartier [Mon, 13 Apr 2015 17:47:24 +0000 (17:47 +0000)]
am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev

* commit 'dd9e41407552fb44ad2d537966611d574269f45f':
  Update "Investigating your RAM usage" for ART