Trevor Johns
424de0b0e5
am 20d95001: Sync sample prebuilts for lmp-mr1-ub-docs
...
* commit '20d9500115e9ded1dbcdfa808da603dae0e1b905':
Sync sample prebuilts for lmp-mr1-ub-docs
2015-05-12 21:57:57 +00:00
Trevor Johns
20d9500115
Sync sample prebuilts for lmp-mr1-ub-docs
...
Synced to //developers/samples/android commit
7e6f96a4bd8d07daf2f9e464dad32e7daa62999b
Change-Id: I3c44d32aca1a5513f52e71f28d1848a055d03aab
2015-05-12 14:33:38 -07:00
Trevor Johns
34191c0a56
am 86ed92ac: (-s ours) Update build files for lmp-mr1-ub-docs samples r7
...
* commit '86ed92ac001e839d2ef655d8cfcc2bd3e1829f0a':
Update build files for lmp-mr1-ub-docs samples r7
2015-05-09 06:33:48 +00:00
Trevor Johns
7c9491a244
am 434d41c4: Update samples prebuilts for lmp-mr1-ub-docs
...
* commit '434d41c45df023fd543a94e88b0bda2dc5c7844d':
Update samples prebuilts for lmp-mr1-ub-docs
2015-05-09 02:52:01 +00:00
Trevor Johns
86ed92ac00
Update build files for lmp-mr1-ub-docs samples r7
...
- Updated samples package to r7
- Added AlwaysOn sample to sdk.atree
Change-Id: I0a8b780dfe514b6e50adbe5422be4d3dfe32ecbd
2015-05-08 19:31:14 -07:00
Trevor Johns
434d41c45d
Update samples prebuilts for lmp-mr1-ub-docs
...
Synced to developers/samples/android commit
54bab34b386e343e9d0ea75a5fb8d13db2c71eb5.
Change-Id: I1c9d9d2c1f53a051d7b4d85303d5c01ab6f16e68
2015-05-08 19:29:42 -07:00
Trevor Johns
1d5ed62b1f
am 03236391: Sync sample prebuilts to lmp-mr1-ub-docs
...
* commit '03236391f11efe2a9ce89ab92602c58ba717f626':
Sync sample prebuilts to lmp-mr1-ub-docs
2015-04-28 17:55:49 +00:00
Trevor Johns
03236391f1
Sync sample prebuilts to lmp-mr1-ub-docs
...
Upstream commit: f76d10f3b6abad250d94b5b9a5c73faae6ce8cc5
Change-Id: I32f2690e36f444cae123134268472fb526c26163
2015-04-28 10:39:50 -07:00
Trevor Johns
2d983a7359
am 9a2076ae: am 13b15893: Update sample browseables
...
* commit '9a2076aef4d57f3b29f108999ccba02ab438f926':
Update sample browseables
2015-04-27 07:01:37 +00:00
Trevor Johns
9a2076aef4
am 13b15893: Update sample browseables
...
* commit '13b15893e3804ac8dac72226b6ad9f3478219060':
Update sample browseables
2015-04-26 22:07:55 +00:00
Trevor Johns
c474affc8f
am 773d3777: (-s ours) DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
...
* commit '773d377754b8f79a3da7c7ef715199314d785460':
DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
2015-04-26 18:55:23 +00:00
Trevor Johns
773d377754
DO NOT MERGE: Update version for Android samples pkg (lmp-mr1)
...
Change-Id: I213de7f201ff9ec85e5bd0821cf4beb15156188f
2015-04-23 15:30:39 -07:00
Trevor Johns
0cb8868739
Update sample browseables
...
Synced to developers/samples/android commit
121d61a3334fd4999d3cb6553f2356eb8893d19b.
Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92
(cherry picked from commit 13b15893e3
2015-04-23 21:33:11 +00:00
Trevor Johns
13b15893e3
Update sample browseables
...
Synced to developers/samples/android commit
121d61a3334fd4999d3cb6553f2356eb8893d19b.
Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92
2015-04-22 20:21:37 -07:00
Yuichi Araki
a67060571e
Merge "Add NavigationView usage to SupportDesignDemos" into lmp-mr1-ub-dev
2015-04-15 02:58:29 +00:00
Dan Albert
edaa710ea8
am 1532b77b: am 386b8374: Merge "Allow acov --prep to succeed in a clean build."
...
* commit '1532b77b019eacf634ae4546877c0f6a639c954a':
Allow acov --prep to succeed in a clean build.
2015-04-15 00:04:32 +00:00
Dan Albert
1532b77b01
am 386b8374: Merge "Allow acov --prep to succeed in a clean build."
...
* commit '386b8374152aef469d6e3d907bd34cd301936cf6':
Allow acov --prep to succeed in a clean build.
2015-04-14 23:49:15 +00:00
Dan Albert
386b837415
Merge "Allow acov --prep to succeed in a clean build."
2015-04-14 23:37:07 +00:00
Dan Albert
f1d27e2c9a
Allow acov --prep to succeed in a clean build.
...
Change-Id: I8f72da827d660f9aad051738a8287463dccd0619
2015-04-14 13:46:57 -07:00
Chris Banes
c5522cae88
Merge "Revert "Disable the design support library and demos"" into lmp-mr1-ub-dev
2015-04-09 07:19:04 +00:00
Chris Banes
b859e355e5
Revert "Disable the design support library and demos"
...
This reverts commit 97930fc88b
2015-04-09 07:17:57 +00:00
Chris Banes
5fdbf91821
Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev
2015-04-09 07:17:13 +00:00
Chris Banes
d1723b40dd
Revert "Disable design lib in master build file"
...
This reverts commit 988f263d5a
2015-04-09 07:16:59 +00:00
Chris Banes
4f10c76afc
Merge "Disable design lib in master build file" into lmp-mr1-ub-dev
2015-04-08 11:24:35 +00:00
Chris Banes
988f263d5a
Disable design lib in master build file
...
Change-Id: I60a42f56b62fa68987e277ce5045d3d672dcf441
2015-04-08 10:18:59 +01:00
Chris Banes
97930fc88b
Disable the design support library and demos
...
Change-Id: Ia0247179d3230d0ec2a198d458bc417fe3102d9d
2015-04-08 08:11:06 +01:00
Yuichi Araki
405b3da398
Add NavigationView usage to SupportDesignDemos
...
Change-Id: Ia9a4070dcae554970f0205a575d218fcb190f226
2015-04-08 13:00:40 +09:00
Chris Banes
e1556d3dfc
Revert "Remove the redundant dependency on Support7Demos"
...
This reverts commit 12edcb5d03
2015-04-07 19:22:45 +00:00
Chris Banes
12edcb5d03
Remove the redundant dependency on Support7Demos
...
Change-Id: I5cf4e061547ad33caa71f802f7a36b36468d17bf
2015-04-07 19:17:46 +01:00
Andreas Gampe
0fc23e5f0d
am 4195b769: am 9ec6712d: Merge "Development/scripts: Update gdbclient for native bridge"
...
* commit '4195b7696c9cbec60e6e25620f9e699fbb23ad9f':
Development/scripts: Update gdbclient for native bridge
2015-04-06 21:02:00 +00:00
Andreas Gampe
4195b7696c
am 9ec6712d: Merge "Development/scripts: Update gdbclient for native bridge"
...
* commit '9ec6712d590adb732fc02608041dbb340143cfad':
Development/scripts: Update gdbclient for native bridge
2015-04-06 20:52:42 +00:00
Andreas Gampe
9ec6712d59
Merge "Development/scripts: Update gdbclient for native bridge"
2015-04-06 20:31:14 +00:00
Andreas Gampe
512cc91be2
Development/scripts: Update gdbclient for native bridge
...
The Nexus Player has a mixed abi-list, but native applications are
still x86. Move x86 ahead to prefer it over arm.
Change-Id: I3e2f3dc0da97b94078f7fd5dc3fede711603961a
2015-04-06 13:29:57 -07:00
Trevor Johns
01a33e9d3b
am 2bffe4f4: am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
...
* commit '2bffe4f46b1aa5d9c60d04b911a73b803785e5d2':
Fix browseable category for NfcProvisioning sample
2015-04-02 23:22:34 +00:00
Trevor Johns
2bffe4f46b
am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
...
* commit 'f4d1982e31b3a27ae19bae89f3981df5ad76394f':
Fix browseable category for NfcProvisioning sample
2015-04-02 23:11:48 +00:00
Trevor Johns
f4d1982e31
am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
...
* commit 'eba484fbd45ba57a3fd831a74eb42e398e776cb3':
Fix browseable category for NfcProvisioning sample
2015-04-02 21:29:31 +00:00
Trevor Johns
eba484fbd4
am 951e7288: Fix browseable category for NfcProvisioning sample
...
* commit '951e7288e6bea6ed91f510e3cdefc7110b4de353':
Fix browseable category for NfcProvisioning sample
2015-04-02 21:21:24 +00:00
Trevor Johns
951e7288e6
Fix browseable category for NfcProvisioning sample
...
Synced with developers/samples/android commit
0a4e12c1bc019a34549c6e88260879e2da49ce7c.
Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
2015-04-02 13:29:30 -07:00
Craig Stout
381fe1c9ca
Merge "Add BackgroundManager release." into lmp-mr1-ub-dev
2015-04-02 20:04:11 +00:00
Chris Craik
5c783cb0f3
am 625dde7b: am 630b075c: Merge "Fix build - support new systrace file structure"
...
* commit '625dde7bdf6726b967733bb8b506734824cd6b5a':
Fix build - support new systrace file structure
2015-04-01 20:20:26 +00:00
Chris Craik
625dde7bdf
am 630b075c: Merge "Fix build - support new systrace file structure"
...
* commit '630b075cdb4299e72d26d8cb355a28c342479201':
Fix build - support new systrace file structure
2015-04-01 20:09:59 +00:00
Chris Craik
630b075cdb
Merge "Fix build - support new systrace file structure"
2015-04-01 19:50:04 +00:00
Chris Craik
6941c574cf
Fix build - support new systrace file structure
...
Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
2015-03-30 18:07:32 -07:00
Trevor Johns
b2c35d1597
am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit '2298d3b48d5bdbb1b6b3e1ea081fede26af7bae0':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:07:15 +00:00
Trevor Johns
2298d3b48d
am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit '0d473ea178b5120ae45249c4d644cd00e876e63e':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:00:49 +00:00
Trevor Johns
0d473ea178
am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit '721cd1b86ac6638b55b0fb20f12695aa32916dd9':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-30 23:54:56 +00:00
Trevor Johns
721cd1b86a
am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-30 23:47:14 +00:00
Trevor Johns
77b5d394ff
Update sdk.atree and samples/browseable for lastest samples release
...
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.
Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
2015-03-30 16:06:43 -07:00
Chris Banes
eb072c1c17
Merge "Add hide on scroll demo" into lmp-mr1-ub-dev
2015-03-30 20:50:48 +00:00
Dan Albert
e1915bdd63
am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."
...
* commit '3ba45f7871ff9705ed6e994304c44b724feed2a2':
Allow libbase to be used on Windows.
2015-03-30 18:43:42 +00:00
