OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new...
Elliott Hughes [Thu, 10 Jul 2014 00:16:43 +0000 (00:16 +0000)]
am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."

* commit '3964ea46750cd5715f29ad4d9cada4a35208ad7a':
  Switch frameworks/base/libs/androidfw to the new icu.

10 years agoam f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
Elliott Hughes [Thu, 10 Jul 2014 00:16:29 +0000 (00:16 +0000)]
am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."

* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
  Switch frameworks/base/core/jni to the new icu.

10 years agoam cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku...
Robert Ly [Thu, 10 Jul 2014 00:11:33 +0000 (00:11 +0000)]
am cc2af1c0: Merge "Revert "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev

* commit 'cc2af1c010ae896ef6aea7c428876ea5d9a7dc73':
  Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"

10 years agoam d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
Elliott Hughes [Thu, 10 Jul 2014 00:08:33 +0000 (00:08 +0000)]
am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."

* commit 'd74f99d390d9a0e1c800ee68b1bc39c210aca989':
  Switch frameworks/base/libs/androidfw to the new icu.

10 years agoam effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
Elliott Hughes [Thu, 10 Jul 2014 00:08:29 +0000 (00:08 +0000)]
am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."

* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.

10 years agoam 9afee0df: docs: Added missing instructions for copying the Google Play Services...
Quddus Chong [Wed, 9 Jul 2014 23:02:01 +0000 (23:02 +0000)]
am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project.

* commit '9afee0df49ce019bf8c8d1c7dc15857949637ccf':
  docs: Added missing instructions for copying the Google Play Services library project.

10 years agodocs: Added missing instructions for copying the Google Play Services library project.
Quddus Chong [Wed, 9 Jul 2014 21:38:04 +0000 (14:38 -0700)]
docs: Added missing instructions for copying the Google Play Services library project.

Change-Id: I04bbfce7e3901a1aa14a3c2a273674014c60ae17

10 years agoMerge "Switch frameworks/base/core/jni to the new icu."
Elliott Hughes [Wed, 9 Jul 2014 23:59:14 +0000 (23:59 +0000)]
Merge "Switch frameworks/base/core/jni to the new icu."

10 years agoSwitch frameworks/base/core/jni to the new icu.
Elliott Hughes [Wed, 9 Jul 2014 23:56:11 +0000 (16:56 -0700)]
Switch frameworks/base/core/jni to the new icu.

Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9

10 years agoam d7880b6a: docs: fix packaging instructions again to reflect correct metadata name
Robert Ly [Wed, 9 Jul 2014 19:19:54 +0000 (19:19 +0000)]
am d7880b6a: docs: fix packaging instructions again to reflect correct metadata name

* commit 'd7880b6a50aa0dbea66923a4672d360229ab3aca':
  docs: fix packaging instructions again to reflect correct metadata name

10 years agodocs: fix packaging instructions again to reflect correct metadata name
Robert Ly [Wed, 9 Jul 2014 18:45:33 +0000 (11:45 -0700)]
docs: fix packaging instructions again to reflect correct metadata name

Change-Id: I61659811065ad5f0fa8f722f80793e707730604c

10 years agoam e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into...
Ricardo Cervera [Wed, 9 Jul 2014 18:38:20 +0000 (18:38 +0000)]
am e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev

* commit 'e34167cef73e23c4be4bf5d7a1517e609122d652':
  docs: Fixed minor issues with Wear docs. Bug: 16062631

10 years agoam 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906
Ricardo Cervera [Wed, 9 Jul 2014 18:38:16 +0000 (18:38 +0000)]
am 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906

* commit '3a958b9f851a8985bed5fac1499c5553ff566b9e':
  docs: Fixed nav bar color in material docs. Bug: 16160906

10 years agoam a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp...
Robert Ly [Wed, 9 Jul 2014 18:33:49 +0000 (18:33 +0000)]
am a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev

* commit 'a0d38aa4e58eee27b561420047d0aafcdaed93f1':
  docs: remove gms core preview for wear and redirect

10 years agodocs: Fixed nav bar color in material docs. Bug: 16160906
Ricardo Cervera [Wed, 9 Jul 2014 16:18:18 +0000 (09:18 -0700)]
docs: Fixed nav bar color in material docs. Bug: 16160906

