LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,680 Commits 2 Branches 0 Tags
81e798aaa2a5efb390c67ba4aaac4270dfe604a9
Commit Graph

13680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
81e798aaa2 merge in master-release history after reset to master 2014-04-12 05:49:50 -07:00
Ricardo Cervera
4de6a5898f am 4701ac6e: am 5f9077b3: am 2dba5be6: am d5ec144b: Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs 
* commit '4701ac6e3ea4f5506dcfd04ae9c29b2466bc2151':
  docs: Updated samples descriptions for Apr samples push.
 2014-04-12 00:33:42 +00:00
Ricardo Cervera
4701ac6e3e am 5f9077b3: am 2dba5be6: am d5ec144b: Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs 
* commit '5f9077b359dd83be215d53c02c64f513a55dbed8':
  docs: Updated samples descriptions for Apr samples push.
 2014-04-12 00:30:18 +00:00
Ricardo Cervera
5f9077b359 am 2dba5be6: am d5ec144b: Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs 
* commit '2dba5be6d9c0e0542d65f9687245d092e0158843':
  docs: Updated samples descriptions for Apr samples push.
 2014-04-12 00:26:28 +00:00
Ricardo Cervera
2dba5be6d9 am d5ec144b: Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs 
* commit 'd5ec144b8c5730dade18a778d15dd9fdc831253b':
  docs: Updated samples descriptions for Apr samples push.
 2014-04-12 00:23:19 +00:00
Ricardo Cervera
d5ec144b8c Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs 2014-04-12 00:21:07 +00:00
Alexander Lucas
b9581d5aae am 229d4df3: am 5bf3d523: am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree 
* commit '229d4df318a4adc0fae28989b8cb0ca277a2f201':
  Added swipe-to-refresh samples to sdk.atree
 2014-04-11 23:01:16 +00:00
Alexander Lucas
229d4df318 am 5bf3d523: am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree 
* commit '5bf3d5236c5cdb65a2ea21004dfc79ed9795a936':
  Added swipe-to-refresh samples to sdk.atree
 2014-04-11 22:42:38 +00:00
Alexander Lucas
5bf3d5236c am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree 
* commit 'fd5ede91e7900da3bbc20b9ef0ca3859ec499e01':
  Added swipe-to-refresh samples to sdk.atree
 2014-04-11 22:31:42 +00:00
Alexander Lucas
fd5ede91e7 am f5d4c15b: Added swipe-to-refresh samples to sdk.atree 
* commit 'f5d4c15b0ba6ff4eef2b228e5f363d3c1ee4fdbc':
  Added swipe-to-refresh samples to sdk.atree
 2014-04-11 22:27:41 +00:00
Alexander Lucas
f5d4c15b0b Added swipe-to-refresh samples to sdk.atree 
Change-Id: If939f14e90c04d2df8bbe683812d2f01ef5f3399
 2014-04-11 15:20:55 -07:00
Alexander Lucas
b015fd0ff0 am b020e934: am ad5f0e86: am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit 'b020e934c5584706d7edfa0c0fe24f69f6a6d38b':
  Updated Samples metadata for April push of samples
 2014-04-11 20:36:08 +00:00
Alexander Lucas
b020e934c5 am ad5f0e86: am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit 'ad5f0e867b9443f587338db8f01ac2d92c19ac7d':
  Updated Samples metadata for April push of samples
 2014-04-11 20:32:24 +00:00
Alexander Lucas
ad5f0e867b am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit 'eb72a6002c8ebdeeb94e432dadc828d7d158cbf2':
  Updated Samples metadata for April push of samples
 2014-04-11 20:29:54 +00:00
Alexander Lucas
eb72a6002c am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit '4a25165ae08f02de8961780ebe7e22a58d343b2b':
  Updated Samples metadata for April push of samples
 2014-04-11 20:26:50 +00:00
