Trevor Johns
c3c6324ebe
am f78c6348: am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
...
* commit 'f78c6348f7a7aa556cd6805432bdd17d8197e565':
Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-13 21:06:03 +00:00
Trevor Johns
6efacc284c
am 84bf28b2: am 27a5bbcb: am 5cdf8488: am 3081f16c: Sync browseable samples for lmp-docs
...
* commit '84bf28b21da413db17054f860e327d9057a53f96':
Sync browseable samples for lmp-docs
2014-11-13 21:06:02 +00:00
Xavier Ducrohet
8b743f9940
am 35afa6de: am 2680677b: am 0c72bc36: Update support extra revision. DO NOT MERGE.
...
* commit '35afa6de9a6eebf7fc9197e92ef8dba9b6419f52':
Update support extra revision. DO NOT MERGE.
2014-11-13 21:06:00 +00:00
Trevor Johns
f78c6348f7
am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
...
* commit 'f83bd1f88165b73f122a769c4366083f84ff9e28':
Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-13 20:57:51 +00:00
Trevor Johns
84bf28b21d
am 27a5bbcb: am 5cdf8488: am 3081f16c: Sync browseable samples for lmp-docs
...
* commit '27a5bbcb567a0b14783a111abd374849ced53a57':
Sync browseable samples for lmp-docs
2014-11-13 20:57:37 +00:00
Xavier Ducrohet
35afa6de9a
am 2680677b: am 0c72bc36: Update support extra revision. DO NOT MERGE.
...
* commit '2680677b96997a755f2d3ebd8afe267fa6524f97':
Update support extra revision. DO NOT MERGE.
2014-11-13 20:57:29 +00:00
Trevor Johns
f83bd1f881
am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
...
* commit '41478596aedb31e43565f1a085803d72d0f8fd59':
Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-13 04:00:29 +00:00
Trevor Johns
41478596ae
am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
...
* commit 'c6b0eb1ac163fb65c17b397600079748c4d3901b':
Revert "sdk.atree: Disable Wear samples for lmp branches"
2014-11-13 03:31:29 +00:00
Trevor Johns
27a5bbcb56
am 5cdf8488: am 3081f16c: Sync browseable samples for lmp-docs
...
* commit '5cdf84885bb26b0cb5c4fe7c0f2ec4cdcf6f88d1':
Sync browseable samples for lmp-docs
2014-11-13 02:53:13 +00:00
Trevor Johns
5cdf84885b
am 3081f16c: Sync browseable samples for lmp-docs
...
* commit '3081f16cd6a6de8791ccd04be727bcccace72e56':
Sync browseable samples for lmp-docs
2014-11-13 02:46:55 +00:00
Trevor Johns
c6b0eb1ac1
Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
2014-11-13 02:41:56 +00:00
Trevor Johns
b124012eac
Revert "sdk.atree: Disable Wear samples for lmp branches"
...
This reverts commit fcd28181a1 .
Change-Id: I9e76020676b194917f98c5f8c4ce8c6d6fe6cf5e
2014-11-13 02:41:48 +00:00
Trevor Johns
3081f16cd6
Sync browseable samples for lmp-docs
...
Syncing to commit 0afa2a3366307b12a213a199be1eb8baac1c5f1c.
Change-Id: I6ab153008951bb7e06001c0f27f44df4e4f6cb83
2014-11-12 18:23:05 -08:00
Xavier Ducrohet
2680677b96
am 0c72bc36: Update support extra revision. DO NOT MERGE.
...
* commit '0c72bc368fa2f3aeea184cacc6511334414a4f35':
Update support extra revision. DO NOT MERGE.
2014-11-13 02:15:38 +00:00
Xavier Ducrohet
0c72bc368f
Update support extra revision. DO NOT MERGE.
...
Change-Id: I93a2c673dde63df1c36498a7aea63472ed83c48c
2014-11-12 17:44:07 -08:00
Trevor Johns
f2ae762950
am 245f029a: am d009e0b3: am 0c094f0c: am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
...
* commit '245f029a55710cde67162153734796da9e0f9d42':
Update browseable samples for lmp-docs
2014-11-12 22:35:11 +00:00
Trevor Johns
716f9ff5a9
am 0161ae54: am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
...
* commit '0161ae549a7a28e1f71c91b82e667c3af0bcdf37':
Add two new samples.
2014-11-12 22:35:08 +00:00
Trevor Johns
245f029a55
am d009e0b3: am 0c094f0c: am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
...
* commit 'd009e0b3848cff2b725f1909bab79574d67bb3e0':
Update browseable samples for lmp-docs
2014-11-12 19:53:00 +00:00
Trevor Johns
d009e0b384
am 0c094f0c: am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
...
* commit '0c094f0ca7eadac67240fc541f27b8f902d76f4a':
Update browseable samples for lmp-docs
2014-11-12 19:48:27 +00:00
Trevor Johns
0c094f0ca7
am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
...
* commit 'd8c7b24e696003e4fc4c848a3f2a86b302f90169':
Update browseable samples for lmp-docs
2014-11-12 19:44:03 +00:00
Trevor Johns
d8c7b24e69
Merge "Update browseable samples for lmp-docs" into lmp-docs
2014-11-12 19:40:55 +00:00
Trevor Johns
527a4f30a6
Update browseable samples for lmp-docs
...
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes
new samples for Android Auto.
Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1
2014-11-12 11:39:30 -08:00
Trevor Johns
0161ae549a
am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
...
* commit '705cf8509d651773275e293c941bf7046074ec87':
Add two new samples.
2014-11-12 19:39:28 +00:00
Trevor Johns
705cf8509d
am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
...
* commit '13ce376eea001a9942dc418323c3fd2980cbf299':
Add two new samples.
2014-11-12 19:35:00 +00:00
Trevor Johns
13ce376eea
am dff4d5d4: Merge "Add two new samples." into lmp-docs
...
* commit 'dff4d5d4fd5d06ed281467bff606b51c1afa380b':
Add two new samples.
2014-11-12 19:30:28 +00:00
Trevor Johns
dff4d5d4fd
Merge "Add two new samples." into lmp-docs
2014-11-12 19:26:50 +00:00
Renato Mangini
876d208329
Add two new samples.
...
Added MessagingServices and MediaBrowserService to sdk build.
Bug: 18323953
Change-Id: I6b2d4caae38a42ec2a6673a5b6c02c7f5a21b868
2014-11-12 11:21:30 -08:00
Trevor Johns
a25be96a52
am 8488cdb6: am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches
...
* commit '8488cdb6643fba3734244cf486a4ebacd2c09a97':
sdk.atree: Disable Wear samples for lmp branches
2014-11-12 14:31:11 +00:00
Trevor Johns
8488cdb664
am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches
...
* commit '5d84789a68a96237efad9e911dfd97c8d4a85103':
sdk.atree: Disable Wear samples for lmp branches
2014-11-12 14:26:09 +00:00
Trevor Johns
5d84789a68
am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches
...
* commit '062a2d1cb9322b6e720e9942565ad152a08ad4e8':
sdk.atree: Disable Wear samples for lmp branches
2014-11-12 05:06:52 +00:00
Trevor Johns
062a2d1cb9
am fcd28181: sdk.atree: Disable Wear samples for lmp branches
...
* commit 'fcd28181a15ebe95724fe096a8b5198c964b0d7f':
sdk.atree: Disable Wear samples for lmp branches
2014-11-12 05:03:28 +00:00
Adam Lesinski
94527b094f
am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev
...
* commit 'ed6aaf3f727a7ed9ea208fcc535050dcfae64105':
Add split-select tool to SDK build.
2014-11-11 01:00:00 +00:00
Adam Lesinski
ed6aaf3f72
Merge "Add split-select tool to SDK build." into lmp-mr1-dev
2014-11-11 00:56:36 +00:00
Deepanshu Gupta
8fbc5f53a6
am 058f1f0f: am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2.
...
* commit '058f1f0fa00007bbd8856bf32c49db6f765dbca4':
Update LayoutLib version for API 21 to 2.
2014-11-10 22:19:04 +00:00
Deepanshu Gupta
058f1f0fa0
am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2.
...
* commit '077d2052fdef5b71cc02a96a598eb3bb682f1294':
Update LayoutLib version for API 21 to 2.
2014-11-10 22:12:06 +00:00
Deepanshu Gupta
077d2052fd
am e3189c68: Update LayoutLib version for API 21 to 2.
...
* commit 'e3189c68b063090a1212a63e67348a86b05e837f':
Update LayoutLib version for API 21 to 2.
2014-11-10 21:57:00 +00:00
Deepanshu Gupta
e3189c68b0
Update LayoutLib version for API 21 to 2.
...
Change-Id: Icb24cb56a34def1c550b7f38fe6f2943c49d3a03
2014-11-10 20:19:15 +00:00
Trevor Johns
fcd28181a1
sdk.atree: Disable Wear samples for lmp branches
...
Wear samples are currently generated for the klp-modular branch only.
Change-Id: I127a75d171a31f334c5006b6ce251ff1d4f35f42
2014-11-06 21:11:46 +00:00
Jim Miller
1064b49ced
am eb7edd58: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
...
* commit 'eb7edd585abb0bc6c039882cdec8dc8a9fd4e4cc':
Update TrustAgentService API after review
2014-11-06 02:57:33 +00:00
Jim Miller
eb7edd585a
Merge "Update TrustAgentService API after review" into lmp-mr1-dev
2014-11-06 02:52:51 +00:00
Adam Lesinski
d155da9790
Add split-select tool to SDK build.
...
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
2014-11-05 11:34:03 -08:00
Dmitry Shmidt
5cc7f9ba4c
am d00a0a73: Development: Connectivity: Fix receiver leakage
...
* commit 'd00a0a734ef64ba917e5a124a16c1e4c196dd187':
Development: Connectivity: Fix receiver leakage
2014-11-04 03:32:37 +00:00
Jim Miller
d4adb57e07
Update TrustAgentService API after review
...
Add test for DPM.setTrustAgentConfiguration()
Also fixes bug where DPM flags were set in onPreferenceChanged()
which happened before being set on the checkbox preference.
Fixes bug 17008504
Change-Id: I165cd73d11c0a68ee6667cb1fd88892a39267903
2014-11-03 18:48:45 -08:00
Dmitry Shmidt
d00a0a734e
Development: Connectivity: Fix receiver leakage
...
Bug: 18229332
Change-Id: Iadd8a1a6e72cf762f6494b586b53b827edebd25d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2014-11-03 17:26:00 -08:00
Xavier Ducrohet
f8a6d8f1df
am 66b2f251: am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.
...
* commit '66b2f251c72c82098a2a84a2b87642e42c5d26b8':
Update build-tools revision. DO NOT MERGE.
2014-11-01 16:05:48 +00:00
Xavier Ducrohet
d150e285b5
am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around.
...
* commit '4aceb7250d209b848b44a64984953e0d45c50b3e':
Move mulit-dex files around.
2014-11-01 16:05:43 +00:00
Xavier Ducrohet
66b2f251c7
am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.
...
* commit '883b17b351fca5459fdb26f640e411a552dae7d8':
Update build-tools revision. DO NOT MERGE.
2014-11-01 14:09:56 +00:00
Xavier Ducrohet
4aceb7250d
am 754cfeb6: am 8641d4da: Move mulit-dex files around.
...
* commit '754cfeb6f7baf2e5499959ac439a8a95400a9974':
Move mulit-dex files around.
2014-11-01 14:09:55 +00:00
Xavier Ducrohet
883b17b351
am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.
...
* commit '5b7f5d2bc428cbd8b2bdbbafa00a57486808d77d':
Update build-tools revision. DO NOT MERGE.
2014-10-31 22:04:56 +00:00
Xavier Ducrohet
754cfeb6f7
am 8641d4da: Move mulit-dex files around.
...
* commit '8641d4dada2166c116c7663e33f47b297993038e':
Move mulit-dex files around.
2014-10-31 22:04:55 +00:00