Change-Id: I56eb7f4d0e9a0a24b1fb38f08dd8ccba6c91dd17

10 years agoam 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"
Robin Lee [Wed, 9 Jul 2014 17:43:56 +0000 (17:43 +0000)]
am 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"

* commit '1f0180bfa877373b239a5675f715288db829fa75':
  Make misc config directory during user creation

10 years agoam 74803e55: Merge "Make misc config directory during user creation"
Robin Lee [Wed, 9 Jul 2014 17:39:13 +0000 (17:39 +0000)]
am 74803e55: Merge "Make misc config directory during user creation"

* commit '74803e559caffe235b86dc52cf76ef98343c0d74':
  Make misc config directory during user creation

10 years agoam 33f5a318: Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 16:50:42 +0000 (16:50 +0000)]
am 33f5a318: Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev

* commit '33f5a318b981a69542bfd158e3fec5814135665a':
  docs: surface ui toolkit at a higher level

10 years agoam db520137: Merge "docs: fix wear packaging for paid apps instructions" into klp...
Robert Ly [Wed, 9 Jul 2014 16:28:29 +0000 (16:28 +0000)]
am db520137: Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev

* commit 'db520137dbd67d4b8ec65011accadda7e25ec844':
  docs: fix wear packaging for paid apps instructions

10 years agoam e0b5829e: Merge "docs: fix 2d picker image description" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:51:13 +0000 (15:51 +0000)]
am e0b5829e: Merge "docs: fix 2d picker image description" into klp-modular-dev

* commit 'e0b5829eb1eac1be768343371da71e7d53d9eff5':
  docs: fix 2d picker image description

10 years agoam 6f52e7be: Merge "docs: fix link to messages doc" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:06:37 +0000 (15:06 +0000)]
am 6f52e7be: Merge "docs: fix link to messages doc" into klp-modular-dev

* commit '6f52e7be188781a906cc53dcd96268ffbfdfc283':
  docs: fix link to messages doc

10 years agoMerge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev
Ricardo Cervera [Wed, 9 Jul 2014 18:34:15 +0000 (18:34 +0000)]
Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev

10 years agodocs: Fixed minor issues with Wear docs. Bug: 16062631
Ricardo Cervera [Wed, 9 Jul 2014 17:46:54 +0000 (10:46 -0700)]
docs: Fixed minor issues with Wear docs. Bug: 16062631

Change-Id: Ieaa02cfedd1b9b6f59c6937a056c8d4f4eb4188e

10 years agoMerge "docs: remove gms core preview for wear and redirect" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 18:28:38 +0000 (18:28 +0000)]
Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev

10 years agodocs: remove gms core preview for wear and redirect
Robert Ly [Wed, 9 Jul 2014 16:46:45 +0000 (09:46 -0700)]
docs: remove gms core preview for wear and redirect

Change-Id: I8dd618a8fc99034cd73927d4aa312fe871081f83

10 years agodocs: surface ui toolkit at a higher level
Robert Ly [Wed, 9 Jul 2014 16:42:29 +0000 (09:42 -0700)]
docs: surface ui toolkit at a higher level

Change-Id: If17cebda4606404f13d10ecb1540eda75b5e11ec

10 years agodocs: fix wear packaging for paid apps instructions
Robert Ly [Wed, 9 Jul 2014 16:23:23 +0000 (09:23 -0700)]
docs: fix wear packaging for paid apps instructions

Change-Id: Ibf2cbe2e4bcb7e998665b10c5632c786dcc90e76

10 years agodocs: fix 2d picker image description
Robert Ly [Wed, 9 Jul 2014 15:46:37 +0000 (08:46 -0700)]
docs: fix 2d picker image description

Change-Id: Id554a7090986e71a502dc070468d26f8d546cc2c

10 years agodocs: fix link to messages doc
Robert Ly [Wed, 9 Jul 2014 14:59:07 +0000 (07:59 -0700)]
docs: fix link to messages doc

Change-Id: I382a2ec26634f8d7427344657de0a66b187562cb

10 years agoMerge "Switch frameworks/base/libs/androidfw to the new icu."
Elliott Hughes [Wed, 9 Jul 2014 23:59:58 +0000 (23:59 +0000)]
Merge "Switch frameworks/base/libs/androidfw to the new icu."

