Chris Banes
64d5a34e12
am c5522cae: Merge "Revert "Disable the design support library and demos"" into lmp-mr1-ub-dev
...
* commit 'c5522cae8872dd761c4fe0289b63500328717e12':
Revert "Disable the design support library and demos"
2015-04-09 07:27:58 +00:00
Chris Banes
f9cd4395a2
am 5fdbf918: Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev
...
* commit '5fdbf91821442faab51330f69d5a3c20bf4793bb':
Revert "Disable design lib in master build file"
2015-04-09 07:27:55 +00: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
3911fb90ed
am 4f10c76a: Merge "Disable design lib in master build file" into lmp-mr1-ub-dev
...
* commit '4f10c76afced740a62b1e60a62be0314db5f02fb':
Disable design lib in master build file
2015-04-08 11:31:29 +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
a8460253ae
am 97930fc8: Disable the design support library and demos
...
* commit '97930fc88bed4240b23fdca24b7817cad888367a':
Disable the design support library and demos
2015-04-08 09:25:12 +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
Chris Banes
67809021f4
am e1556d3d: Revert "Remove the redundant dependency on Support7Demos"
...
* commit 'e1556d3dfc1235d139d96c9234937023150dfea4':
Revert "Remove the redundant dependency on Support7Demos"
2015-04-07 19:29:36 +00: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
4920592cdc
am 12edcb5d: Remove the redundant dependency on Support7Demos
...
* commit '12edcb5d03e99734b025e8b8f970cabc9b291cd3':
Remove the redundant dependency on Support7Demos
2015-04-07 18:44:04 +00:00
Chris Banes
12edcb5d03
Remove the redundant dependency on Support7Demos
...
Change-Id: I5cf4e061547ad33caa71f802f7a36b36468d17bf
2015-04-07 19:17:46 +01:00
Andreas Gampe
35cb54da3f
am 0fc23e5f: am 4195b769: am 9ec6712d: Merge "Development/scripts: Update gdbclient for native bridge"
...
* commit '0fc23e5f0d43520566792fa1f53eaa8945cc663b':
Development/scripts: Update gdbclient for native bridge
2015-04-06 23:27:53 +00: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
Doris Liu
fb21ef579d
Merge "Add sample code for specifying per-keyframe interpolator in xml"
2015-04-03 17:18:30 +00:00
Trevor Johns
d395e944c5
am 01a33e9d: am 2bffe4f4: am f4d1982e: am eba484fb: am 951e7288: Fix browseable category for NfcProvisioning sample
...
* commit '01a33e9d3befb8a65ff65d15a8b174026c5510f6':
Fix browseable category for NfcProvisioning sample
2015-04-03 14:51:56 +00:00
Doris Liu
2ef936dbae
Add sample code for specifying per-keyframe interpolator in xml
...
Depend on ag/667176
Bug: 19913234
Change-Id: Iaf4160646a972dcc9fd1d885f1ffc0cd68a3b6ac
2015-04-02 18:00:48 -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
73505e668e
am 381fe1c9: Merge "Add BackgroundManager release." into lmp-mr1-ub-dev
...
* commit '381fe1c9ca7598c65c69737dc2643fd511457277':
Add BackgroundManager release.
2015-04-02 20:12:07 +00:00
Craig Stout
381fe1c9ca
Merge "Add BackgroundManager release." into lmp-mr1-ub-dev
2015-04-02 20:04:11 +00:00
Etan Cohen
0d8fe8b59c
Merge "Merge commit 'c84e7b11e598d5a6c07c754755382279e194efcb' into merge"
2015-04-02 03:08:08 +00:00
Chris Craik
1f08b49c92
am 5c783cb0: am 625dde7b: am 630b075c: Merge "Fix build - support new systrace file structure"
...
* commit '5c783cb0f3d35df0507d61858c845a68ffa1aaa1':
Fix build - support new systrace file structure
2015-04-01 23:00:23 +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
edcf97efa7
am b2c35d15: am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release
...
* commit 'b2c35d1597aace199282148142249a3b14bd95f3':
Update sdk.atree and samples/browseable for lastest samples release
2015-03-31 00:12:46 +00: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
Etan Cohen
0650f6cdd4
Merge commit 'c84e7b11e598d5a6c07c754755382279e194efcb' into merge
2015-03-30 16:54:20 -07: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
70aad0f719
am eb072c1c: Merge "Add hide on scroll demo" into lmp-mr1-ub-dev
...
* commit 'eb072c1c17334e29a057342d5f5fa6375745fb03':
Add hide on scroll demo
2015-03-30 20:57:43 +00: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
99ad31c686
am e1915bdd: am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."
...
* commit 'e1915bdd6302e4ea6abe363d04ad8eba9bbf3df8':
Allow libbase to be used on Windows.
2015-03-30 18:50:29 +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
Dan Albert
3ba45f7871
am 2474617f: Merge "Allow libbase to be used on Windows."
...
* commit '2474617f0162c7de1c359321071706540983cd2d':
Allow libbase to be used on Windows.
2015-03-30 18:36:33 +00:00
Dan Albert
2474617f01
Merge "Allow libbase to be used on Windows."
2015-03-30 17:47:20 +00:00
Xavier Ducrohet
b0735703ab
am 4da695a3: (-s ours) am 54b50638: am e9013bf3: am 835221bf: am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE.
...
* commit '4da695a3c3aa2bc0e043ff18213959a6875bc122':
2015-03-27 01:38:41 +00:00
