Joe Fernandez
b63166afd3
am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
...
automerge: 7cf74ee
* commit '7cf74ee6e2c51afaf07e29f8597475ec289a20ed':
docs: studio build output dir name update
2015-01-06 20:01:43 +00:00
Joe Fernandez
6d2dcbbd30
am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
...
automerge: 629612a
* commit '629612a9d2d1a52809cd0549a1b6d2cbcf1a3d09':
docs: gradle version update in plugin file
2015-01-06 19:58:32 +00:00
Joe Fernandez
414d895c11
am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
...
automerge: 148a578
* commit '148a57877ec5272a6768f427bd280a4d9c18acb1':
docs: gradle wrapper security note
2015-01-06 19:56:46 +00:00
Nick Kralevich
cfea9fbc53
resolved conflicts for merge of 175ef812 to master
...
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
2015-01-06 11:50:08 -08:00
Joe Fernandez
17197b856b
am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
...
automerge: 8109599b
* commit '8109599b1c6306d1f2239a88f0cf9ba3ea584f2b':
docs: studio workflow links
2015-01-06 19:36:41 +00:00
Nick Kralevich
0e55e3565e
resolved conflicts for merge of 1779fd15 to master
...
Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69
2015-01-06 11:29:44 -08:00
Alan Viverette
304ea5aac7
Merge "Allow use of theme attributes in color state lists"
2015-01-06 18:47:29 +00:00
Ricardo Cervera
2b2ad7ce9f
am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
automerge: 0281909
* commit '02819090ece2ed8ff4161a560fcb5acb8c0b9cb5':
docs: Update wearable lists docs
2015-01-06 02:39:22 +00:00
Joe Fernandez
1b0c367a32
am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
automerge: 66a49d9
* commit '66a49d994c997e74fcab7ce5b4e334cfd742d36c':
docs: studio device emulator updates
2015-01-06 02:37:41 +00:00
Sarah Maddox
041855e06d
am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
automerge: d259fb3
* commit 'd259fb3757f0813b3bb13dea9a65c6cab6617fc6':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:35:42 +00:00
Ricardo Cervera
509bd3a959
am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
automerge: 2d90b49
* commit '2d90b49ad2caa3f765ed9b4b8eab31da711f4d19':
docs: Adding vector drawables video
2015-01-06 02:34:17 +00:00
Joe Fernandez
f7f6bbc319
am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
automerge: 4d0c931
* commit '4d0c931be7b63ebcd5789b99c5f561b411823485':
docs: plugin reference update
2015-01-06 02:32:24 +00:00
Joe Fernandez
7cf74ee6e2
am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
...
* commit 'c632031af3ffb5e166ad25e78d41757b9b35ce84':
docs: studio build output dir name update
2015-01-06 02:26:55 +00:00
Joe Fernandez
629612a9d2
am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
...
* commit '06cdc2fd640c37b7251bc5ce37051e4da0b3552a':
docs: gradle version update in plugin file
2015-01-06 02:26:49 +00:00
Joe Fernandez
148a57877e
am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
...
* commit '4dc7c15860faa53f6cc408046959c7e8e6ebfd51':
docs: gradle wrapper security note
2015-01-06 02:26:44 +00:00
Joe Fernandez
175ef8121b
am 24a3ff47: am 765ae116: am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
...
* commit '24a3ff477037a634e7ae6bc99908faebd530d0a9':
docs: project file and toc updates
2015-01-06 02:26:38 +00:00
Joe Fernandez
8109599b1c
am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
...
* commit 'e7558b44f707979cb4f85b0ccd0862b9ea068ee6':
docs: studio workflow links
2015-01-06 02:26:32 +00:00
Joe Fernandez
1779fd1514
am d1489d5d: am a78664e0: am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
...
* commit 'd1489d5db00d030b873fe84f32fa5bd453152824':
docs: studio tips and ticks grammmar typo
2015-01-06 02:26:25 +00:00
Ricardo Cervera
02819090ec
am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
* commit '4d4b599d7c864d44267979fa71ca5b0bb27171b5':
docs: Update wearable lists docs
2015-01-06 02:26:18 +00:00
Joe Fernandez
66a49d994c
am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
* commit 'bea6f1e6457841b8be4e45ecb713762894799f7a':
docs: studio device emulator updates
2015-01-06 02:26:11 +00:00
Sarah Maddox
d259fb3757
am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
* commit '73c943fc71bbb35bd494b24cc649eaa168f3c1e5':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:26:05 +00:00
Ricardo Cervera
2d90b49ad2
am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
* commit 'fd731d4bebed075f1c1d4130c22dbb7475ec8efe':
docs: Adding vector drawables video
2015-01-06 02:25:58 +00:00
Joe Fernandez
4d0c931be7
am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
* commit '5ec2afea01be51e5607e445c401be3296f1ac83e':
docs: plugin reference update
2015-01-06 02:25:47 +00:00
Joe Fernandez
c632031af3
am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
...
* commit '27195338192b63b62f274f11bcae57dc2788514f':
docs: studio build output dir name update
2015-01-06 02:12:43 +00:00
Joe Fernandez
06cdc2fd64
am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
...
* commit '851931f0626c0f450add010f2f8e836769a3afc9':
docs: gradle version update in plugin file
2015-01-06 02:12:38 +00:00
Joe Fernandez
4dc7c15860
am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
...
* commit '3dcc12892fba022f8c45e9575b23f20bbe55f6b4':
docs: gradle wrapper security note
2015-01-06 02:12:32 +00:00
Joe Fernandez
24a3ff4770
am 765ae116: am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
...
* commit '765ae116e2ebab02668c9ef5a7ae11f8a4ffa102':
docs: project file and toc updates
2015-01-06 02:12:27 +00:00
Joe Fernandez
e7558b44f7
am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
...
* commit '596868b6489e77f9165e0d03a8d451fccd7f3959':
docs: studio workflow links
2015-01-06 02:12:21 +00:00
Joe Fernandez
d1489d5db0
am a78664e0: am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
...
* commit 'a78664e03078d7c671077192357c5e25c0556755':
docs: studio tips and ticks grammmar typo
2015-01-06 02:12:16 +00:00
Ricardo Cervera
4d4b599d7c
am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
* commit 'ac4444a26f19bda442da367ba9bda194f09a68c5':
docs: Update wearable lists docs
2015-01-06 02:12:12 +00:00
Joe Fernandez
bea6f1e645
am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
* commit 'b1062ad68efd04cdf236f8fec184e849da7548cf':
docs: studio device emulator updates
2015-01-06 02:12:06 +00:00
Sarah Maddox
73c943fc71
am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
* commit '15e94fdf343e688113a47342048ebd2baf646338':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:12:01 +00:00
Ricardo Cervera
fd731d4beb
am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
* commit 'fcba64722bb10fae8c17a994d343080aa439fc8c':
docs: Adding vector drawables video
2015-01-06 02:11:56 +00:00
Joe Fernandez
5ec2afea01
am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
* commit 'f3d9f03053390d81e266027c9dcb69b5c3cc3e83':
docs: plugin reference update
2015-01-06 02:11:50 +00:00
Joe Fernandez
2719533819
am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
...
* commit '546a0e8c695808c987be3fbac1b3e632b6c6aa8d':
docs: studio build output dir name update
2015-01-06 02:01:14 +00:00
Joe Fernandez
851931f062
am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
...
* commit '21b92f34525e12ede8f842f6c426d33093df3b24':
docs: gradle version update in plugin file
2015-01-06 02:01:09 +00:00
Joe Fernandez
3dcc12892f
am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
...
* commit '447ea5097ba99ca25ddd613e72e10b57f3405291':
docs: gradle wrapper security note
2015-01-06 02:01:05 +00:00
Joe Fernandez
765ae116e2
am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
...
* commit 'eed87a573a2e67c85f5a8e79ad538cce278932d2':
docs: project file and toc updates
2015-01-06 02:01:01 +00:00
Joe Fernandez
596868b648
am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs
...
* commit 'c811b88ab1bc891fffdef461ead0f6dc7331d04e':
docs: studio workflow links
2015-01-06 02:00:57 +00:00
Joe Fernandez
a78664e030
am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
...
* commit '411c779bb746d81278b7646ffd96fa6e4f8336b9':
docs: studio tips and ticks grammmar typo
2015-01-06 02:00:53 +00:00
Ricardo Cervera
ac4444a26f
am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
* commit 'c5fae9593553a89db2ad49306b46b8f9a3631489':
docs: Update wearable lists docs
2015-01-06 02:00:48 +00:00
Joe Fernandez
b1062ad68e
am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
* commit 'c3fb32ab3989806f49cdd21ca58a044daf74f060':
docs: studio device emulator updates
2015-01-06 02:00:42 +00:00
Sarah Maddox
15e94fdf34
am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
* commit '4811f9b84766adc17efb730160e15785d74875a3':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:00:32 +00:00
Ricardo Cervera
fcba64722b
am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
* commit '9719336b3a9a059c31200137a93f74445d3c7185':
docs: Adding vector drawables video
2015-01-06 02:00:24 +00:00
Joe Fernandez
f3d9f03053
am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
* commit 'adaef486464af836cd3408657634c972419e4c80':
docs: plugin reference update
2015-01-06 02:00:14 +00:00
Alan Viverette
107a4719d5
am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev
...
automerge: 1c38711
* commit '1c38711bb45ea074b6456258079b18ba5c834ca6':
Scroll handle was half as opaque as it was supposed to be
2015-01-06 01:02:55 +00:00
Alan Viverette
1c38711bb4
am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev
...
* commit 'a5478449679366fa48b27ff722160477aeca6dc0':
Scroll handle was half as opaque as it was supposed to be
2015-01-06 01:00:40 +00:00
Alan Viverette
a547844967
am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev
...
* commit 'ccfd34f6b59cfd79746bb1698abafc458a83d6cb':
Scroll handle was half as opaque as it was supposed to be
2015-01-06 00:54:54 +00:00
Shishir Agrawal
8ddd54fb38
am 08fb858f: am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
...
* commit '08fb858f82c29467ba6e4bf1f54c56a4791b625d':
Data quick settings - Usage shown should take into account merged IDs.
2015-01-06 00:54:34 +00:00
Chris Craik
b15f21effb
Merge "Add overrides and switch to nullptr keyword for all files"
2015-01-06 00:50:53 +00:00