10 years agoSwitch frameworks/base/libs/androidfw to the new icu.
Elliott Hughes [Wed, 9 Jul 2014 23:58:28 +0000 (16:58 -0700)]
Switch frameworks/base/libs/androidfw to the new icu.

Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97

10 years agoMerge "docs: surface ui toolkit at a higher level" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 16:44:09 +0000 (16:44 +0000)]
Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev

10 years agoMerge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.googl...
Robert Ly [Thu, 10 Jul 2014 00:05:13 +0000 (00:05 +0000)]
Merge "Revert "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev

10 years agoRevert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com...
Robert Ly [Thu, 10 Jul 2014 00:04:45 +0000 (00:04 +0000)]
Revert "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"

This reverts commit 42fcd1463d416ede744550810bdfd7974e685f15.

Change-Id: I0956e4e07b558c1f445d3209a52a54974e060b99

10 years agoMerge "docs: fix 2d picker image description" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:48:19 +0000 (15:48 +0000)]
Merge "docs: fix 2d picker image description" into klp-modular-dev

10 years agoMerge "docs: fix link to messages doc" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:02:11 +0000 (15:02 +0000)]
Merge "docs: fix link to messages doc" into klp-modular-dev

10 years agoam 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [framewo...
Brian Carlstrom [Wed, 9 Jul 2014 12:36:47 +0000 (12:36 +0000)]
am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit '5aba0149b953fb8e85851811dde995fb35c10051':
  Make dex2oat heap size product configurable [frameworks/base]

10 years agoam b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"
Brian Carlstrom [Wed, 9 Jul 2014 12:21:54 +0000 (12:21 +0000)]
am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit 'b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
  Make dex2oat heap size product configurable [frameworks/base]

10 years agoam d3a77b16: am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e34469...
Deepanshu Gupta [Wed, 9 Jul 2014 00:06:22 +0000 (00:06 +0000)]
am d3a77b16: am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'd3a77b16c7e0cd54cde9a855654fe02897a50b87':
  Change font family name. [DO NOT MERGE]

10 years agoam e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b48760...
Deepanshu Gupta [Wed, 9 Jul 2014 00:02:06 +0000 (00:02 +0000)]
am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'e7ef4dde3cd9a9b7f6e8317563158b954ca679be':
  Change font family name. [DO NOT MERGE]

10 years agoam d9843b2e: Merge "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp...
David Friedman [Wed, 9 Jul 2014 00:01:55 +0000 (00:01 +0000)]
am d9843b2e: Merge "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html" into klp-modular-dev

* commit 'd9843b2ebeb9a99b620aae3a3d17ea64fb00358a':
  Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html

10 years agoam 9f595d98: am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce845...
Deepanshu Gupta [Wed, 9 Jul 2014 00:01:51 +0000 (00:01 +0000)]
am 9f595d98: am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '9f595d98979151860d76516f37bcc47238370f44':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours...
Deepanshu Gupta [Tue, 8 Jul 2014 23:57:43 +0000 (23:57 +0000)]
am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '575e334d1d132321155d9afddc5733cfd5e58b2d':
  Change font family name. [DO NOT MERGE]

10 years agoam 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e5407...
Deepanshu Gupta [Tue, 8 Jul 2014 23:54:06 +0000 (23:54 +0000)]
am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '6077f5f2340a26954033c5e1724506efbe478fba':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb...
Deepanshu Gupta [Tue, 8 Jul 2014 23:52:33 +0000 (23:52 +0000)]
am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '813e2ac3a03aec7052f1d9fcd2f53ef51493374c':
  Change font family name. [DO NOT MERGE]

10 years agoam 6dfce3f7: am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f...
Deepanshu Gupta [Tue, 8 Jul 2014 23:50:15 +0000 (23:50 +0000)]
am 6dfce3f7: am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '6dfce3f72c6e315013e323f4c1bb918c449d7d61':
  Change font family name. [DO NOT MERGE]

10 years agoam 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours...
Deepanshu Gupta [Tue, 8 Jul 2014 23:50:09 +0000 (23:50 +0000)]
am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '2e9dc1fe510ae2c41bdd7415e9fc1c903ebfa336':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fd...
Deepanshu Gupta [Tue, 8 Jul 2014 23:48:14 +0000 (23:48 +0000)]
am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'bda28629dd2be00c1fda9a09192aef17f44fc919':
  Change font family name. [DO NOT MERGE]

10 years agoam 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92...
Deepanshu Gupta [Tue, 8 Jul 2014 23:45:05 +0000 (23:45 +0000)]
am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '4b84593f8b34ecb16cf9ff413d0e4f3d14f0e422':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change...
Deepanshu Gupta [Tue, 8 Jul 2014 23:43:39 +0000 (23:43 +0000)]
am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '1e34469469fca5770f9c5f811b592d1f3687ddc5':
  Change font family name. [DO NOT MERGE]

10 years agoam 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change...
Deepanshu Gupta [Tue, 8 Jul 2014 23:41:59 +0000 (23:41 +0000)]
am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '00a1033408407bce5997e81165ffea35844786a1':
  Change font family name. [DO NOT MERGE]

10 years agoam b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc...
Deepanshu Gupta [Tue, 8 Jul 2014 23:39:43 +0000 (23:39 +0000)]
am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b0470a1fce9e496b4812e8d652db20b8af656c02':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family...
Deepanshu Gupta [Tue, 8 Jul 2014 23:38:48 +0000 (23:38 +0000)]
am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '0b4876043be6eb9c2eaccb8270370b9275d4d899':
  Change font family name. [DO NOT MERGE]

10 years agoam c295c08f: am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e...
Deepanshu Gupta [Tue, 8 Jul 2014 23:38:26 +0000 (23:38 +0000)]
am c295c08f: am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'c295c08fb4d08e4f335754aa62ff0d957a339109':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family...
Deepanshu Gupta [Tue, 8 Jul 2014 23:36:50 +0000 (23:36 +0000)]
am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '931e049e6566723027554e57905de109b6faa783':
  Change font family name. [DO NOT MERGE]

10 years agoam d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge...
Deepanshu Gupta [Tue, 8 Jul 2014 23:35:09 +0000 (23:35 +0000)]
am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd7ce84528da16ef53eb8e3c9f34a5c7ca90fd1b3':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a...
Deepanshu Gupta [Tue, 8 Jul 2014 23:34:08 +0000 (23:34 +0000)]
am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'efa0e90cc581a9bbef9ae15ce8f1b6780c1c4bfe':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:33:00 +0000 (23:33 +0000)]
am 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '61d3dea672ed8f2f4f90860580c37766b0197a58':
  Change font family name. [DO NOT MERGE]

