LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,157 Commits 2 Branches 0 Tags
52eb1c8d4edb58f6a0a38bb055673fe631f014d1
Commit Graph

15157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohann Roussel
52eb1c8d4e am 0a76d3d7: am b8db294e: (-s ours) am c854c636: Merge "Add multidex ADT project to SDK." 
* commit '0a76d3d7da01cbb058e28bde594d34accede361d':
  Add multidex ADT project to SDK.
 2014-07-18 13:23:48 +00:00
Yohann Roussel
e2ec9f0a02 am 955c4072: am 7ec33a7c: (-s ours) am 0d1b03f1: Merge "Include android-support-multidex in SDK libs." 
* commit '955c407204ff975fbbf9047ec7564f04ad1df634':
  Include android-support-multidex in SDK libs.
 2014-07-18 13:20:09 +00:00
Yohann Roussel
0a76d3d7da am b8db294e: (-s ours) am c854c636: Merge "Add multidex ADT project to SDK." 
* commit 'b8db294e23c68fbb387455820e0f777b68ea66f0':
  Add multidex ADT project to SDK.
 2014-07-18 13:17:49 +00:00
Wonsik Kim
950a3c842f am 92dc4e5b: am 859cc5f0: Merge "Adjust to onCreateSession() method signature change" into lmp-dev 
* commit '92dc4e5b46e64c64c4b9472b929e69b7cf2cba87':
  Adjust to onCreateSession() method signature change
 2014-07-18 13:13:25 +00:00
Ying Wang
935cd7e359 am 572a5b7b: am 38bf922a: Merge ""sdk" is not necessarily on the linux command line." into lmp-dev 
* commit '572a5b7b208d4dd15ff1e2bcb83b9b9616acbdc4':
  "sdk" is not necessarily on the linux command line.
 2014-07-18 13:13:24 +00:00
Jae Seo
566227005c am 689a6eb7: am c9bdea04: AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API 
* commit '689a6eb7d69f01035a8be5a0a9f6672333e5f8ea':
  AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
 2014-07-18 13:13:10 +00:00
Yohann Roussel
955c407204 am 7ec33a7c: (-s ours) am 0d1b03f1: Merge "Include android-support-multidex in SDK libs." 
* commit '7ec33a7cf3c6719b4a607ff62796d64886bd2d6e':
  Include android-support-multidex in SDK libs.
 2014-07-18 13:08:38 +00:00
Wonsik Kim
92dc4e5b46 am 859cc5f0: Merge "Adjust to onCreateSession() method signature change" into lmp-dev 
* commit '859cc5f0e69f79ab5c628ad0b49b1cddd4cf5c69':
  Adjust to onCreateSession() method signature change
 2014-07-18 11:40:43 +00:00
Ying Wang
572a5b7b20 am 38bf922a: Merge ""sdk" is not necessarily on the linux command line." into lmp-dev 
* commit '38bf922ac10c400522514a2b7af1024ef413ebf9':
  "sdk" is not necessarily on the linux command line.
 2014-07-18 11:40:39 +00:00
Yohann Roussel
b8db294e23 am c854c636: Merge "Add multidex ADT project to SDK." 
* commit 'c854c636d9396cc412dd2efdb69eae8ae22969fa':
  Add multidex ADT project to SDK.
 2014-07-18 10:55:25 +00:00
Yohann Roussel
7ec33a7cf3 am 0d1b03f1: Merge "Include android-support-multidex in SDK libs." 
* commit '0d1b03f127ff2fd0b6a6d79dbf76c6ab8debb527':
  Include android-support-multidex in SDK libs.
 2014-07-18 10:55:24 +00:00
Jae Seo
689a6eb7d6 am c9bdea04: AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API 
* commit 'c9bdea0489bbb9ff2b960a3638a07e6f213adf9d':
  AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
 2014-07-18 03:58:22 +00:00
Jae Seo
c9bdea0489 AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API 
Change-Id: Ibe757445aa087f2bedd2c645981ec99cce1dc8c4
 2014-07-17 20:43:23 -07:00
