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

15649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Youngsang Cho
3ee98b1ad0 Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev 2014-07-18 18:24:25 +00:00
Ying Wang
059adfb37a am 90b2bdae: Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev 
* commit '90b2bdae91cc008b5b5827066e02905398b24e7c':
  3rd attempt to build and store android_system.jar in sdk builds.
 2014-07-18 16:27:49 +00:00
Yohann Roussel
4f19aae797 am 96489645: am e15f6511: Merge "Move multidex support library" 
* commit '96489645aba1b3241b10baab6c927c069e48a877':
  Move multidex support library
 2014-07-18 13:29:31 +00:00
Yohann Roussel
1b45a1d964 am a7aa5e0e: (-s ours) am 2d2ce1b6: Merge "Add res folder to multidex SDK projects." 
* commit 'a7aa5e0e866a0a6c82e8673d642be490aeecc0f1':
  Add res folder to multidex SDK projects.
 2014-07-18 13:29:30 +00:00
Yohann Roussel
bf04e111a6 am 8a8f2488: (-s ours) am 93b72e47: Merge "android-support-multidex-instrumentation in SDK." 
* commit '8a8f24886df8d6c25bb27f79fdac204695f058b2':
  android-support-multidex-instrumentation in SDK.
 2014-07-18 13:23:55 +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
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
96489645ab am e15f6511: Merge "Move multidex support library" 
* commit 'e15f6511b7a86622dbc63392830ecd61df4da6e0':
  Move multidex support library
 2014-07-18 10:55:29 +00:00
Yohann Roussel
a7aa5e0e86 am 2d2ce1b6: Merge "Add res folder to multidex SDK projects." 
* commit '2d2ce1b6c3d8dc221ac783103b116ce8dcdfd7e2':
  Add res folder to multidex SDK projects.
 2014-07-18 10:55:27 +00:00
Yohann Roussel
8a8f24886d am 93b72e47: Merge "android-support-multidex-instrumentation in SDK." 
* commit '93b72e4703204b1ba15929a9b30e5b2ec3febfa5':
  android-support-multidex-instrumentation in SDK.
 2014-07-18 10:55:26 +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
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
Jaewan Kim
3b0abb7811 AtscTvInput : Add a dummy implementation of abstract onContentUnblocked() 
Bug: 13172379
Change-Id: I0c165632bf842ec0d7ea54cc4eecc0cd305ad602
 2014-07-18 02:24:23 +00:00
Andrew Hsieh
fa902f3344 Merge "Fix gl3stub.h" 2014-07-17 23:12:27 +00:00
Andrew Hsieh
b50f8f6612 Merge "Add APP_ABI for module-exports sample" 2014-07-17 22:52:20 +00:00
Arseniy Antonov
22359ed8bf Add APP_ABI for module-exports sample 
Add APP_ABI := all
to be able to compile this sample for all platforms
without additional manual manipulations.

Change-Id: I8ebb98c86dae2f6e926885b6d70d306ceca33d1f
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
 2014-07-21 16:51:46 +04:00
Andrew Hsieh
30c2909f51 Merge "Refresh 64-bit headers/libs (WW29)" 2014-07-17 22:52:20 +00:00
Andrew Hsieh
cc101e0860 Refresh 64-bit headers/libs (WW29) 
Change-Id: Ifaee25e70db14327c6f8104b04bf3abd71493477
 2014-07-19 16:03:48 +08:00
Yohann Roussel
e15f6511b7 Merge "Move multidex support library" 2014-07-17 22:39:21 +00:00
Maurice Chu
6fee567b2f Move multidex support library 
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

Bug: 10674263

(cherry picked from commit 7b433ee4e4)

Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e
 2014-07-18 10:52:54 +00:00
