OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 03:06:38 +0000 (03:06 +0000)]
am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit '224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
  docs: removing code captions

9 years agoam 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 03:06:35 +0000 (03:06 +0000)]
am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit '78001f9338b72876e95b7d25053b706804a21070':
  docs: Add screenshot

9 years agoam c987ca05: Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 02:28:51 +0000 (02:28 +0000)]
am c987ca05: Merge "docs: removing code captions" into lmp-docs

* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions

9 years agoam ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 02:28:47 +0000 (02:28 +0000)]
am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs

* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
  docs: Add screenshot

9 years agoMerge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:52 +0000 (01:31 +0000)]
Merge "docs: removing code captions" into lmp-docs

9 years agoMerge "docs: Add screenshot" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:13 +0000 (01:31 +0000)]
Merge "docs: Add screenshot" into lmp-docs

9 years agoam e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja...
David Friedman [Sat, 17 Jan 2015 00:36:27 +0000 (00:36 +0000)]
am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit 'e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoam fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es...
David Friedman [Sat, 17 Jan 2015 00:30:18 +0000 (00:30 +0000)]
am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

9 years agoMerge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh...
David Friedman [Sat, 17 Jan 2015 00:23:29 +0000 (00:23 +0000)]
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs

9 years agoLocalization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
David Friedman [Wed, 19 Nov 2014 21:03:45 +0000 (13:03 -0800)]
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw

Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f

9 years agoam 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code...
Quddus Chong [Fri, 16 Jan 2015 22:28:24 +0000 (22:28 +0000)]
am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit '930ac01fd728067a79335e2983b870528c13a872':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into...
Joe Fernandez [Fri, 16 Jan 2015 22:23:22 +0000 (22:23 +0000)]
am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
  docs: adding studio-sample-in-editor.png file

9 years agoam 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Fri, 16 Jan 2015 22:23:19 +0000 (22:23 +0000)]
am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit '73f36d47465da113f39270f4f9cf5d601aa0b585':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoam de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets....
Quddus Chong [Fri, 16 Jan 2015 22:21:34 +0000 (22:21 +0000)]
am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

* commit 'de0a87007b987a76af2ddd526dd473ad83fbb74b':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906

9 years agoam 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 22:15:25 +0000 (22:15 +0000)]
am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
  docs: adding studio-sample-in-editor.png file

9 years agoam e229751d: docs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Fri, 16 Jan 2015 22:15:21 +0000 (22:15 +0000)]
am e229751d: docs: Add browseable Wearable Support Lib Javadoc

* commit 'e229751d11692ede7fed3b56472f2d020767b412':
  docs: Add browseable Wearable Support Lib Javadoc

9 years agoMerge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906...
Quddus Chong [Fri, 16 Jan 2015 22:03:31 +0000 (22:03 +0000)]
Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs

9 years agoMerge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 21:58:36 +0000 (21:58 +0000)]
Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs

9 years agodocs: adding studio-sample-in-editor.png file
Rich Slogar [Fri, 16 Jan 2015 20:26:20 +0000 (12:26 -0800)]
docs: adding studio-sample-in-editor.png file

Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505

9 years agoam aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into...
Joe Fernandez [Fri, 16 Jan 2015 19:49:08 +0000 (19:49 +0000)]
am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit 'aafd29beb8d455fd825e2f0f0f8792b1ca6dc6ca':
  docs: studio disk space requirements typo

9 years agodocs: Fixed typos in Game Controller training code snippets.
Quddus Chong [Fri, 16 Jan 2015 19:35:07 +0000 (11:35 -0800)]
docs: Fixed typos in Game Controller training code snippets.
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27

9 years agodocs: Add browseable Wearable Support Lib Javadoc
Ricardo Cervera [Tue, 13 Jan 2015 18:04:04 +0000 (10:04 -0800)]
docs: Add browseable Wearable Support Lib Javadoc

Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1

9 years agoam c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:57:42 +0000 (18:57 +0000)]
am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit 'c6f70adf2439978954fefe00a9ff24135654ed52':
  docs: link to sdk manager

9 years agoam 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 16 Jan 2015 18:57:39 +0000 (18:57 +0000)]
am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit '85bfcbd3e2367768c1d026cbba6fe0fa9a6b2dae':
  docs: Added info on noHistory and onActivityResult().