Yigit Boyar
c8ac2c6b4d am f7c1c539: am 850c44e0: Merge "Update divider item decorator to account for view translation" into lmp-dev 
* commit 'f7c1c539ced7337529d08296d119497119bf6381':
  Update divider item decorator to account for view translation
 2014-07-18 02:58:14 +00:00
Yigit Boyar
f7c1c539ce am 850c44e0: Merge "Update divider item decorator to account for view translation" into lmp-dev 
* commit '850c44e0ec6af4aeb88488729b53405be2fe6c73':
  Update divider item decorator to account for view translation
 2014-07-18 02:51:19 +00:00
Baligh Uddin
d32a99f2df Remove deprecated locales 
Change-Id: I9b911cbe316b16390d773bb0cc1252ff96bfd30b
 2014-07-17 15:42:53 -07:00
Yohann Roussel
c854c636d9 Merge "Add multidex ADT project to SDK." 2014-07-17 22:37:43 +00:00
Yohann Roussel
0d1b03f127 Merge "Include android-support-multidex in SDK libs." 2014-07-17 22:36:58 +00:00
Wonsik Kim
859cc5f0e6 Merge "Adjust to onCreateSession() method signature change" into lmp-dev 2014-07-17 22:03:23 +00:00
Wonsik Kim
e7713aa686 Adjust to onCreateSession() method signature change 
Change-Id: I6137f2d85eb2ca18fb3e50bac54f048470145cd5
 2014-07-18 13:10:02 +09:00
Jae Seo
5a7cd2e543 am 66ef0f3c: am d85449be: Quick build fix 
* commit '66ef0f3c8a6f458f9e70dfc79c894f7ad5f209f4':
  Quick build fix
 2014-07-17 22:00:40 +00:00
Jae Seo
66ef0f3c8a am d85449be: Quick build fix 
* commit 'd85449be2418d23c36c984a4ebe3970f9f30208b':
  Quick build fix
 2014-07-17 21:29:53 +00:00
Jae Seo
d85449be24 Quick build fix 
Change-Id: I7b660363a53b77249c6ac94a78f25c70b449d0fc
 2014-07-17 13:16:48 -07:00
Jim Miller
4a20cc6ada am 44f8eb15: am 94a862f0: Add new "pin complex" type to supported keyguard PINs 
* commit '44f8eb157bc73720d32efc60a01a48cc81aeac94':
 2014-07-17 18:31:09 +00:00
Jim Miller
1b6408e16e am 94a862f0: Add new "pin complex" type to supported keyguard PINs 
* commit '94a862f010399b46e38178e325f9e0da00c12ef8':
  Add new "pin complex" type to supported keyguard PINs
 2014-07-17 18:17:31 +00:00
Ying Wang
38bf922ac1 Merge ""sdk" is not necessarily on the linux command line." into lmp-dev 2014-07-17 17:59:02 +00:00
Ying Wang
c39b6ebb2f "sdk" is not necessarily on the linux command line. 
Bug: 16208466
Change-Id: I29f8763e9763d2b482744d0c7a74c122a299d03b
 2014-07-17 21:18:09 -07:00
Yigit Boyar
850c44e0ec Merge "Update divider item decorator to account for view translation" into lmp-dev 2014-07-17 17:59:02 +00:00
Yigit Boyar
cc33d7ec0f Update divider item decorator to account for view translation 
Bug: 16241985
Change-Id: Id441a07fe547493007e9e05d1039bac526847a1c
 2014-07-17 16:37:21 -07:00
Jim Miller
44f8eb157b am 94a862f0: Add new "pin complex" type to supported keyguard PINs 
* commit '94a862f010399b46e38178e325f9e0da00c12ef8':
  Add new "pin complex" type to supported keyguard PINs
 2014-07-17 17:01:37 +00:00
Yohann Roussel
ef0e4f5a3b Add multidex ADT project to SDK. 
(cherry picked from commit a6ca3cf29f)

Change-Id: I44cf397dbc5649d9d701e2f8524a322d74c2aaa6
 2014-07-17 16:44:30 +02:00
Yohann Roussel
604bf1f185 Include android-support-multidex in SDK libs. 
(cherry picked from commit 9e27887b60)

Change-Id: Ieb2901a633a687927a0c5a5db6d17896c3b86449
 2014-07-17 16:44:30 +02:00
