Jean-Baptiste Queru
f4a956bfb6
am 4a6e7d7c: am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"
...
Merge commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f'
* commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f':
add drm/ directory to include it as part of frameworks
2010-08-16 15:18:51 -07:00
Jean-Baptiste Queru
4a6e7d7c49
am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"
...
Merge commit '43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp
* commit '43d406e5c633af505de0e05e44fda9cfe781c184':
add drm/ directory to include it as part of frameworks
2010-08-16 08:15:24 -07:00
Chung-yih Wang
2d9798cf88
resolved conflicts for merge of 9b7ebf5d to master
...
Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
2010-08-06 10:48:53 +08:00
Chung-yih Wang
ab8ed58c63
Add voip(SIP related codes) into framework.
...
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
2010-08-05 11:31:07 +08:00
aimitakeshi
2bdf2653dc
add drm/ directory to include it as part of frameworks
...
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
2010-07-27 08:34:47 +09:00
Nick Kralevich
7ec45cb463
am 876ae91c: am 06df2923: libdrm2 is never used. Remove the reference to it.
2010-05-14 09:36:01 -07:00
Nick Kralevich
06df292347
libdrm2 is never used. Remove the reference to it.
...
Change-Id: Iee14e336377cedb56adb71bc4f40ded137906f1f
2010-05-13 12:14:12 -07:00
Doug Felt
05d275837c
Add subdir under frameworks/base for code ported from icu4j.
...
Change-Id: I6c9fa6dac1f80bbaf8c80b9e0900f4e628ff596f
2010-04-05 14:00:48 -07:00
Dianne Hackborn
d0c997e0b6
Framework no longer links with android-common.
2010-02-25 10:44:45 -08:00
Dan Egnor
81ab3c593a
Include the common source files directly in the framework library
...
when building, to allow mutual interdependencies; the common static
library will be built independently.
2009-11-18 15:08:30 -08:00
Scott Su
40ea53098c
Remove frameworks/base/im from build path
2009-08-23 23:43:24 -07:00
Chung-yih Wang
9305cf95a8
am 67647752: Add keystore in the pathmap of frameworks base.
...
Merge commit '676477525bc40f7ccf196a6580480b9d44adabd8'
* commit '676477525bc40f7ccf196a6580480b9d44adabd8':
Add keystore in the pathmap of frameworks base.
2009-06-12 08:25:39 -07:00
Jean-Michel Trivi
7e09fc130c
am 4175bb90: Removing "tts" from the list of directories containing source code under frameworks/base. This directory doesn\'t exist anymore after change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
...
Merge commit '4175bb90ae8e454416a956b3885995e59ac0454e'
* commit '4175bb90ae8e454416a956b3885995e59ac0454e':
Removing "tts" from the list of directories containing source code
2009-06-12 04:59:35 -07:00
Chung-yih Wang
676477525b
Add keystore in the pathmap of frameworks base.
2009-06-12 07:10:26 +08:00
Jean-Michel Trivi
4175bb90ae
Removing "tts" from the list of directories containing source code
...
under frameworks/base. This directory doesn't exist anymore after
change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
2009-06-11 10:16:52 -07:00
Jaikumar Ganesh
0942768af1
Bluez4 changes
...
Rename hcid to bluetoothd, modify include paths, add cleanspec
2009-06-09 17:20:47 -07:00
Tammo Spalink
0bb9ce9ec3
fix build -- aidl was not finding vpn imports
2009-06-09 13:45:20 +08:00
Jean-Michel Trivi
e1da30426f
Adding in the path the new android.tts package.
2009-05-21 18:44:30 -07:00
The Android Open Source Project
88b607994a
auto import from //depot/cupcake/@135843
2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6
auto import from //depot/cupcake/@135843
2009-03-03 18:28:14 -08:00
The Android Open Source Project
66339ad5ce
auto import from //branches/cupcake/...@126645
2009-01-15 16:12:07 -08:00
The Android Open Source Project
4f85cc54b3
auto import from //branches/cupcake/...@125939
2009-01-09 17:50:54 -08:00
The Android Open Source Project
dcc08f073b
Code drop from //branches/cupcake/...@124589
2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7
Initial Contribution
2008-10-21 07:00:00 -07:00