9 years agoam 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:56:25 +0000 (18:56 +0000)]
am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs

* commit '8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4':
  docs: studio disk space requirements typo

9 years agoam c84021ba: Merge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:52:12 +0000 (18:52 +0000)]
am c84021ba: Merge "docs: link to sdk manager" into lmp-docs

* commit 'c84021ba99d9326b016120a1d7aab4ee551bcce9':
  docs: link to sdk manager

9 years agoam 97c4ba98: docs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 16 Jan 2015 18:52:08 +0000 (18:52 +0000)]
am 97c4ba98: docs: Added info on noHistory and onActivityResult().

* commit '97c4ba9862006e2c9f4cea07f55dc7120d305e5a':
  docs: Added info on noHistory and onActivityResult().

9 years agoMerge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:49:27 +0000 (18:49 +0000)]
Merge "docs: studio disk space requirements typo" into lmp-docs

9 years agoMerge "docs: link to sdk manager" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:47:51 +0000 (18:47 +0000)]
Merge "docs: link to sdk manager" into lmp-docs

9 years agoam 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
Ricardo Cervera [Fri, 16 Jan 2015 18:29:25 +0000 (18:29 +0000)]
am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoresolved conflicts for merge of e8f6bd48 to lmp-dev
Ricardo Cervera [Fri, 16 Jan 2015 17:54:30 +0000 (09:54 -0800)]
resolved conflicts for merge of e8f6bd48 to lmp-dev

Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff

9 years agodocs: Added info on noHistory and onActivityResult().
Ricardo Cervera [Fri, 4 Apr 2014 18:17:06 +0000 (11:17 -0700)]
docs: Added info on noHistory and onActivityResult().

Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f

9 years agoam 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
Ricardo Cervera [Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)]
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
Ricardo Cervera [Fri, 16 Jan 2015 17:14:44 +0000 (17:14 +0000)]
am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

9 years agoam 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:58:57 +0000 (00:58 +0000)]
am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs

* commit '3212c3aa226f8cc7cf54e72772a001906fd4d7c3':
  docs: studio support library revisions update

9 years agoam d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into...
Dirk Dougherty [Fri, 16 Jan 2015 00:58:53 +0000 (00:58 +0000)]
am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

* commit 'd1ff86058a06874d6d607dea951b34370e053654':
  Doc change: Add new analytics information to Distribute.

9 years agoam 3b7dbd66: Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:15 +0000 (00:50 +0000)]
am 3b7dbd66: Merge "docs: build link update" into lmp-docs

* commit '3b7dbd66d8d8df89bb4700bfdfaf86f264ff7ea4':
  docs: build link update

9 years agoam 485b9566: Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:12 +0000 (00:50 +0000)]
am 485b9566: Merge "docs: Plugin reference update" into lmp-docs

* commit '485b9566a9fc98be8b4dee40ddca43690de1a465':
  docs: Plugin reference update

9 years agoam 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:50:08 +0000 (00:50 +0000)]
am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs

* commit '48fc1d7ba7e3e2c0efd71b3b7ed29997d3454857':
  docs: studio sample procedure update

9 years agoMerge "docs: studio support library revisions update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:43:56 +0000 (00:43 +0000)]
Merge "docs: studio support library revisions update" into lmp-docs

9 years agoMerge "Doc change: Add new analytics information to Distribute." into lmp-docs
Dirk Dougherty [Fri, 16 Jan 2015 00:41:55 +0000 (00:41 +0000)]
Merge "Doc change: Add new analytics information to Distribute." into lmp-docs

9 years agoDoc change: Add new analytics information to Distribute.
Dirk Dougherty [Fri, 12 Dec 2014 19:51:13 +0000 (11:51 -0800)]
Doc change: Add new analytics information to Distribute.

Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84

9 years agoMerge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:49 +0000 (00:27 +0000)]
Merge "docs: build link update" into lmp-docs

9 years agoMerge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:00 +0000 (00:27 +0000)]
Merge "docs: Plugin reference update" into lmp-docs

9 years agoMerge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:26:38 +0000 (00:26 +0000)]
Merge "docs: studio sample procedure update" into lmp-docs

