Ricardo Cervera
24dfd97b7f
docs: Updated samples descriptions for Apr samples push.
...
Change-Id: I0b487789735a1251e5cc3d9b9e9e38376771c5c7
2014-04-11 09:55:40 -07:00
Alexander Lucas
e5d22f68a8
am e6dcd2f5: am 4bf9ebc7: am fb5e574e: Updated browseable samples for april push
...
* commit 'e6dcd2f593c8d4aba9b2ec8bc9a8a99eb23d5bbe':
Updated browseable samples for april push
2014-04-11 16:15:34 +00:00
Alexander Lucas
e6dcd2f593
am 4bf9ebc7: am fb5e574e: Updated browseable samples for april push
...
* commit '4bf9ebc7b6a589c8e1370b21a25ed5b7deb37d02':
Updated browseable samples for april push
2014-04-11 16:08:43 +00:00
Alexander Lucas
4bf9ebc7b6
am fb5e574e: Updated browseable samples for april push
...
* commit 'fb5e574e7953a646b95652632d0c4c87a47f4d5e':
Updated browseable samples for april push
2014-04-11 16:05:04 +00:00
Andrew Hsieh
3fc69fb1b8
am 21de3013: am f90d4304: Merge "Remove accidentally committed in Makefile."
...
* commit '21de3013936f163ae4bca5a33385952fe3a37463':
Remove $(info...) accidentally committed in Makefile.
2014-04-11 14:31:50 +00:00
Andrew Hsieh
21de301393
am f90d4304: Merge "Remove accidentally committed in Makefile."
...
* commit 'f90d430419b9ba4770db1fb950436e39166012b3':
Remove $(info...) accidentally committed in Makefile.
2014-04-11 14:28:31 +00:00
Andrew Hsieh
f90d430419
Merge "Remove $(info...) accidentally committed in Makefile."
2014-04-11 14:24:49 +00:00
WenHan Gu
a8ba6f6147
Remove $(info...) accidentally committed in Makefile.
...
Change-Id: Ifc043619bccf7e208b6a971987fcc78f0e763a93
2014-04-11 19:14:40 +08:00
Xavier Ducrohet
c514a33d82
am 4c3d9d23: am 26b61880: Move support lib to 19.2.0. Do not merge.
...
* commit '4c3d9d23c20ca105f129c90b0b9cfa2931d42527':
Move support lib to 19.2.0. Do not merge.
2014-04-11 00:31:00 +00:00
Xavier Ducrohet
4c3d9d23c2
am 26b61880: Move support lib to 19.2.0. Do not merge.
...
* commit '26b61880987d17afd21a60d84d6caa8e19e89bca':
Move support lib to 19.2.0. Do not merge.
2014-04-11 00:26:53 +00:00
Xavier Ducrohet
26b6188098
Move support lib to 19.2.0. Do not merge.
...
Change-Id: Ic1165a1b3c2165fea64a3fc22684ad6abbb24af7
2014-04-10 16:41:42 -07:00
Alexander Lucas
fb5e574e79
Updated browseable samples for april push
...
Change-Id: Idd8cc6b7c43ab93f05f0a5d69d5379631721d185
2014-04-10 15:44:01 -07:00
Andrew Hsieh
8326e0edba
Update 64-bit headers/libs
...
Also
1) rename lib -> lib64
2) add src/ for android-20/arch-arm64 and arch-mips64
3) delete android-9/arch-arm64 and arch-mips64
Change-Id: I4958c4e52946e29e57b910f39ff0104200853a06
2014-04-10 15:28:53 -07:00
Andrew Hsieh
f3109db835
am 37f3302d: am 6db591b9: Merge "Directories/symlinks changes for x86_64 support"
...
* commit '37f3302d6eea5561bddd8caf75729f0d8df7b6ae':
Directories/symlinks changes for x86_64 support
2014-04-10 20:23:48 +00:00
Andrew Hsieh
37f3302d6e
am 6db591b9: Merge "Directories/symlinks changes for x86_64 support"
...
* commit '6db591b98cef806b8fc01bde94b100798c871327':
Directories/symlinks changes for x86_64 support
2014-04-10 20:21:48 +00:00
Andrew Hsieh
6db591b98c
Merge "Directories/symlinks changes for x86_64 support"
2014-04-10 20:20:02 +00:00
Andrew Hsieh
0c3ed0f34e
am 11cd67cc: am 2d2e407f: Merge "Implement libportable for unknown arch 64bit."
...
* commit '11cd67cc315c73165cc339f8a78c386f2452a250':
Implement libportable for unknown arch 64bit.
2014-04-10 02:46:25 +00:00
Andrew Hsieh
11cd67cc31
am 2d2e407f: Merge "Implement libportable for unknown arch 64bit."
...
* commit '2d2e407f1ff28f5c6d168bfccf20e2ebbbd5649a':
Implement libportable for unknown arch 64bit.
2014-04-10 02:44:28 +00:00
Andrew Hsieh
2d2e407f1f
Merge "Implement libportable for unknown arch 64bit."
2014-04-10 02:42:31 +00:00
Tim Kilbourn
55458e676c
am e0cd23d9: Use ImageCardview in leanback samples.
...
* commit 'e0cd23d9d8dc95c502198a3f1d73e950d6b9ecd4':
Use ImageCardview in leanback samples.
2014-04-09 23:50:42 +00:00
Craig Stout
f6da118013
am 3d2e6fb9: Add VerticalGridActivity to the leanback demo.
...
* commit '3d2e6fb9687438adce494692feec57b7b34a2109':
Add VerticalGridActivity to the leanback demo.
2014-04-09 14:03:31 +00:00
Tim Kilbourn
e0cd23d9d8
Use ImageCardview in leanback samples.
...
Change-Id: I14606ff001cfd4ce244f32a8f1c973847ac1d0e3
2014-04-09 00:45:00 -07:00
Craig Stout
3d2e6fb968
Add VerticalGridActivity to the leanback demo.
...
Change-Id: I38e8a85d5a7ae30b1c0ee71cff979456bdac0665
2014-04-09 00:10:44 -07:00
WenHan Gu
859559268d
Implement libportable for unknown arch 64bit.
...
Change-Id: I1e1fd8714b907bfccd5fa8df12a94697886e59cb
2014-04-08 16:28:22 +08:00
Steve Moyer
f457a8630f
am 1601b1c9: (-s ours) am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
...
* commit '1601b1c9e632cce64d9f9aa676891e228b28eb73':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-04-07 22:52:06 +00:00
Steve Moyer
1601b1c9e6
am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
...
* commit '6c56e9e104d6071d459f04b266c6b8c53a32c635':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-04-07 22:48:19 +00:00
Steve Moyer
6c56e9e104
Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
2014-04-07 22:43:27 +00:00
Tim Kilbourn
e88b659c2b
am 29830054: Add callbacks for actions in details.
...
* commit '29830054ff0d668aa51732aa080fcac113f9895c':
Add callbacks for actions in details.
2014-04-06 08:02:36 +00:00
Tim Kilbourn
29830054ff
Add callbacks for actions in details.
...
Change-Id: I5d56e65c45c686fa1b4a686d67f27fb316f9ddf9
2014-04-04 16:39:12 -07:00
Steve Moyer
3a49f89e86
DO NOT MERGE: fix package for AndroidJUnitRunner
...
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
2014-04-04 16:32:31 -07:00
Tim Kilbourn
62ff964627
am 7f94b8d6: Add a details fragment to leanback samples.
...
* commit '7f94b8d6e6bd1dc4e2e8d95d1aeb1c3c00a13dd0':
Add a details fragment to leanback samples.
2014-04-04 22:26:29 +00:00
Tim Kilbourn
7f94b8d6e6
Add a details fragment to leanback samples.
...
Change-Id: Ib958e02b464618107ab7233cb0e05bddc6ef56df
2014-04-04 12:46:19 -07:00
Xavier Ducrohet
14c79bb8db
am f3ff0296: Move ZipAlign to build-tools. DO NOT MERGE.
...
* commit 'f3ff0296c96a81a6ebb053bf39f7484d03dc4678':
Move ZipAlign to build-tools. DO NOT MERGE.
2014-04-04 17:52:33 +00:00
Xavier Ducrohet
f3ff0296c9
Move ZipAlign to build-tools. DO NOT MERGE.
...
(cherry picked from commit 76510e2dd2 )
Change-Id: I2262795c0dfe9b103fda8c9a50a80d688ece5a12
2014-04-04 10:45:35 -07:00
Steve Moyer
510fca8beb
am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
...
* commit '20c4a33489f27fe704f6eb66ec49bc9063b59951':
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-04-04 16:39:25 +00:00
Steve Moyer
20c4a33489
am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
...
* commit '0b1a1f7b38f6fdfa4de35238529036d2a6230615':
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-04-04 16:36:17 +00:00
Steve Moyer
0b1a1f7b38
Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
2014-04-04 16:32:00 +00:00
Xavier Ducrohet
d6ccbcd253
am 47eadf1e: Merge "Move ZipAlign to build-tools."
...
* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
Move ZipAlign to build-tools.
2014-04-04 00:08:23 +00:00
Steve Moyer
6ded79d696
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Conflicts:
build/sdk.atree
Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-04-03 16:02:56 -07:00
Xavier Ducrohet
47eadf1ece
Merge "Move ZipAlign to build-tools."
2014-04-03 22:21:08 +00:00
Xavier Ducrohet
76510e2dd2
Move ZipAlign to build-tools.
...
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
2014-04-03 10:09:53 -07:00
Andrew Hsieh
c415108e0e
am 497b94df: Merge "Headers update from bionic for x86_64 support"
...
* commit '497b94df024cc6b4b6a5e98886dc85e8bc391994':
Headers update from bionic for x86_64 support
2014-04-02 09:01:43 +00:00
Andrew Hsieh
497b94df02
Merge "Headers update from bionic for x86_64 support"
2014-04-02 08:21:49 +00:00
Andrew Hsieh
2a87ef1a90
am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits"
...
* commit '0123d3496ac20fadbedf3c0fa38447e66a0b8ff2':
Move _types.h to 32-bit arch dirs to avoid impact on 64-bits
2014-03-29 03:21:24 +00:00
Andrew Hsieh
930e9feeda
am ac982541: Merge "Refresh locale.h from bionic"
...
* commit 'ac982541a91fb9999b55a52ef0e269731968c231':
Refresh locale.h from bionic
2014-03-29 03:17:40 +00:00
Andrew Hsieh
d64062a05f
am 1782523e: Merge "Add 64-bit libc.so/libm.so/libdl.so"
...
* commit '1782523e75b76d2c67b807fc1520c61532a129a6':
Add 64-bit libc.so/libm.so/libdl.so
2014-03-29 03:17:38 +00:00
Andrew Hsieh
0123d3496a
Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits"
2014-03-29 03:12:46 +00:00
Andrew Hsieh
ac982541a9
Merge "Refresh locale.h from bionic"
2014-03-29 03:07:31 +00:00
Andrew Hsieh
1782523e75
Merge "Add 64-bit libc.so/libm.so/libdl.so"
2014-03-29 03:05:27 +00:00
Yigit Boyar
71e839fdec
am 01851b3e: Merge "LinearLayoutManager examples" into klp-modular-dev
...
* commit '01851b3efd18fd60db8a13563e1374a84b3c89fe':
LinearLayoutManager examples
2014-03-28 23:03:53 +00:00