10 years agoam 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT...
Deepanshu Gupta [Tue, 8 Jul 2014 23:32:12 +0000 (23:32 +0000)]
am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '5414f83d38455fcd8c788ea1b5cf61aaef3d0a5d':
  Change font family name. [DO NOT MERGE]

10 years agoMerge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 16:25:05 +0000 (16:25 +0000)]
Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev

10 years agoam d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:30:20 +0000 (23:30 +0000)]
am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'd53a9fcb7c56d6495e88cc3e39e2892e449a9171':
  Change font family name. [DO NOT MERGE]

10 years agoam 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script...
Deepanshu Gupta [Tue, 8 Jul 2014 23:30:10 +0000 (23:30 +0000)]
am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '10e540733416a94206a656ce749fa046ab3e7655':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:29:03 +0000 (23:29 +0000)]
am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '8c8bb83e623e1932853230cb25a3330fcedb73ff':
  Change font family name. [DO NOT MERGE]

10 years agoam e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename...
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:41 +0000 (23:28 +0000)]
am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'e63b7ad391effb405712647f761402ce15d0ea48':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:32 +0000 (23:28 +0000)]
am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit 'd2829b490989b595118c7bd17c1dbff6789cacaa':
  Change font family name. [DO NOT MERGE]

10 years agoam ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK...
Deepanshu Gupta [Tue, 8 Jul 2014 23:26:15 +0000 (23:26 +0000)]
am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'ca82da92db2949f134af01f577167639cbfc79bc':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:25:22 +0000 (23:25 +0000)]
am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '979f9c685e31a07e9bd1d89c0947b863dd456940':
  Change font family name. [DO NOT MERGE]