9 years agodocs: studio support library revisions update
Rich Slogar [Thu, 11 Dec 2014 23:51:18 +0000 (15:51 -0800)]
docs: studio support library revisions update

Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b

9 years agoam d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.
Luan Nguyen [Thu, 15 Jan 2015 19:30:08 +0000 (19:30 +0000)]
am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations.

* commit 'd3cc11a1647c2aa9d830c1538e6a3b1355c9ca1f':
  docs: Remove reference to handheld app for bitmap resource locations.

9 years agodocs: Remove reference to handheld app for bitmap resource locations.
Luan Nguyen [Thu, 15 Jan 2015 17:24:09 +0000 (09:24 -0800)]
docs: Remove reference to handheld app for bitmap resource locations.

bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6

9 years agodocs: removing code captions
Scott Rowe [Mon, 12 Jan 2015 23:28:04 +0000 (15:28 -0800)]
docs: removing code captions

Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45

9 years agoam f5569413: docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:42:22 +0000 (16:42 +0000)]
am f5569413: docs: Fix broken link in Common Intents
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents

9 years agoam f5569413: docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:35:04 +0000 (16:35 +0000)]
am f5569413: docs: Fix broken link in Common Intents

* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents

9 years agodocs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:28:22 +0000 (08:28 -0800)]
docs: Fix broken link in Common Intents

Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537

9 years agodocs: Add screenshot
Scott Rowe [Mon, 5 Jan 2015 21:35:46 +0000 (13:35 -0800)]
docs: Add screenshot

Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396

9 years agoam a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into...
Ricardo Cervera [Mon, 12 Jan 2015 21:59:33 +0000 (21:59 +0000)]
am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

* commit 'a87f35555d4aca13902a334691815cfa462feb30':
  docs: Add parent calls to WatchFaces snippet.

9 years agoam d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Ricardo Cervera [Mon, 12 Jan 2015 21:53:27 +0000 (21:53 +0000)]
am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.

9 years agoMerge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Ricardo Cervera [Mon, 12 Jan 2015 21:49:21 +0000 (21:49 +0000)]
Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs

9 years agoam 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images...
Joe Fernandez [Mon, 12 Jan 2015 21:34:19 +0000 (21:34 +0000)]
am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs

* commit '661ca54706c146697fe45dfcf81840c25b9022b2':
  docs: Removing obsolete L-Preview docs and images

9 years agoam 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:27:24 +0000 (21:27 +0000)]
am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs

* commit '8062f1f34113f4d73d37ebb57245342cca9d8f9c':
  docs: Removing obsolete L-Preview docs and images

9 years agoam 1946978c: am 76110e7c: docs: Remove Wear preview reference docs
Joe Fernandez [Mon, 12 Jan 2015 21:25:42 +0000 (21:25 +0000)]
am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs

* commit '1946978c5341fe06db287a4535769ea12e6b6745':
  docs: Remove Wear preview reference docs

9 years agoMerge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:23:16 +0000 (21:23 +0000)]
Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs

9 years agoam 76110e7c: docs: Remove Wear preview reference docs
Joe Fernandez [Mon, 12 Jan 2015 21:16:26 +0000 (21:16 +0000)]
am 76110e7c: docs: Remove Wear preview reference docs

* commit '76110e7c46297a221d8f2c92fbaef46b6f405294':
  docs: Remove Wear preview reference docs

9 years agodocs: Add parent calls to WatchFaces snippet.
Ricardo Cervera [Mon, 12 Jan 2015 20:54:32 +0000 (12:54 -0800)]
docs: Add parent calls to WatchFaces snippet.

Bug: 18982021

Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b

9 years agodocs: Remove Wear preview reference docs
Joe Fernandez [Mon, 12 Jan 2015 18:28:03 +0000 (10:28 -0800)]
docs: Remove Wear preview reference docs

These docs are out of date and unreachable due to redirect rules.

Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14

9 years agodocs: Removing obsolete L-Preview docs and images
Joe Fernandez [Mon, 12 Jan 2015 18:20:41 +0000 (10:20 -0800)]
docs: Removing obsolete L-Preview docs and images

- /preview/images/
- TV Preview index pages
- Notifications preview page

Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117

9 years agoam 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
Eric Gilmore [Mon, 12 Jan 2015 17:13:14 +0000 (17:13 +0000)]
am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs

