173903 Commits

Author SHA1 Message Date
Jon Larimer
f96d6bc684 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 automerge: dcce25a
automerge: 4f78e0b

* commit '4f78e0b1e849193f5e70447171b4f30ad0aee700':
2015-01-31 05:44:27 +00:00
Jon Larimer
4f78e0b1e8 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635
automerge: dcce25a

* commit 'dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':
2015-01-31 05:27:30 +00:00
Jon Larimer
dcce25a9a7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a
automerge: 4a82635

* commit '4a826358e769e697ec329cf14edeb049981a11a9':
2015-01-31 05:19:19 +00:00
Jon Larimer
4a826358e7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af
automerge: 27d099a

* commit '27d099a7e128744b7a11ce09b469a3396e872d33':
2015-01-31 05:03:24 +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
Deepanshu Gupta
df5a198710 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 automerge: 580937f
automerge: c053438

* commit 'c05343828611ed0b82fae4edf7fe11e0e9087db1':
  Limited AppCompat support
2015-01-31 04:18:58 +00:00
Deepanshu Gupta
6a439908fc am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd automerge: 1575ca6
automerge: 862cdd6

* commit '862cdd6f11490c060842599a58a400e284c937d9':
  Resource resolution fixes.
2015-01-31 04:17:35 +00:00
Joe Fernandez
f4b2bd4c41 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da
automerge: 346a9a2

* commit '346a9a2f364f7cdabf06944014594b299d384082':
  docs: training intent doc error update
2015-01-31 04:01:11 +00:00
Deepanshu Gupta
c053438286 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447
automerge: 580937f

* commit '580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
  Limited AppCompat support
2015-01-31 03:59:37 +00:00
Deepanshu Gupta
862cdd6f11 am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd
automerge: 1575ca6

* commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
  Resource resolution fixes.
2015-01-31 03:58:26 +00:00
Jon Larimer
27d099a7e1 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':
2015-01-31 03:39: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
Deepanshu Gupta
580937fc45 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev
automerge: 7789447

* commit '7789447bd97c851b7a09623a417300590e5439d5':
  Limited AppCompat support
2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a am 1d59871e: Merge "Resource resolution fixes." into lmp-dev
automerge: 7e683bd

* commit '7e683bdaddff77a24a36d420c5782b47795c5ccb':
  Resource resolution fixes.
2015-01-31 03:01:20 +00:00
Joe Fernandez
cacf7da1c4 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
automerge: f02a8d9

* commit 'f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
  docs: training intent doc error update
2015-01-31 02:50:57 +00:00
Joe Fernandez
f02a8d9ffc am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
* commit '1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
  docs: training intent doc error update
2015-01-31 01:59:54 +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
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
2015-01-31 00:54:10 +00:00
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
2015-01-31 00:54:07 +00:00
Deepanshu Gupta
3d5535cfb7 Merge "Limited AppCompat support" into lmp-dev 2015-01-31 00:50:35 +00:00
Deepanshu Gupta
1d59871e4e Merge "Resource resolution fixes." into lmp-dev 2015-01-31 00:48:57 +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
Joe Fernandez
95fa88250a am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
automerge: 3548de6

* commit '3548de60735a79d3e7087c26ae491a7f38da5b4d':
  docs: studio emulator platform update
2015-01-31 00:25:04 +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
Jon Larimer
9e7e8afbb9 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge: 5c9d0de

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
2015-01-31 00:05:54 +00:00
Joe Fernandez
5c37c8e662 am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit 'd801a1238392b8c7a8e0131cee89370143363046':
  docs: studio emulator platform update
2015-01-30 23:41:10 +00:00
Joe Fernandez
d801a12383 am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
  docs: studio emulator platform update
2015-01-30 23:34:44 +00:00
Joe Fernandez
2b68ab3add Merge "docs: studio emulator platform update" into lmp-docs 2015-01-30 23:25:51 +00:00
Jon Larimer
ff526fa710 am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:40:17 +00:00
Jon Larimer
3a6d8f5473 am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '90d5bd8daab404afc50470f5c19ea725bd2466fe':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:33:13 +00:00
Jon Larimer
90d5bd8daa am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:24:43 +00:00
Stuart Scott
2e233d3066 am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
* commit '712d5b3d582dfe8f7fb855ba98704c98e9441836':
  [DS] Correct the access method for telephony system property
2015-01-30 22:24:25 +00:00
Jon Larimer
feb362a5d1 am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit 'a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:18:34 +00:00
Stuart Scott
712d5b3d58 am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
* commit '147b6a3522b7032ede24101f5ac32ec7d7afa9e9':
  [DS] Correct the access method for telephony system property
2015-01-30 22:17:42 +00:00
Jinsuk Kim
7bc0929905 am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
* commit '42e785fbf7dfa50096275cf1e6233247e9fc15f7':
  Revert "CEC: Let playback device switch TV input after bootup"
2015-01-30 22:15:00 +00:00
Jon Larimer
a0d3bfbe87 am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:11:56 +00:00
Stuart Scott
147b6a3522 Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 2015-01-30 22:09:38 +00:00
Jinsuk Kim
42e785fbf7 am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
* commit '3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
  Revert "CEC: Let playback device switch TV input after bootup"
2015-01-30 22:06:09 +00:00
Jon Larimer
5c9d0de174 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '545dd853bffbf778a0a44816ac6ed381b13f2158':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:01:50 +00:00
Jinsuk Kim
3457ae4709 Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 2015-01-30 22:00:40 +00:00
Jinsuk Kim
4361549891 Revert "CEC: Let playback device switch TV input after bootup"
This reverts commit 8913a0e1e8559d96e82b1ff408dd312ed279021b.

Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
2015-01-30 21:58:18 +00:00
Jon Larimer
545dd853bf am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:54:31 +00:00
Jon Larimer
9a425aa71c am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:44:17 +00:00
Jon Larimer
159aa73574 am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:28:59 +00:00
Jon Larimer
d403180997 am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '48c95c4370533bf27e537cbca1e64d060a016c5f':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 19:30:57 +00:00
Jason Monk
b5083a7d54 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb
automerge: d2f15ec

* commit 'd2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
  Fix QS bluetooth tile accessibility issue
2015-01-30 19:27:06 +00:00
Jason Monk
734219d9c2 Fix expandSettingsPanel status bar call automerge: 3c68ca2
automerge: f388249

* commit 'f38824928cf586124ffc6dc7a85c7f8603f77c5a':
  Fix expandSettingsPanel status bar call
2015-01-30 19:25:20 +00:00
Jason Monk
d2f15ecb08 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
automerge: b2dd5cb

* commit 'b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
  Fix QS bluetooth tile accessibility issue
2015-01-30 18:48:15 +00:00
Jason Monk
f38824928c Fix expandSettingsPanel status bar call
automerge: 3c68ca2

* commit '3c68ca2feab6d3cd09c297ddc2e77af67694feec':
  Fix expandSettingsPanel status bar call
2015-01-30 18:46:31 +00:00