Dongwon Kang
4746c9797a
Remove AtscTvInput in favor of having another sample input under developers.
...
- The real sample app for developers will be located under developers/ and
managed by dev-rel team.
Change-Id: I6d190b2c9a24ad64e79e3fd1c1c824abeda2eb3f
2014-07-29 14:56:06 +09:00
Craig Stout
fb9584cf67
Merge "Add PlaybackOverlayFragment" into lmp-dev
2014-07-24 15:36:51 +00:00
Craig Stout
7e736a4df2
Add PlaybackOverlayFragment
...
Change-Id: If4c5b2f747885948e0bae422d9d30eec11c027b9
2014-07-24 06:49:35 -07:00
Dake Gu
dcf85159fe
am d54e6b19: SupportLeanbackDemo: activity transition
...
* commit 'd54e6b19e4639412fbbb19bf478034634c2907c5':
SupportLeanbackDemo: activity transition
2014-07-23 22:00:47 +00:00
Dake Gu
d54e6b19e4
SupportLeanbackDemo: activity transition
...
b/15024618
Change-Id: Ib23746360984f3bbe255e8f75df30c7422b553f2
2014-07-23 14:37:16 -07:00
Griff Hazen
4be1723bf3
am 3815535c: am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
...
* commit '3815535c4a97fa25fb138d681ae69e7bc1f99bdf':
DO NOT MERGE Update version of sdk 20 samples to 2
2014-07-23 00:18:51 +00:00
Griff Hazen
3815535c4a
am 1fd1d233: (-s ours) am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
...
* commit '1fd1d233d3de26873e08f78e16ed6be41d969369':
DO NOT MERGE Update version of sdk 20 samples to 2
2014-07-23 00:03:19 +00:00
Griff Hazen
1fd1d233d3
am 7003893f: DO NOT MERGE Update version of sdk 20 samples to 2
...
* commit '7003893fce1691208e34de884c5372acb90a57e2':
DO NOT MERGE Update version of sdk 20 samples to 2
2014-07-22 23:59:14 +00:00
Griff Hazen
7003893fce
DO NOT MERGE Update version of sdk 20 samples to 2
...
To allow for a release of new API 20 samples.
Bug: 16158275
Change-Id: I459af267ec76271df10d93cf99439d40883d3a83
2014-07-22 15:01:22 -07:00
Jean-Luc Brouillet
62e0ab8946
am 58668fc5: Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev
...
* commit '58668fc5a502e159d1daf79540ee9039153a2697':
Fix directory where CtsTestStubs.apk is found.
2014-07-22 21:47:48 +00:00
Jean-Luc Brouillet
58668fc5a5
Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev
2014-07-22 16:29:55 +00:00
Ying Wang
99d2b20cc6
am 06a0ec0b: new installation path of apks.
...
* commit '06a0ec0b97451c9b31afb646cb47c557bf8459cb':
new installation path of apks.
2014-07-21 23:20:56 +00:00
Jean-Luc Brouillet
3bc1e46683
Fix directory where CtsTestStubs.apk is found.
...
Empirically, it's now found in a subdirectory named CtsTestStubs.
Change-Id: Iae50c37ac7655f0b32cc2cc5a1b50371d1397b54
2014-07-21 16:09:31 -07:00
Ying Wang
06a0ec0b97
new installation path of apks.
...
To fix the SDK build.
Change-Id: I6c401e791bd59367bbd058f323db0d94bf623db5
2014-07-21 16:05:30 -07:00
Chulwoo Lee
c726968746
am 9f688cc1: Merge "Put input ID when inserting channels" into lmp-dev
...
* commit '9f688cc1619791b9001f245f541f7a06bea5c0c6':
Put input ID when inserting channels
2014-07-21 21:03:22 +00:00
Andrew Hsieh
5f34909a36
am 093774e6: am b50f8f66: Merge "Add APP_ABI for module-exports sample"
...
* commit '093774e6e6772ad38a7da1692daa3e0c9fd08d66':
Add APP_ABI for module-exports sample
2014-07-21 13:09:57 +00:00
Andrew Hsieh
093774e6e6
am b50f8f66: Merge "Add APP_ABI for module-exports sample"
...
* commit 'b50f8f6612c74ad78194555e8a3d5a3441eedf02':
Add APP_ABI for module-exports sample
2014-07-21 13:06:32 +00:00
Sungsoo Lim
1d1cb1fbca
am 51324e22: Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev
...
* commit '51324e22d1df8a169d70e1b6ee8c0ebb65a5ba47':
Remove the dummy implementation of onContentUnblocked()
2014-07-21 12:35:32 +00:00
Andrew Hsieh
7eedf0e8db
am 41c21169: am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
...
* commit '41c211692c969e88f04a3b6ae30ecadc0367c9eb':
Refresh 64-bit headers/libs (WW29)
2014-07-21 12:22:52 +00:00
Andrew Hsieh
126032ddae
am 8e1ad1c9: am fa902f33: Merge "Fix gl3stub.h"
...
* commit '8e1ad1c94d9fcdda363be5b1c1d5eb573785ea1f':
Fix gl3stub.h
2014-07-21 12:22:46 +00:00
Andrew Hsieh
41c211692c
am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
...
* commit '30c2909f512939f3cb51cc9682bca3235299e149':
Refresh 64-bit headers/libs (WW29)
2014-07-21 10:35:44 +00:00
Andrew Hsieh
8e1ad1c94d
am fa902f33: Merge "Fix gl3stub.h"
...
* commit 'fa902f33442e0a2c35edd6b84638009f491350ac':
Fix gl3stub.h
2014-07-21 10:35:43 +00:00
Baligh Uddin
b6fa917df4
am dbd7a9fb: Remove deprecated locales - DO NOT MERGE
...
* commit 'dbd7a9fbdf667ed1276118129d23a244a8620536':
Remove deprecated locales - DO NOT MERGE
2014-07-20 18:08:19 +00:00
Deepanshu Gupta
5211966913
am 7f295eef: am 8d6dee77: am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '7f295eefbe9469049579d59b5298f461aa7bbeb5':
2014-07-20 18:01:45 +00:00
Deepanshu Gupta
8748bd7852
am 8b8fca48: am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '8b8fca489858f3e519cfbe56007e9d106f1e4982':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-20 18:01:44 +00:00
Deepanshu Gupta
6ec2099735
am 3b929a7a: am 2aad5082: (-s ours) am 2cdeb60c: am a2c022fa: am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '3b929a7a1af76ed2586ee55babdaaafefd152bb6':
2014-07-20 18:01:42 +00:00
Deepanshu Gupta
11e8e542a5
am 884d4cb4: am d898a214: (-s ours) am 591f5c8b: am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '884d4cb440c6e8e3a328f3b239512356c54eb434':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-20 18:01:41 +00:00
Deepanshu Gupta
f814c978dc
am e731ac39: am 6b014b79: (-s ours) am 25337462: am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'e731ac39a711602dc30b62e5b144a949b1f32280':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-20 18:01:40 +00:00
Deepanshu Gupta
e9b0c4ae4f
am 3b9da34f: am a6131422: (-s ours) am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
...
* commit '3b9da34f277bb95882b982b625c470c4dae77afe':
Update platform SDK component to revision 2. [DO NOT MERGE]
2014-07-20 18:01:39 +00:00
Chris Craik
9879a687d0
am 644678f9: Update Outline API
...
* commit '644678f99b4c0b00addbed165e35bf1b51b96fc7':
Update Outline API
2014-07-20 18:00:16 +00:00
Baligh Uddin
dbd7a9fbdf
Remove deprecated locales - DO NOT MERGE
...
Change-Id: If073e059cb3161240952fafde16878c502c69341
2014-07-19 13:04:57 -07:00
Deepanshu Gupta
7f295eefbe
am 8d6dee77: am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '8d6dee775951bf77f0b635bb3a551e02a208e1a4':
2014-07-19 00:42:10 +00:00
Deepanshu Gupta
8b8fca4898
am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'db204c7992edcac02a4a8770bfcb0b906f6543e4':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-19 00:42:03 +00:00
Deepanshu Gupta
3b929a7a1a
am 2aad5082: (-s ours) am 2cdeb60c: am a2c022fa: am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '2aad5082c408725de95afc593d4287ea516a9ee6':
2014-07-19 00:41:55 +00:00
Deepanshu Gupta
884d4cb440
am d898a214: (-s ours) am 591f5c8b: am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'd898a214c0b9e48e3be2556b2ddd08d05e4a6678':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-19 00:41:54 +00:00
Deepanshu Gupta
e731ac39a7
am 6b014b79: (-s ours) am 25337462: am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '6b014b79664989356b68e44e39662eb5f457b3aa':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-19 00:41:45 +00:00
Deepanshu Gupta
3b9da34f27
am a6131422: (-s ours) am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
...
* commit 'a6131422fd68ccfced1a055c8e1d84e3cb500710':
Update platform SDK component to revision 2. [DO NOT MERGE]
2014-07-19 00:41:27 +00:00
Deepanshu Gupta
8d6dee7759
am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '9605eaa78b4b757d7319184e383b662eba2c2781':
2014-07-18 23:13:07 +00:00
Deepanshu Gupta
9605eaa78b
am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'fddc192fc3f19d43eae63b242f488fc181b29ff3':
2014-07-18 23:06:36 +00:00
Deepanshu Gupta
db204c7992
am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '626baa07c8fb1b8b2c038c927c84e4942db8f9b2':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 23:05:10 +00:00
Deepanshu Gupta
fddc192fc3
am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '7b9c13b5dcac9c3e800ab2feea323a20b8bc10b2':
2014-07-18 23:01:22 +00:00
Deepanshu Gupta
626baa07c8
am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '1dcb4f05dc21c5aa36d78469f74e39d1cb765b65':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 23:01:07 +00:00
Deepanshu Gupta
1dcb4f05dc
am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'ae75543ce01ab673951516c8dbf313233a8c946a':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:57:47 +00:00
Deepanshu Gupta
7b9c13b5dc
am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '292e62aa0d092de56c7b26e75a59beaa0f26fb4e':
2014-07-18 22:57:25 +00:00
Deepanshu Gupta
ae75543ce0
am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '54c50b59d5539ec6096f89ef72a360f55f23a6f2':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:53:44 +00:00
Deepanshu Gupta
292e62aa0d
am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'babc7880785ea22074bd58dbf5b5144dd33521d7':
2014-07-18 22:52:25 +00:00
Deepanshu Gupta
54c50b59d5
am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'd67beb9aa9dfd4db1b12bcf932492acac221df04':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:48:49 +00:00
Deepanshu Gupta
babc788078
am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '38e59046d835fd6edb6eb333053a0c84fa4c02c9':
2014-07-18 22:48:17 +00:00
Deepanshu Gupta
d67beb9aa9
am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'dbea3d7d5eba6b149a08325036ab353eb385ef66':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:44:43 +00:00
Deepanshu Gupta
38e59046d8
am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'dd0fcf2f8386a7d7b1b9bb293ae689bd2489e0d9':
2014-07-18 22:43:11 +00:00