* commit '10b829e126482c54657371485ecf425b3f05bb0f':
  Adding Android Fundamentals video.

9 years agoam fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
Eric Gilmore [Mon, 12 Jan 2015 17:07:12 +0000 (17:07 +0000)]
am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs

* commit 'fec824b6118a73bdc760acaf7dbd9420ffe7fe91':
  Adding Android Fundamentals video.

9 years agoMerge "Adding Android Fundamentals video." into lmp-docs
Eric Gilmore [Mon, 12 Jan 2015 17:02:30 +0000 (17:02 +0000)]
Merge "Adding Android Fundamentals video." into lmp-docs

9 years agoam 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which...
Eric Gilmore [Mon, 12 Jan 2015 16:46:35 +0000 (16:46 +0000)]
am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs

* commit '7862ba297f7106ef0208e8f1dbbe9f9e35c63485':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.

9 years agoam 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes...
Eric Gilmore [Mon, 12 Jan 2015 16:26:43 +0000 (16:26 +0000)]
am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs

* commit '6c8b80acbb456b5b537137a181dc2ad4cbd07adc':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.

9 years agoam 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar...
Deepanshu Gupta [Sat, 10 Jan 2015 10:13:04 +0000 (10:13 +0000)]
am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a

* commit '191d06b55598b653e0764638ca37d8618c9d085e':

9 years agoam 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge...
Deepanshu Gupta [Sat, 10 Jan 2015 10:13:00 +0000 (10:13 +0000)]
am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d

* commit '74e00d229b5e4fca4bffd94373d58f94a74255d5':

9 years agoam 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4
Deepanshu Gupta [Sat, 10 Jan 2015 10:12:56 +0000 (10:12 +0000)]
am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4

* commit '38884a30dfe0fffce0c6097fd9d406e45d04aea5':

9 years agoam 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de
Deepanshu Gupta [Sat, 10 Jan 2015 09:49:53 +0000 (09:49 +0000)]
am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de
automerge: 8d9361a

* commit '8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':

9 years agoSupport Locale.toLanguageTag on Java 6 automerge: dbd64f7
Deepanshu Gupta [Sat, 10 Jan 2015 09:48:39 +0000 (09:48 +0000)]
Support Locale.toLanguageTag on Java 6 automerge: dbd64f7
automerge: 7da2b5d

* commit '7da2b5dbc259ef026bb075905f9fda3695dd4615':

9 years agoLayoutLib: Fix System.arraycopy() automerge: 51fb775
Deepanshu Gupta [Sat, 10 Jan 2015 09:47:08 +0000 (09:47 +0000)]
LayoutLib: Fix System.arraycopy() automerge: 51fb775
automerge: 55c7bd4

* commit '55c7bd4dac3078ab220823e522c9257246933c46':

9 years agoam 74147527: am 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 04:59:11 +0000 (04:59 +0000)]
am 74147527: am 8505c387: Special case AppCompat to show action bar.
automerge: bb600de

* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.

9 years agoSupport Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:57:42 +0000 (04:57 +0000)]
Support Locale.toLanguageTag on Java 6
automerge: dbd64f7

* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6

9 years agoLayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 04:56:36 +0000 (04:56 +0000)]
LayoutLib: Fix System.arraycopy()
automerge: 51fb775

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()

9 years agoam ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show...
Deepanshu Gupta [Sat, 10 Jan 2015 03:56:47 +0000 (03:56 +0000)]
am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.

* commit 'ca67a249293d021808f349fa2e2f799451aeafe8':
  Special case AppCompat to show action bar.

9 years agoam c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:56:44 +0000 (03:56 +0000)]
am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6

* commit 'c5871ea1b830153e7f85367844bcc67b81a2c06b':
  Support Locale.toLanguageTag on Java 6

9 years agoam db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:52:05 +0000 (03:52 +0000)]
am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()

* commit 'db703ab64643ef91bbdb989a04597ecf7d0ca928':
  LayoutLib: Fix System.arraycopy()

9 years agoam bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:05 +0000 (03:51 +0000)]
am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.

* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.

9 years agoam dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:01 +0000 (03:51 +0000)]
am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6

* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6

9 years agoam 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:43:48 +0000 (03:43 +0000)]
am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()