Yohann Roussel
2d2ce1b6c3 Merge "Add res folder to multidex SDK projects." 2014-07-17 22:37:43 +00:00
Yohann Roussel
c854c636d9 Merge "Add multidex ADT project to SDK." 2014-07-17 22:37:43 +00:00
Yohann Roussel
93b72e4703 Merge "android-support-multidex-instrumentation in SDK." 2014-07-17 22:36:58 +00:00
Yohann Roussel
0d1b03f127 Merge "Include android-support-multidex in SDK libs." 2014-07-17 22:36:58 +00:00
Sungsoo Lim
51324e22d1 Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev 2014-07-17 22:03:23 +00:00
Sungsoo Lim
e88684d024 Remove the dummy implementation of onContentUnblocked() 
This reverts commit 3b0abb7811.

Change-Id: I784cdd5ce0fe78ba66ed5e8cb8135b9082b4aa1c
 2014-07-19 04:52:42 +00:00
Chulwoo Lee
9f688cc161 Merge "Put input ID when inserting channels" into lmp-dev 2014-07-17 22:03:23 +00:00
Chulwoo Lee
f96eb6672e Put input ID when inserting channels 
Change-Id: I1c9944db6fd9d05cfbbfffe2e3464b6f16b7445b
 2014-07-18 18:27:30 +09: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
Ying Wang
90b2bdae91 Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev 2014-07-17 21:58:28 +00:00
Ying Wang
567a46bf22 3rd attempt to build and store android_system.jar in sdk builds. 
Change-Id: Ica053e3ef6e3190ab4dcc32b3b7d06fc4c619884
 2014-07-18 09:16:40 -07:00
Jae Seo
66ef0f3c8a am d85449be: Quick build fix 
* commit 'd85449be2418d23c36c984a4ebe3970f9f30208b':
  Quick build fix
 2014-07-17 21:29:53 +00:00
Deepanshu Gupta
82b828e178 Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev 2014-07-17 21:09:48 +00:00
Jae Seo
d85449be24 Quick build fix 
Change-Id: I7b660363a53b77249c6ac94a78f25c70b449d0fc
 2014-07-17 13:16:48 -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
Baligh Uddin
c60ea58ba8 Merge "Remove deprecated locales" 2014-07-17 17:59:02 +00:00
Deepanshu Gupta
62012f9502 resolved conflicts for merge of f5dcf2f1 to master 
Change-Id: Ia2dc136400e5e67df148d2f4b196d9d458b18ef6
 2014-07-18 15:19:42 -07:00
Youngsang Cho
6e59c03d32 am aa78cabf: am 3ee98b1a: Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev 
* commit 'aa78cabf7b23383435110242f667e6bf118d81dc':
  AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()
 2014-07-18 19:14:06 +00:00
Baligh Uddin
23b0060966 Remove deprecated locales 
Change-Id: If4583aeb25e54c3507206a298e817d26bc3f52d5
 2014-07-18 11:42:38 -07:00
Ying Wang
414007190e am 059adfb3: am 90b2bdae: Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev 
* commit '059adfb37a850ec595a940c2e33f3f724b68507d':
  3rd attempt to build and store android_system.jar in sdk builds.
 2014-07-18 16:30:20 +00:00
Yohann Roussel
d429ed1ee5 am 4f19aae7: am 96489645: am e15f6511: Merge "Move multidex support library" 
* commit '4f19aae7979306ec38afcef3b9ece2c31fa8c407':
  Move multidex support library
 2014-07-18 13:34:56 +00:00
Yohann Roussel
e5b448c448 am 1b45a1d9: am a7aa5e0e: (-s ours) am 2d2ce1b6: Merge "Add res folder to multidex SDK projects." 
* commit '1b45a1d9642bfda9113899d509096b718cf1f6dd':
  Add res folder to multidex SDK projects.
 2014-07-18 13:34:55 +00:00
Yohann Roussel
681be048da am bf04e111: am 8a8f2488: (-s ours) am 93b72e47: Merge "android-support-multidex-instrumentation in SDK." 
* commit 'bf04e111a6a577cbc43e0362f43369a237078314':
  android-support-multidex-instrumentation in SDK.
 2014-07-18 13:27:37 +00:00