Luan Nguyen
15ebb4daab
am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687
...
* commit '96a99bc3c1f57298c551254fcb8854410ff4e53f':
docs: Update device art generator to include Wear generic devices.
2015-02-13 00:33:29 +00:00
Luan Nguyen
4317ab134b
am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb
...
* commit '86391a2f63d60513279481e02c7234367cbced85':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-13 00:33:24 +00:00
Luan Nguyen
968db3619a
am b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d
...
* commit 'b8f9e04867aefe3b2f8fba05664c652f12bedc18':
docs: Fix notification api guide issues (7461154, 12765600)
2015-02-13 00:33:18 +00:00
Luan Nguyen
474746c7b0
am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
...
automerge: fe2c687
* commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
docs: Update device art generator to include Wear generic devices.
2015-02-13 00:16:48 +00:00
Luan Nguyen
71cf2b6d53
am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
...
automerge: e0306bb
* commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-13 00:15:09 +00:00
Luan Nguyen
b14aec1b95
am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
...
automerge: 946bf2d
* commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (7461154, 12765600)
2015-02-13 00:13:35 +00:00
Luan Nguyen
8d0df9b891
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
2015-02-12 19:01:03 +00:00
Luan Nguyen
fe5e7e92a1
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
2015-02-12 17:11:28 +00:00
Luan Nguyen
e1f90b4e1e
Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
2015-02-12 17:10:50 +00:00
Narayan Kamath
00e821a860
am c7e48719: Merge "Remove references to persist.sys.language/country."
...
automerge: 8be3724
* commit '8be3724a06f7b2d28c6664ca11a03f91f97f0972':
Remove references to persist.sys.language/country.
2015-02-12 16:41:41 +00:00
Narayan Kamath
b61db8229a
Remove references to persist.sys.language/country.
...
Addresses a couple of TODOs now that all usages have been
removed and fixes a doc that specifies how the emulator locale
can be set.
bug: 17691569
Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c
2015-02-12 13:16:55 +00:00
Luan Nguyen
e4b5387d62
docs: Fix issue with onCreate() method declaration in file backup section
...
bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
2015-02-11 11:38:41 -08:00
Luan Nguyen
14ec5fe09e
docs: Update device art generator to include Wear generic devices.
...
bug: 14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
2015-02-11 11:17:10 -08:00
Shanea King-Roberson
524c46001f
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c
...
automerge: accf077
* commit 'accf0770306419773c3119eb32ca912077894b11':
Adding videos for 5.0 changes and watch face development.
2015-02-10 20:50:57 +00:00
Shanea King-Roberson
696b68c4fc
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
...
* commit '24513bc580024a8a90c1ceab6746c0abb452d678':
Adding videos for 5.0 changes and watch face development.
2015-02-10 20:17:53 +00:00
Luan Nguyen
891718acd5
docs: Fix notification api guide issues (7461154, 12765600)
...
bug: 7461154
bug: 12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
2015-02-10 12:05:50 -08:00
Shanea King-Roberson
c86ac21f73
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
2015-02-10 19:57:30 +00:00
Luan Nguyen
c6ec79913f
am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
...
automerge: 6ee9018
* commit '6ee90183ab79f9c3b5216a9b0b6518de7679734a':
docs: Fix various issues with incorrect code samples.
2015-02-10 19:18:37 +00:00
Eric Gilmore
ac4dfec8b3
am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779
...
automerge: 2b7f0cf
* commit '2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
Doc change: refactor GCM docs to be platform-agnostic.
2015-02-10 19:16:49 +00:00
Luan Nguyen
18fc7b8554
am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
...
* commit 'ba795593e5941d89a861bb848c3f98800a0be3d6':
docs: Fix various issues with incorrect code samples.
2015-02-10 18:56:32 +00:00
Luan Nguyen
e49fbfa21c
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
2015-02-10 18:31:30 +00:00
Eric Gilmore
d86211292e
Adding videos for 5.0 changes and watch face development.
...
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
2015-02-10 10:29:36 -08:00
Eric Gilmore
f35e815939
am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
...
automerge: 2b36779
* commit '2b36779f30a511cc4439a519c95963280a779fdc':
Doc change: refactor GCM docs to be platform-agnostic.
2015-02-10 18:05:23 +00:00
Luan Nguyen
c25adda636
docs: Fix various issues with incorrect code samples.
...
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
2015-02-10 09:39:44 -08:00
Eric Gilmore
c9dbaf0483
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
2015-02-10 01:13:03 +00:00
kmccormick
0137175af9
Doc change: refactor GCM docs to be platform-agnostic.
...
Fix for:
b/17733410
Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
2015-02-09 16:28:15 -08:00
Joe Fernandez
843b2c7aa9
am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
...
* commit 'e3bc656a623b34d523001e628e779fe2f69e0fb1':
docs: remove + annotations in version references
2015-02-07 01:53:04 +00:00
Joe Fernandez
5ac30e10ab
am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
...
* commit '66c06cf9bb4fa3ba1477e120843e8fdb8a360e4e':
docs: remove + annotations in version references
2015-02-07 01:13:52 +00:00
Joe Fernandez
ba20f98c88
Merge "docs: remove + annotations in version references" into lmp-docs
2015-02-07 00:55:17 +00:00
Joe Fernandez
e9557d7d27
am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860
...
automerge: d99924d
* commit 'd99924d556b95bc05bbff9408519e301983193fb':
docs: February 2015 Dashboard updates
2015-02-02 20:29:31 +00:00
Joe Fernandez
175ddbcf2e
am d14b6432: am eba583e3: docs: February 2015 Dashboard updates
...
automerge: c6ca860
* commit 'c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
docs: February 2015 Dashboard updates
2015-02-02 19:24:38 +00:00
Joe Fernandez
eba583e393
docs: February 2015 Dashboard updates
...
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
2015-02-02 08:48:42 -08:00
Joe Fernandez
14437e4781
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2
...
automerge: f4b2bd4
* commit 'f4b2bd4c41233327f0fb2e4d45af8dc9c8eba689':
docs: training intent doc error update
2015-01-31 04:20:19 +00:00
Joe Fernandez
346a9a2f36
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9
...
automerge: cacf7da
* commit 'cacf7da1c4d078641f099bab717e155609c5dc99':
docs: training intent doc error update
2015-01-31 03:04:16 +00:00
Joe Fernandez
1a9bf5c100
Merge "docs: training intent doc error update" into lmp-docs
2015-01-31 01:00:16 +00:00
Rich Slogar
367bfb3b50
docs: training intent doc error update
...
b/18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
2015-01-30 16:55:55 -08:00
Joe Fernandez
52c39c27e9
am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6
...
automerge: 95fa882
* commit '95fa88250a1957c7adfbd35d52f62e42cbe03df6':
docs: studio emulator platform update
2015-01-31 00:29:37 +00:00
Joe Fernandez
3548de6073
am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
...
* commit '5c37c8e66227b15d471047e7c4c986cf3c67876a':
docs: studio emulator platform update
2015-01-31 00:14:39 +00:00
Joe Fernandez
2b68ab3add
Merge "docs: studio emulator platform update" into lmp-docs
2015-01-30 23:25:51 +00:00
Rich Slogar
9c64950ee2
am 4649dcd7: am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs automerge: e9e2707
...
* commit '4649dcd7c41aa3893ff0e52c5142a7d95c678b7b':
docs: linux requirements update
2015-01-30 02:13:45 +00:00
Scott Rowe
811935e51c
am b2788236: am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs automerge: 1b5a0fb
...
* commit 'b27882361ec5b0602d55783131ba28942b318a77':
docs: Card View for Android TV training
2015-01-30 02:13:40 +00:00
Scott Rowe
ec1e8aa6af
am 4ca01ef2: am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text automerge: 9ad282f
...
* commit '4ca01ef21d7eacf398989740c6985a97891111e6':
docs: b/19193358 Android TV overscan instructions: settings reversed in text
2015-01-30 02:13:34 +00:00
Rich Slogar
e9e2707fef
am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs
...
* commit 'f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
docs: linux requirements update
2015-01-30 01:58:22 +00:00
Scott Rowe
1b5a0fb681
am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
...
* commit '8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
docs: Card View for Android TV training
2015-01-30 01:53:53 +00:00
Scott Rowe
9ad282fd73
am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text
...
* commit '2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
docs: b/19193358 Android TV overscan instructions: settings reversed in text
2015-01-30 01:53:48 +00:00
Rich Slogar
e0063faa87
Merge "docs: linux requirements update" into lmp-docs
2015-01-30 01:32:18 +00:00
Scott Rowe
b86c3b80db
Merge "docs: Card View for Android TV training" into lmp-docs
2015-01-30 01:30:44 +00:00
Scott Rowe
87a1bf0970
docs: b/19193358 Android TV overscan instructions: settings reversed in text
...
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
2015-01-29 11:05:13 -08:00
Scott Rowe
da0c5de5fa
docs: Card View for Android TV training
...
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
2015-01-29 10:50:25 -08:00
Dirk Dougherty
1cbe026b93
am 820d5c52: am 8b1ad8e4: am 49738792: Doc change: Update Ads terms language. automerge: 3f9d57d automerge: e0b5a38
...
* commit '820d5c52b7e65bffeb4291887f5a1011e7ce971e':
Doc change: Update Ads terms language.
2015-01-29 01:11:14 +00:00
