Luan Nguyen
377efac51d
am 15ebb4da: 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 '15ebb4daab95c5ae85ebe5070099d2ab3be83676':
docs: Update device art generator to include Wear generic devices.
2015-02-13 00:40:58 +00:00
Luan Nguyen
a0c4163d3a
am 4317ab13: 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 '4317ab134b1c46d23429f3a92c4ecd5a4d385b8e':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-13 00:40:54 +00:00
Luan Nguyen
846338956e
am 968db361: 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 '968db3619a0abc26d486544e17acd168941312c8':
docs: Fix notification api guide issues (7461154, 12765600)
2015-02-13 00:40:48 +00:00
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
Narayan Kamath
6f609928cf
am c7e48719: Merge "Remove references to persist.sys.language/country." automerge: 8be3724
...
automerge: 00e821a
* commit '00e821a8608efdc19041bdda1e832d3d4b3c29e2':
Remove references to persist.sys.language/country.
2015-02-12 19:36: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
8fcfd06ce5
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c automerge: accf077
...
automerge: 524c460
* commit '524c46001f3f55552194b774c2e89c8c0ff0507c':
Adding videos for 5.0 changes and watch face development.
2015-02-10 21:01:45 +00: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
5ed11d837f
am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs automerge: 6ee9018
...
automerge: c6ec799
* commit 'c6ec79913fbcf5b915ed55f3cc7b49690ee997f9':
docs: Fix various issues with incorrect code samples.
2015-02-10 20:10:56 +00:00
Eric Gilmore
077b27bfda
am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 automerge: 2b7f0cf
...
automerge: ac4dfec
* commit 'ac4dfec8b3e15405fc0b0eba581169e7feef28ff':
Doc change: refactor GCM docs to be platform-agnostic.
2015-02-10 20:09:08 +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
Yin-Chia Yeh
98bafbf956
Merge "Camera2: doc update for HAL3.3 tonemapping change"
2015-02-09 19:11:55 +00:00
Joe Fernandez
6bfe8325b9
am e3bc656a: am a8b341cd: am 5ac30e10: am 66c06cf9: am d224fb8a: am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
...
automerge: 843b2c7
* commit '843b2c7aa9e38f39732a279d7901f66893b37ab7':
docs: remove + annotations in version references
2015-02-07 01:56:15 +00: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
Yin-Chia Yeh
956c52b5a0
Camera2: doc update for HAL3.3 tonemapping change
...
Codegen doc change.
Change-Id: Idd5185767c177f3179e5833be3f42357a5ead25f
2015-02-06 12:53:31 -08:00
Joe Fernandez
6689e73782
am e9557d7d: am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 automerge: d99924d
...
* commit 'e9557d7d2728d1c77e4d173e8f6d954eeeb69357':
docs: February 2015 Dashboard updates
2015-02-02 20:37:46 +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
7a0e01d41a
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 automerge: f4b2bd4
...
automerge: 14437e4
* commit '14437e4781fea9688b7c68ec6c3201e8a926ab04':
docs: training intent doc error update
2015-01-31 04:25:18 +00: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
317c8ac2df
am 52c39c27: am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6 automerge: 95fa882
...
* commit '52c39c27e9f5fde74e2d326c6a3560334fbea926':
docs: studio emulator platform update
2015-01-31 00:34:50 +00: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