The Android Automerger
1f62f077b1
JOP17
2012-10-17 07:00:47 -07:00
The Android Automerger
b844d1c78b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 06:59:07 -07:00
The Android Automerger
63d2b0ce79
JVP15E
2012-10-16 20:37:08 -07:00
The Android Automerger
046127ae16
JOP16B
2012-10-16 17:32:17 -07:00
The Android Automerger
f642f01b24
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 17:30:07 -07:00
The Android Automerger
2542cc8e33
JVP15D
2012-10-16 16:56:19 -07:00
The Android Automerger
96452026c6
JVP15C
2012-10-16 11:13:01 -07:00
The Android Automerger
1c6fa68e7b
JOP16
2012-10-16 07:01:45 -07:00
The Android Automerger
d2e51725f8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 06:59:07 -07:00
The Android Automerger
c86b0c66bc
JVP15B
2012-10-15 15:56:42 -07:00
The Android Automerger
536a52dfd2
JVP15
2012-10-15 12:32:34 -07:00
The Android Automerger
79fce7ff66
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-15 12:30:36 -07:00
The Android Automerger
8a0808b3cd
JOP15
2012-10-15 07:00:37 -07:00
The Android Automerger
d785ffed2e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-15 06:59:06 -07:00
The Android Automerger
4bfb52d947
JOP14
2012-10-14 06:59:49 -07:00
The Android Automerger
8c96ced2f3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-14 06:59:03 -07:00
Dirk Dougherty
2297ace604
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
...
Change-Id: I5a14bae715187c3d9307b39394f1b53d4fed39dd
2012-10-13 17:32:23 -07:00
The Android Automerger
e9d3dd60ba
JOP13
2012-10-13 15:37:39 -07:00
The Android Automerger
267dc94e2b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-13 15:36:55 -07:00
The Android Automerger
7708059b14
JOP12D
2012-10-13 03:50:53 -07:00
The Android Automerger
9e818d816f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-13 03:49:55 -07:00
Guang Zhu
18daa1750b
Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
2012-10-12 17:04:58 -07:00
The Android Automerger
3ccd6ed310
JVP12C
2012-10-12 16:35:29 -07:00
The Android Automerger
d444111588
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 16:34:26 -07:00
The Android Automerger
0f72aa6578
JOP12C
2012-10-12 16:33:40 -07:00
The Android Automerger
86135e25d0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 16:32:31 -07:00
The Android Automerger
7c9f90440d
JOP12B
2012-10-12 11:50:51 -07:00
The Android Automerger
c1b3082c8e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 11:49:45 -07:00
The Android Automerger
7027936923
JVP12
2012-10-12 10:28:44 -07:00
The Android Automerger
5d8786bc37
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 10:26:19 -07:00
The Android Automerger
c54eaf4fc2
JOP12
2012-10-12 07:00:22 -07:00
The Android Automerger
b2fe24f927
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 06:59:06 -07:00
Ying Wang
abc9d6f2be
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
2012-10-11 18:01:17 -07:00
Ying Wang
c58b194e78
Delete the unused LOCAL_POST_PROCESS_COMMAND.
...
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
2012-10-11 17:26:07 -07:00
Stephen Hines
0a0cfe95ac
Merge "Add support for building Filterscript files." into jb-mr1-dev
2012-10-11 17:25:21 -07:00
Dirk Dougherty
afc782da46
am 77b10b6a: am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
...
* commit '77b10b6a78f8ef77e2d5bbb3cb650f953c642527':
Doc change: add new items to qv and adjust height.
2012-10-11 16:57:43 -07:00
The Android Automerger
b78e720015
JOP11B
2012-10-11 16:27:47 -07:00
The Android Automerger
59a1df50ca
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 16:26:14 -07:00
Dirk Dougherty
77b10b6a78
am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
...
* commit 'e37b7a52abb488f853fefa1a13eec1b5c20844a6':
Doc change: add new items to qv and adjust height.
2012-10-11 15:33:05 -07:00
Dirk Dougherty
e37b7a52ab
am 8f20607c: Doc change: add new items to qv and adjust height.
...
* commit '8f20607ccb9c41469eec8f1f481d8d841bbeb2a1':
Doc change: add new items to qv and adjust height.
2012-10-11 15:31:29 -07:00
Dirk Dougherty
8f20607ccb
Doc change: add new items to qv and adjust height.
...
Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
2012-10-11 15:29:33 -07:00
Stephen Hines
0ab6e3e6e6
Add support for building Filterscript files.
...
This change piggybacks Filterscript rules onto the existing Renderscript
rules. There is no real difference other than the file extension (which
llvm-rs-cc uses to apply a more stringent set of warnings/errors).
Bug: 7166741
Change-Id: I27175ff1c16c27129cafa92b4e8caabf2e5f4150
2012-10-11 15:29:10 -07:00
Ying Wang
11b15b15ce
Resovle symlink in findmakefiles in envsetup.sh
...
So the returned path can match the one returned by gettop,
and so we can get the correct relative path of ONE_SHOT_MAKEFILE when running mm.
Change-Id: I492d68fec47e59ec9f4ea0fb5139b1a28af0f6cd
2012-10-11 15:05:07 -07:00
Ying Wang
7240549748
Convert to relative path for CleanSpec.mk
...
When using mm, which passes in absolute path, while in full build relative
paths are used to encode clean steps.
Change-Id: I3e39ce3125194589f9a464f27eef4a9c96fa06c1
2012-10-11 12:45:30 -07:00
The Android Automerger
d489d964f0
JVP11
2012-10-11 08:21:16 -07:00
The Android Automerger
1bb184c0ae
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:18:48 -07:00
The Android Automerger
b21b6376a4
JOP11
2012-10-11 07:05:02 -07:00
The Android Automerger
b10de3ea3a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 06:59:07 -07:00
The Android Automerger
bc1e541fcf
JOP10E
2012-10-10 19:21:32 -07:00
Christopher Tate
fd671b2d5f
Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev
2012-10-10 15:35:00 -07:00
