Deepanshu Gupta
|
bd28e2d9d3
|
Manual merge of changes from klp-dev
Manually merged the following changes from klp-dev branch and fixed
merge conflicts:
78cfdf31b7
d0581d271e
1f92d7fc0f
0baec410c2
24541255c3
Change-Id: I426729bb90a26746bfff3a0e4a03ea9f37972528
|
2014-01-29 16:50:40 -08:00 |
|
Adam Lesinski
|
282e181b58
|
Revert "Move frameworks/base/tools/ to frameworks/tools/"
This reverts commit 9f6a119c8a.
|
2014-01-27 10:31:04 -08:00 |
|
Mike Lockwood
|
9f6a119c8a
|
Move frameworks/base/tools/ to frameworks/tools/
Change-Id: I3ffafdab27cc4aca256c3a5806b630795b75d5c8
|
2013-08-28 09:44:17 -07:00 |
|
Jeff Brown
|
b9ff71375a
|
Fix build.
Change-Id: Ie83f51ab4b8fddceda8d4f0ac24c532eab7458b8
|
2013-07-18 16:37:44 -07:00 |
|
Ying Wang
|
c486da4887
|
Call functions to calculate deps and classes.jar
Instead of hard-coding them.
Change-Id: Ia5818a1a69efb0964d5aa7de7e8d30ef04dfeccc
|
2010-09-28 14:33:58 -07:00 |
|
Joe Onorato
|
80a60ba85b
|
Clean up some style in the makefiles.
Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
|
2010-07-14 19:58:30 -07:00 |
|
The Android Open Source Project
|
9066cfe988
|
auto import from //depot/cupcake/@135843
|
2009-03-03 19:31:44 -08:00 |
|
The Android Open Source Project
|
d83a98f4ce
|
auto import from //depot/cupcake/@135843
|
2009-03-03 18:28:45 -08:00 |
|
The Android Open Source Project
|
f013e1afd1
|
Code drop from //branches/cupcake/...@124589
|
2008-12-17 18:05:43 -08:00 |
|
The Android Open Source Project
|
54b6cfa9a9
|
Initial Contribution
|
2008-10-21 07:00:00 -07:00 |
|