9 years agoam 74147527: am 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:16:44 +0000 (02:16 +0000)]
am 74147527: am 8505c387: Special case AppCompat to show action bar.

* commit '74147527357b9abd9d30b3a2dbd72a5172a35625':
  Special case AppCompat to show action bar.

9 years agoam 8505c387: Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:10:55 +0000 (02:10 +0000)]
am 8505c387: Special case AppCompat to show action bar.

* commit '8505c3870a17f41d23329344fe381cd9ff324bd2':
  Special case AppCompat to show action bar.

9 years agoSupport Locale.toLanguageTag on Java 6
Deepanshu Gupta [Mon, 14 Jul 2014 22:50:49 +0000 (15:50 -0700)]
Support Locale.toLanguageTag on Java 6

Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)

9 years agoLayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Thu, 10 Jul 2014 20:20:42 +0000 (13:20 -0700)]
LayoutLib: Fix System.arraycopy()

Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.

Note that this was already being done for char.

Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit e1960cc0b541cda93db94de5bef42dff922b9ec3)

9 years agodocs: link to sdk manager
Rich Slogar [Sat, 10 Jan 2015 00:33:32 +0000 (16:33 -0800)]
docs: link to sdk manager

Change-Id: I41f656e2eee1189298292e3bcca387de05e0e3c7

9 years agoSpecial case AppCompat to show action bar.
Deepanshu Gupta [Fri, 9 Jan 2015 03:10:07 +0000 (19:10 -0800)]
Special case AppCompat to show action bar.

Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b

9 years agoMerge "Removing three obsolete lessons from TOC, which in turn removes them from...
Eric Gilmore [Fri, 9 Jan 2015 22:42:46 +0000 (22:42 +0000)]
Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs

9 years agoAdding Android Fundamentals video.
Eric Gilmore [Tue, 6 Jan 2015 17:30:30 +0000 (09:30 -0800)]
Adding Android Fundamentals video.

Bug: 18820337
Change-Id: I758de61902f375d02219414999ea7833b5787474

9 years agodocs: build link update
Rich Slogar [Wed, 7 Jan 2015 21:54:30 +0000 (13:54 -0800)]
docs: build link update

Change-Id: I06a3e7fc914dff829bd1d210675daf5f99ba68e0

9 years agoRemoving three obsolete lessons from TOC, which in turn removes them
Eric Gilmore [Wed, 7 Jan 2015 18:51:16 +0000 (10:51 -0800)]
Removing three obsolete lessons from TOC, which in turn removes them
from building-userinfo.jd when built.

Change-Id: If5cfbfadadb202946267ff83f665f8414875bd8c

9 years agoam 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
Deepanshu Gupta [Wed, 7 Jan 2015 19:46:03 +0000 (19:46 +0000)]
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev

* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.

9 years agoMerge "Fix tests on jenkins, take 2." into lmp-dev
Deepanshu Gupta [Wed, 7 Jan 2015 19:29:39 +0000 (19:29 +0000)]
Merge "Fix tests on jenkins, take 2." into lmp-dev

9 years agoFix tests on jenkins, take 2.
Deepanshu Gupta [Wed, 7 Jan 2015 19:22:22 +0000 (11:22 -0800)]
Fix tests on jenkins, take 2.

Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0

9 years agoam d385640f: am 491a8257: docs: Update Dashboard for January 2015
Joe Fernandez [Wed, 7 Jan 2015 08:48:04 +0000 (08:48 +0000)]
am d385640f: am 491a8257: docs: Update Dashboard for January 2015

* commit 'd385640f815a820aa1fecc2c009e1d0dfbe23777':
  docs: Update Dashboard for January 2015

9 years agoam 491a8257: docs: Update Dashboard for January 2015
Joe Fernandez [Wed, 7 Jan 2015 08:41:24 +0000 (08:41 +0000)]
am 491a8257: docs: Update Dashboard for January 2015

* commit '491a8257f46999d75ddc5c4c9eb599067ad380a0':
  docs: Update Dashboard for January 2015

9 years agodocs: Update Dashboard for January 2015
Joe Fernandez [Wed, 7 Jan 2015 08:22:46 +0000 (00:22 -0800)]
docs: Update Dashboard for January 2015

Change-Id: I20b2b2e22199db64367d5ed99b751353c3add07b