10 years agoam 432d16f9: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:17 +0000 (23:24 +0000)]
am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '432d16f97adab9d845904e25b50671cf35cfb628':
  Change font family name. [DO NOT MERGE]

10 years agoam 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for...
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:15 +0000 (23:24 +0000)]
am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit '5acf782c6822bf6c1b24d3582f52d65a949912f6':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:05 +0000 (23:24 +0000)]
am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '8e11659a43b34d465deb631575425b1706547dcc':
  Change font family name. [DO NOT MERGE]

10 years agoam e30d3fdd: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:23:21 +0000 (23:23 +0000)]
am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'e30d3fdd04840bfd90a172492edcacffeeea81da':
  Change font family name. [DO NOT MERGE]

10 years agoam 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE...
Deepanshu Gupta [Tue, 8 Jul 2014 23:21:34 +0000 (23:21 +0000)]
am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5d0db7f2ff4a16a40bbdba9b1ae9b4434554bced':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:19:46 +0000 (23:19 +0000)]
am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'd751eed44bcb28461dc853df08b89e5bc8ab6f60':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb...
Deepanshu Gupta [Tue, 8 Jul 2014 23:17:22 +0000 (23:17 +0000)]
am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5455ddc48fc31faea739a21cb46bda04bf36bb92':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:15:39 +0000 (23:15 +0000)]
am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'b49e21e153c59b31503a376d62257e4fc6e7ce4f':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoChange font family name. [DO NOT MERGE]
Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]
Change font family name. [DO NOT MERGE]

During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)

10 years agoChange font family name. [DO NOT MERGE]
Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]
Change font family name. [DO NOT MERGE]

During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)

10 years agoMerge "Make dex2oat heap size product configurable [frameworks/base]"
Brian Carlstrom [Wed, 9 Jul 2014 04:07:56 +0000 (04:07 +0000)]
Merge "Make dex2oat heap size product configurable [frameworks/base]"

10 years agoMerge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Tue, 8 Jul 2014 23:13:32 +0000 (23:13 +0000)]
Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

10 years agoMake dex2oat heap size product configurable [frameworks/base]
Brian Carlstrom [Tue, 8 Jul 2014 17:40:59 +0000 (10:40 -0700)]
Make dex2oat heap size product configurable [frameworks/base]

Bug: 15919420
Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006

10 years agoam 957ec05e: am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks...
Stephen Hines [Tue, 8 Jul 2014 21:29:14 +0000 (21:29 +0000)]
am 957ec05e: am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."

* commit '957ec05ef67b5909e9e66bcf28eae29c2dc148b3':
  Adds support for multi-input kernels to Frameworks/Base/RS.

10 years agoam 70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
Stephen Hines [Tue, 8 Jul 2014 21:25:19 +0000 (21:25 +0000)]
am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."

* commit '70a3c558645f8e693ce37577fdd61b8d1fd4ed9a':
  Adds support for multi-input kernels to Frameworks/Base/RS.

10 years agoam f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev
Ricardo Cervera [Tue, 8 Jul 2014 17:36:31 +0000 (17:36 +0000)]
am f4d498f1: Merge "docs: Release notes for support lib v20" into klp-modular-dev

* commit 'f4d498f17f5abc9297dc5c3eff0858f773828044':
  docs: Release notes for support lib v20

10 years agoMerge "docs: Release notes for support lib v20" into klp-modular-dev
Ricardo Cervera [Tue, 8 Jul 2014 17:34:14 +0000 (17:34 +0000)]
Merge "docs: Release notes for support lib v20" into klp-modular-dev

10 years agodocs: Release notes for support lib v20
Ricardo Cervera [Mon, 7 Jul 2014 20:15:56 +0000 (13:15 -0700)]
docs: Release notes for support lib v20

Change-Id: I82bbad9ad8945e9437b790e0f47622ef00b318f1

10 years agoam 9a3dd19d: docs: Fixed angle bracket typo for task locking command line instruction...
Quddus Chong [Tue, 8 Jul 2014 17:16:45 +0000 (17:16 +0000)]
am 9a3dd19d: docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312

* commit '9a3dd19df890972a66c2b74ac6e47fc49de5bc2f':
  docs: Fixed angle bracket typo for task locking command line instructions. bug: 16153312