Alexander Lucas
4a25165ae0 Merge "Updated Samples metadata for April push of samples" into klp-docs 2014-04-11 20:23:32 +00:00
Alexander Lucas
c7ad654960 Updated Samples metadata for April push of samples 
Change-Id: Ie4136c1cb9051bead3c73a93ccf646577d721a50
 2014-04-11 13:21:11 -07:00
Andrew Hsieh
6bb8a8a598 am 75764b4c: am 97af2619: am 377e5e9b: Merge "Update 64-bit headers/libs" 
* commit '75764b4c45ffcc3cee3feb1d91e69cfe3651309e':
  Update 64-bit headers/libs
 2014-04-11 17:44:32 +00:00
Andrew Hsieh
75764b4c45 am 97af2619: am 377e5e9b: Merge "Update 64-bit headers/libs" 
* commit '97af261912dae1863ecf63de238a48b171ad9e4e':
  Update 64-bit headers/libs
 2014-04-11 17:41:19 +00:00
Andrew Hsieh
97af261912 am 377e5e9b: Merge "Update 64-bit headers/libs" 
* commit '377e5e9b1b61bda7d921b6522117232e96e77db8':
  Update 64-bit headers/libs
 2014-04-11 17:36:53 +00:00
Andrew Hsieh
377e5e9b1b Merge "Update 64-bit headers/libs" 2014-04-11 17:33:04 +00:00
Ricardo Cervera
24dfd97b7f docs: Updated samples descriptions for Apr samples push. 
Change-Id: I0b487789735a1251e5cc3d9b9e9e38376771c5c7
 2014-04-11 09:55:40 -07:00
Alexander Lucas
f0052e3bae am e5d22f68: am e6dcd2f5: am 4bf9ebc7: am fb5e574e: Updated browseable samples for april push 
* commit 'e5d22f68a83e16677b6d240f25d8bf84a5687f4a':
  Updated browseable samples for april push
 2014-04-11 16:17:50 +00: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
ea45910c38 am 3fc69fb1: am 21de3013: am f90d4304: Merge "Remove accidentally committed in Makefile." 
* commit '3fc69fb1b8e55c16cbd8e5fe28bb80de2fcb8d36':
  Remove $(info...) accidentally committed in Makefile.
 2014-04-11 14:35:23 +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
f3ee0f8621 am c514a33d: (-s ours) am 4c3d9d23: am 26b61880: Move support lib to 19.2.0. Do not merge. 
* commit 'c514a33d824005584d251b3f264b2411fbc169ab':
  Move support lib to 19.2.0. Do not merge.
 2014-04-11 00:34:55 +00: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
c88b949738 am f3109db8: am 37f3302d: am 6db591b9: Merge "Directories/symlinks changes for x86_64 support" 
* commit 'f3109db835d3c08128d18e7955c0745bad67d2ec':
  Directories/symlinks changes for x86_64 support
 2014-04-10 20:26:01 +00: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
Brian Attwell
27305158a1 Remove stream activities from sample sync adapter 
Also fixed existing bug that prevented the "Add
Connection" from working for the Ssample Sync Adapter.

Bug: 11629361
Change-Id: I17940cc97ebef3e05dc53e534d5765395ba353a3
 2014-04-10 11:51:04 -07:00
The Android Automerger
85c774ef62 merge in master-release history after reset to master 2014-04-10 05:49:33 -07:00
Andrew Hsieh
62bfb47039 am 0c3ed0f3: am 11cd67cc: am 2d2e407f: Merge "Implement libportable for unknown arch 64bit." 
* commit '0c3ed0f34e0e190387727d8d2f06c527efbb31a5':
  Implement libportable for unknown arch 64bit.
 2014-04-10 02:49:36 +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
931d5741f9 am 55458e67: am e0cd23d9: Use ImageCardview in leanback samples. 
* commit '55458e676cd45a6c40a0d54bdc88c3a9b14cd34c':
  Use ImageCardview in leanback samples.
 2014-04-10 01:07:01 +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
Alan Viverette
676bf55007 Merge "Update ApiDemos to use API 20, default theme" 2014-04-09 22:43:20 +00:00