Andrew Hsieh
c30f60bb56 am d54e91cf: am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 
* commit 'd54e91cf9bbaa0177935998c30b00661b151b5e8':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
 2014-07-17 13:44:49 +00:00
Andrew Hsieh
0b760b57a4 am dee2e870: am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib" 
* commit 'dee2e870e610797586d08886cbae9d85fbfa06c0':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
 2014-07-17 13:44:48 +00:00
Andrew Hsieh
fe326e1206 am 6bdc9677: am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime" 
* commit '6bdc96770e00b9b6c647c4f2be8071d50065439b':
  getSampletime -> getSampleTime
 2014-07-17 13:44:47 +00:00
Andrew Hsieh
664b50a397 am 7086c5c4: am b240fe6d: am 2918193e: Merge "Media NDK files" 
* commit '7086c5c4a7e485e81eff59c9be91c5740e4cedcc':
  Media NDK files
 2014-07-17 13:44:46 +00:00
Andrew Hsieh
a70beeccb9 am 7cde60b2: am 37b64790: am 8092009a: Merge "NDK media codec sample" 
* commit '7cde60b29ee82fdd9df505e265b9b404f6c7d7ec':
  NDK media codec sample
 2014-07-17 13:44:45 +00:00
Andrew Hsieh
01545ba8ce am 61e5e463: am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so" 
* commit '61e5e463f5fd66a69bfb3b525d793a272286cc32':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
 2014-07-17 13:44:43 +00:00
Andrew Hsieh
30c045b05b am 2cd1f4ce: am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L" 
* commit '2cd1f4cec35bd1f044152beee2364c2202ce9b53':
  Update OpenSLES_Android.h for API L
 2014-07-17 13:44:42 +00:00
Elliott Hughes
433902ec5d am 818b45f4: am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes." 
* commit '818b45f4948776f1ff23c404c524dc483333958b':
  Stack tool 32/64 bit compatibility fixes.
 2014-07-17 13:44:41 +00:00
Andrew Hsieh
d54e91cf9b am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 
* commit 'a6b673cd97ac0bdb28e041cff431167fc70e534d':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
 2014-07-17 12:59:55 +00:00
Andrew Hsieh
dee2e870e6 am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib" 
* commit '430b78ad742811338c62394f74608322db6e7dec':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
 2014-07-17 12:59:54 +00:00
Andrew Hsieh
6bdc96770e am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime" 
* commit '61aaedb278afed833d19a51eeda23fa61e71d9f9':
  getSampletime -> getSampleTime
 2014-07-17 12:59:53 +00:00
Andrew Hsieh
7086c5c4a7 am b240fe6d: am 2918193e: Merge "Media NDK files" 
* commit 'b240fe6de0e2e61bb97a2569e583148b11e2d1d3':
  Media NDK files
 2014-07-17 12:59:52 +00:00
Andrew Hsieh
7cde60b29e am 37b64790: am 8092009a: Merge "NDK media codec sample" 
* commit '37b647901798727c01a9bbc5960060ec4880a47a':
  NDK media codec sample
 2014-07-17 12:59:50 +00:00
Andrew Hsieh
61e5e463f5 am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so" 
* commit 'b74edf6b28ce6b852f0938f751f5b7331079e2eb':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
 2014-07-17 12:59:49 +00:00
Andrew Hsieh
2cd1f4cec3 am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L" 
* commit '2097b3b7e705753d7d5737f04cd133b941e79486':
  Update OpenSLES_Android.h for API L
 2014-07-17 12:59:48 +00:00
Elliott Hughes
818b45f494 am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes." 
* commit '14a67c7e703553eaf722514f7e2e6eda48922819':
  Stack tool 32/64 bit compatibility fixes.
 2014-07-17 12:59:04 +00:00
Andrew Hsieh
a6b673cd97 am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 
* commit '37feee2abc4f975962fbfab4052834800669964e':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
 2014-07-17 12:30:41 +00:00
Andrew Hsieh
430b78ad74 am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib" 
* commit '37351fdd10ba1f4aba08c6da661acb3188576fd2':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
 2014-07-17 12:30:40 +00:00