10 years agodocs: Fixed angle bracket typo for task locking command line instructions.
Quddus Chong [Tue, 8 Jul 2014 17:07:43 +0000 (10:07 -0700)]
docs: Fixed angle bracket typo for task locking command line instructions.
bug: 16153312

Change-Id: If552028d36878398fe6fd999e711dff321fa9f13

10 years agoam a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for...
Robert Greenwalt [Tue, 8 Jul 2014 17:03:36 +0000 (17:03 +0000)]
am a7efe9b8: am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"

* commit 'a7efe9b8743e4a7d8a5b9ef247f6d780f33b4021':
  Add Telefonica/Movistar specific APN details for dun

10 years agoam 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"
Robert Greenwalt [Tue, 8 Jul 2014 16:59:17 +0000 (16:59 +0000)]
am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"

* commit '912700fca8e02fe93fca7d95ef22472f77349ffe':
  Add Telefonica/Movistar specific APN details for dun

10 years agoam 74223986: Doc Update: Add Cloud Save to left nav.
kmccormick [Mon, 7 Jul 2014 23:23:35 +0000 (23:23 +0000)]
am 74223986: Doc Update: Add Cloud Save to left nav.

* commit '74223986adef1ccee9c29b68c6eaca3e9a5ff1de':
  Doc Update: Add Cloud Save to left nav.

10 years agoChange font family name. [DO NOT MERGE]
Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]
Change font family name. [DO NOT MERGE]

During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)

10 years agoDoc Update: Add Cloud Save to left nav.
kmccormick [Mon, 7 Jul 2014 21:18:30 +0000 (14:18 -0700)]
Doc Update: Add Cloud Save to left nav.

Change-Id: Id87b0ea16231bc70cbd8147ec5252aad251f2363

10 years agoam 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from...
Craig Mautner [Mon, 7 Jul 2014 21:24:41 +0000 (21:24 +0000)]
am 6d6d2189: am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '6d6d2189625a679948920861b957948b505cb53f':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.

10 years agoam 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error...
Craig Mautner [Mon, 7 Jul 2014 21:19:45 +0000 (21:19 +0000)]
am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."

* commit '08881385a86bf887669a555ae03759c374ec9c50':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.

10 years agoam fc55076b: Merge "docs: Minor fix in the Building Your Project with Gradle guide...
Ricardo Cervera [Mon, 7 Jul 2014 21:16:06 +0000 (21:16 +0000)]
am fc55076b: Merge "docs: Minor fix in the Building Your Project with Gradle guide" into klp-modular-dev

* commit 'fc55076b5899e67b0666e490bc56034b49a7a042':
  docs: Minor fix in the Building Your Project with Gradle guide

10 years agoam 044492e1: am 52a154fe: Merge "Remove"
Brian Carlstrom [Mon, 7 Jul 2014 21:00:07 +0000 (21:00 +0000)]
am 044492e1: am 52a154fe: Merge "Remove"

* commit '044492e1b710c1e604c02b08e0ec97cbb1d5d513':
  Remove

10 years agoam 52a154fe: Merge "Remove"
Brian Carlstrom [Mon, 7 Jul 2014 20:55:16 +0000 (20:55 +0000)]
am 52a154fe: Merge "Remove"

* commit '52a154febb7c06b142116235c368417dd5e542ba':
  Remove

10 years agoMerge "Add Telefonica/Movistar specific APN details for dun"
Robert Greenwalt [Tue, 8 Jul 2014 16:53:49 +0000 (16:53 +0000)]
Merge "Add Telefonica/Movistar specific APN details for dun"

10 years agoAdd Telefonica/Movistar specific APN details for dun
Albert [Tue, 8 Jul 2014 04:56:08 +0000 (06:56 +0200)]
Add Telefonica/Movistar specific APN details for dun

Movistar Spain needs to add a specific APN to offer tethering
in their devices.

Change-Id: I5554ff98a5ac4c5f33b9af0083e1fac8305c9e13
Signed-off-by: Albert <alberto.crespell@gmail.com>
10 years agoMerge "Adds support for multi-input kernels to Frameworks/Base/RS."
Stephen Hines [Tue, 8 Jul 2014 21:18:17 +0000 (21:18 +0000)]
Merge "Adds support for multi-input kernels to Frameworks/Base/RS."