Trevor Johns
da6cf75ea5
am f2ae7629: am 245f029a: am d009e0b3: am 0c094f0c: am d8c7b24e: Merge "Update browseable samples for lmp-docs" into lmp-docs
...
* commit 'f2ae762950e1a6a668c216f50345433ba82dfc2c':
Update browseable samples for lmp-docs
2014-11-12 23:50:02 +00:00
Trevor Johns
400208abf8
am 716f9ff5: am 0161ae54: am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs
...
* commit '716f9ff5a9b69b85ec9a92f63e10d8177acb7185':
Add two new samples.
2014-11-12 23:49:56 +00: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
dfc8899c9e
am a25be96a: am 8488cdb6: am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches
...
* commit 'a25be96a521c9d01c031bdad084ead867bfb140c':
sdk.atree: Disable Wear samples for lmp branches
2014-11-12 14:36:44 +00: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
Yigit Boyar
82905bae66
Remove deprecated API usage
...
Bug: 18213371
Change-Id: I6acaec5e8a7e5fa4ce5d7cab7040219048d4dcc6
2014-11-11 18:22:29 -08:00
Adam Lesinski
5e44c8833f
am 94527b09: am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev
...
* commit '94527b094fbcbf73ce00ecfcdc2ee31aa74ccd1e':
Add split-select tool to SDK build.
2014-11-11 01:06:01 +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
3ecffe3b64
am 8fbc5f53: am 058f1f0f: am 077d2052: am e3189c68: Update LayoutLib version for API 21 to 2.
...
* commit '8fbc5f53a6fc2c983fb04f51f9e7994b97a46da5':
Update LayoutLib version for API 21 to 2.
2014-11-11 00:28:12 +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
Elliott Hughes
6274085c47
am 27db85ff: Merge "Made development/scripts/stack work on Mac."
...
* commit '27db85ff168f4d32d553fd85d03964d0c9daa25f':
Made development/scripts/stack work on Mac.
2014-11-08 19:09:19 +00:00
Elliott Hughes
27db85ff16
Merge "Made development/scripts/stack work on Mac."
2014-11-08 19:00:32 +00:00
Yang Ni
e4b2a1a959
Made development/scripts/stack work on Mac.
...
Change-Id: I9be1e50c0a635068017326738af4f5c38dddddab
2014-11-07 09:45:56 -08: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
b7651e12c4
am 1064b49c: am eb7edd58: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
...
* commit '1064b49cedcf80bcfaf8bd6824fc8cabae256e99':
Update TrustAgentService API after review
2014-11-06 03:01:41 +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
850fe6a3af
am 5cc7f9ba: am d00a0a73: Development: Connectivity: Fix receiver leakage
...
* commit '5cc7f9ba4c610cab552d5f553a22ba4e959dd819':
Development: Connectivity: Fix receiver leakage
2014-11-04 03:42:19 +00: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
b00c359893
am f8a6d8f1: am 66b2f251: am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE.
...
* commit 'f8a6d8f1df1f68a1db18ccf012b82aea4a563331':
Update build-tools revision. DO NOT MERGE.
2014-11-01 17:48:27 +00:00
Xavier Ducrohet
2dcf807247
am d150e285: am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around.
...
* commit 'd150e285b5097fea8c5e2e7015e723437daf7f9d':
Move mulit-dex files around.
2014-11-01 17:48:19 +00: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
Dmitriy Ivanov
bb4c3d05f3
am fc3c8256: am 7d4c9612: Merge changes I0666e671,I90a1aed6
...
* commit 'fc3c82562d061dcfc5760817371b1c5d125d95a7':
Do not call art-on macro by default.
Add support for debugging ART to the dalvik.gdb script.
2014-10-31 22:57:07 +00:00
Dmitriy Ivanov
fc3c82562d
am 7d4c9612: Merge changes I0666e671,I90a1aed6
...
* commit '7d4c96124ca1d9002c73d4b0faf40d03ca30fc77':
Do not call art-on macro by default.
Add support for debugging ART to the dalvik.gdb script.
2014-10-31 22:51:40 +00:00
Dmitriy Ivanov
7d4c96124c
Merge changes I0666e671,I90a1aed6
...
* changes:
Do not call art-on macro by default.
Add support for debugging ART to the dalvik.gdb script.
2014-10-31 22:46:59 +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