OSDN Git Service
Ed Heyl [Fri, 8 Nov 2013 22:02:35 +0000 (14:02 -0800)]
am
efc277dd: am
5b684e99: merge in release branch changes (no-op).
* commit '
efc277ddf1ccbc0427e3f2a26ee779aa5a574e3a':
"KOT38C"
"KOT38B"
"KOT38"
"KOT37B"
"KOT37"
"KOT36"
"KOT35B"
"KOT35"
KOT31C
"KOT31B"
"KOT32"
"KOT31"
"KOT30"
"KOT29"
"KOT28"
"KOT24"
"KOT23"
"KOT22"
"KOT21"
"KOT18"
Ed Heyl [Fri, 8 Nov 2013 21:59:49 +0000 (13:59 -0800)]
am
5b684e99: merge in release branch changes (no-op).
* commit '
5b684e9972b5fc3efa1814ae9b5d68ac49a60f79':
"KOT38C"
"KOT38B"
"KOT38"
"KOT37B"
"KOT37"
"KOT36"
"KOT35B"
"KOT35"
KOT31C
"KOT31B"
"KOT32"
"KOT31"
"KOT30"
"KOT29"
"KOT28"
"KOT24"
"KOT23"
"KOT22"
"KOT21"
"KOT18"
Raphael Moll [Fri, 8 Nov 2013 21:42:20 +0000 (13:42 -0800)]
am
e9966aab: am
79a9a324: am
3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '
e9966aab80e74d0a06c4ab6734a5996d8cb69604':
Windows SDK: define BEGIN_DECLS/END_DECLS.
Raphael Moll [Fri, 8 Nov 2013 21:38:54 +0000 (13:38 -0800)]
am
79a9a324: am
3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '
79a9a3243ae701e7bc40b85b4a085ad91821d921':
Windows SDK: define BEGIN_DECLS/END_DECLS.
Raphael Moll [Fri, 8 Nov 2013 21:36:17 +0000 (13:36 -0800)]
am
3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '
3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff':
Windows SDK: define BEGIN_DECLS/END_DECLS.
Raphael Moll [Fri, 8 Nov 2013 21:33:57 +0000 (21:33 +0000)]
Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
Ed Heyl [Fri, 8 Nov 2013 21:23:43 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
Raphael Moll [Fri, 8 Nov 2013 19:40:41 +0000 (11:40 -0800)]
Windows SDK: define BEGIN_DECLS/END_DECLS.
These macros are not provided by MingW by default.
Change-Id: I623fda6c8e25e26573543c9368ebad47abc7f5c3
Jeff Brown [Fri, 8 Nov 2013 01:47:17 +0000 (17:47 -0800)]
am
c4c92f1c: am
e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
* commit '
c4c92f1c73933ed98205409d23e5e71e631c03e1':
Add a platform library for remote display providers.
Jeff Brown [Fri, 8 Nov 2013 01:44:06 +0000 (17:44 -0800)]
am
e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
* commit '
e17927e0859778638781d75e33a3d4c5184583c4':
Add a platform library for remote display providers.
Jeff Brown [Fri, 8 Nov 2013 01:37:11 +0000 (01:37 +0000)]
Merge "Add a platform library for remote display providers." into klp-dev
The Android Automerger [Fri, 8 Nov 2013 01:04:53 +0000 (17:04 -0800)]
"KOT38C"
Michael Runge [Fri, 8 Nov 2013 00:13:15 +0000 (16:13 -0800)]
am
3b44339d: am
37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '
3b44339d6a443fde57db4ae84a7e46823da6d162':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
Michael Runge [Thu, 7 Nov 2013 23:00:42 +0000 (15:00 -0800)]
am
37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '
37335b42385970d957d48056145a3d4c4dbc6087':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
The Android Automerger [Thu, 7 Nov 2013 22:40:43 +0000 (14:40 -0800)]
"KOT38B"
Michael Runge [Thu, 7 Nov 2013 01:59:29 +0000 (17:59 -0800)]
Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.
b/
11437930
Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
Brian Carlstrom [Thu, 7 Nov 2013 18:32:17 +0000 (18:32 +0000)]
Merge "Add support for instruction set features"
Elliott Hughes [Thu, 7 Nov 2013 17:44:31 +0000 (09:44 -0800)]
am
36e681b0: resolved conflicts for merge of
12f87a5b to klp-dev-plus-aosp
* commit '
36e681b02a7cd2554f038bcac65d7fdfc7889273':
Remove the hacks needed to support ash and mksh concurrently.
Elliott Hughes [Thu, 7 Nov 2013 17:08:00 +0000 (09:08 -0800)]
resolved conflicts for merge of
12f87a5b to klp-dev-plus-aosp
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
Dave Allison [Thu, 31 Oct 2013 18:44:47 +0000 (11:44 -0700)]
Add support for instruction set features
This adds the --instruction-set-features= arguments to the dex2oat
commands for the system images. The feature set is determined at
build time
(cherry picked from commit
4145a2a20a0f275fe4c77e39d507cd5f8eb7a73b)
Change-Id: I7f1ab44a561e24ad21ff8abe9b7636e04f833e0e
Elliott Hughes [Thu, 7 Nov 2013 16:35:17 +0000 (08:35 -0800)]
am
a05365ce: Merge "Remove the hacks needed to support ash and mksh concurrently."
* commit '
a05365ceceaead86651f61f7ba66153e36b7be5d':
Remove the hacks needed to support ash and mksh concurrently.
Narayan Kamath [Thu, 7 Nov 2013 16:22:09 +0000 (16:22 +0000)]
Merge "Rework the generation of host java libraries."
Elliott Hughes [Thu, 7 Nov 2013 16:07:31 +0000 (16:07 +0000)]
Merge "Remove the hacks needed to support ash and mksh concurrently."
Narayan Kamath [Thu, 7 Nov 2013 15:29:08 +0000 (15:29 +0000)]
Merge "Add experimental flag to support OpenJDK builds."
The Android Automerger [Thu, 7 Nov 2013 14:02:30 +0000 (06:02 -0800)]
"KOT38"
The Android Automerger [Thu, 7 Nov 2013 14:00:31 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Narayan Kamath [Mon, 28 Oct 2013 13:20:52 +0000 (13:20 +0000)]
Rework the generation of host java libraries.
We currently have two types of host libraries, those
meant for the host VM (Sun, OpenJDK etc.) and those meant
for a host dalvik build. The former need to be compiled
against the host standard libraries and the latter need
to be compiled against libcore. This change introduces
two new build rules to complement the existing the existing
host rules.
BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for
a host build of dalvik. Bootclasspath will be set to a host
build of libcore.
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java
library for a host build of dalvik. Bootclasspath will be set
to a host build of libcore.
This change also removes support for the LOCAL_BUILD_HOST_DEX
flag, which is now unnecessary.
bug:
8992787
Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
Nick Kralevich [Thu, 7 Nov 2013 00:15:43 +0000 (16:15 -0800)]
am
8eec26e2: am
7717bcba: am
240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '
8eec26e2765d6e83f8509beb610caef936a11a35':
Move goldfish-specific policy rules to their own directory.
Nick Kralevich [Thu, 7 Nov 2013 00:10:16 +0000 (16:10 -0800)]
am
7717bcba: am
240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '
7717bcba28ce55bac10f6586feff89da569ff62b':
Move goldfish-specific policy rules to their own directory.
Nick Kralevich [Thu, 7 Nov 2013 00:02:06 +0000 (16:02 -0800)]
am
240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '
240cd127eb0a14515b37b2e691645a1e83ab31f9':
Move goldfish-specific policy rules to their own directory.
Nick Kralevich [Wed, 6 Nov 2013 23:58:08 +0000 (23:58 +0000)]
Merge "Move goldfish-specific policy rules to their own directory."
The Android Automerger [Wed, 6 Nov 2013 23:14:20 +0000 (15:14 -0800)]
"KOT37B"
Narayan Kamath [Wed, 6 Nov 2013 16:28:42 +0000 (16:28 +0000)]
Merge "Fix droiddoc generation."
Stephen Smalley [Tue, 5 Nov 2013 14:37:41 +0000 (09:37 -0500)]
Move goldfish-specific policy rules to their own directory.
Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
The Android Automerger [Wed, 6 Nov 2013 14:02:35 +0000 (06:02 -0800)]
"KOT37"
The Android Automerger [Wed, 6 Nov 2013 14:00:25 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Jeff Brown [Wed, 6 Nov 2013 06:17:57 +0000 (22:17 -0800)]
Add a platform library for remote display providers.
Bug:
11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
Elliott Hughes [Tue, 5 Nov 2013 21:00:59 +0000 (13:00 -0800)]
am
92303c47: am
e19ebfee: am
a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit '
92303c47b94b32cf5aa5ae1119cb32d3d4c6fa94':
Remove shell_ash; ash is but ashes.
Elliott Hughes [Tue, 5 Nov 2013 19:13:49 +0000 (11:13 -0800)]
Remove the hacks needed to support ash and mksh concurrently.
We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.
Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
Elliott Hughes [Tue, 5 Nov 2013 18:35:26 +0000 (10:35 -0800)]
am
e19ebfee: am
a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit '
e19ebfee3cede975d0dce0b0badf1251c44ec453':
Remove shell_ash; ash is but ashes.
Elliott Hughes [Tue, 5 Nov 2013 18:30:03 +0000 (10:30 -0800)]
am
a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit '
a7f254feb77db5a1358be869c39757eab487bbde':
Remove shell_ash; ash is but ashes.
Elliott Hughes [Tue, 5 Nov 2013 18:01:25 +0000 (18:01 +0000)]
Merge "Remove shell_ash; ash is but ashes."
Elliott Hughes [Tue, 5 Nov 2013 17:05:50 +0000 (09:05 -0800)]
Remove shell_ash; ash is but ashes.
Change-Id: I88040e39c51986b14e3a764e7bb9e2c8c05ed86b
The Android Automerger [Tue, 5 Nov 2013 14:05:13 +0000 (06:05 -0800)]
"KOT36"
The Android Automerger [Tue, 5 Nov 2013 14:03:41 +0000 (06:03 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 4 Nov 2013 22:43:58 +0000 (14:43 -0800)]
"KOT35B"
The Android Automerger [Mon, 4 Nov 2013 14:02:25 +0000 (06:02 -0800)]
"KOT35"
The Android Automerger [Mon, 4 Nov 2013 14:00:28 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 4 Nov 2013 01:59:15 +0000 (17:59 -0800)]
KOT31C
The Android Automerger [Fri, 1 Nov 2013 19:58:12 +0000 (12:58 -0700)]
"KOT31B"
The Android Automerger [Fri, 1 Nov 2013 19:57:01 +0000 (12:57 -0700)]
"KOT32"
Scott Main [Thu, 31 Oct 2013 14:35:50 +0000 (07:35 -0700)]
am
d2479d2b: am
241dbd15: script to handle new static landing pages for sample topics
* commit '
d2479d2beb6e19072c72e67046caff5d2448e4fb':
script to handle new static landing pages for sample topics
Scott Main [Thu, 31 Oct 2013 14:33:07 +0000 (07:33 -0700)]
am
241dbd15: script to handle new static landing pages for sample topics
* commit '
241dbd1565b3693bfc2cc9ee3e9e50bcd2f8a7f0':
script to handle new static landing pages for sample topics
Scott Main [Thu, 31 Oct 2013 14:20:55 +0000 (07:20 -0700)]
script to handle new static landing pages for sample topics
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
The Android Automerger [Thu, 31 Oct 2013 13:02:23 +0000 (06:02 -0700)]
"KOT31"
The Android Automerger [Thu, 31 Oct 2013 13:00:16 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Scott Main [Wed, 30 Oct 2013 23:45:01 +0000 (16:45 -0700)]
am
70120d0b: am
36ea7a3d: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '
70120d0bffcce16c3c94120fde3cd2c495e5027d':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
Scott Main [Wed, 30 Oct 2013 23:41:42 +0000 (16:41 -0700)]
am
36ea7a3d: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '
36ea7a3d74c68d62a5d081401b887e848370f6d8':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
Scott Main [Wed, 30 Oct 2013 23:27:38 +0000 (16:27 -0700)]
remove the dummy sidenav from samples before populating the real list.
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.
Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
Scott Main [Wed, 30 Oct 2013 22:27:28 +0000 (15:27 -0700)]
am
a0df6345: am
e9fbac49: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '
a0df634521840d6d9b154129bb57afe97667f13d':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
Scott Main [Wed, 30 Oct 2013 22:25:03 +0000 (15:25 -0700)]
am
e9fbac49: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '
e9fbac49bba45008d8741f3f93b47e866093e238':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
Scott Main [Wed, 30 Oct 2013 21:47:40 +0000 (14:47 -0700)]
make expandable lists under each sample sticky so they don't collapse
when opening other project directories.
change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.
Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
Ben Cheng [Wed, 30 Oct 2013 17:36:07 +0000 (10:36 -0700)]
am
0ad7a371: am
d16a4913: am
48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit '
0ad7a3715036e70e303eb8c2e3d480b134e8a870':
AArch64: Enable AArch64 support
Ben Cheng [Wed, 30 Oct 2013 17:33:24 +0000 (10:33 -0700)]
am
d16a4913: am
48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit '
d16a49134914eec45f395c867f9e8e282009fffe':
AArch64: Enable AArch64 support
Ben Cheng [Wed, 30 Oct 2013 17:30:42 +0000 (10:30 -0700)]
am
48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit '
48c4bac05f86b712f40b3a2f7dd846ed8f5eb0a4':
AArch64: Enable AArch64 support
Ben Cheng [Wed, 30 Oct 2013 17:27:17 +0000 (17:27 +0000)]
Merge "AArch64: Enable AArch64 support"
The Android Automerger [Wed, 30 Oct 2013 13:01:53 +0000 (06:01 -0700)]
"KOT30"
The Android Automerger [Wed, 30 Oct 2013 13:00:21 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Dirk Dougherty [Wed, 30 Oct 2013 01:32:40 +0000 (18:32 -0700)]
am
5404ae42: am
3c0c1274: Merge "Add n5 landscape-13 device video frame and css." into klp-dev
* commit '
5404ae42e7d982e9bf74fe1bd6e7d4109224e530':
Add n5 landscape-13 device video frame and css.
Dirk Dougherty [Wed, 30 Oct 2013 01:30:35 +0000 (18:30 -0700)]
am
3c0c1274: Merge "Add n5 landscape-13 device video frame and css." into klp-dev
* commit '
3c0c127468bb29ceabb4651273efc386aca1ac85':
Add n5 landscape-13 device video frame and css.
Dirk Dougherty [Wed, 30 Oct 2013 01:27:10 +0000 (01:27 +0000)]
Merge "Add n5 landscape-13 device video frame and css." into klp-dev
Dirk Dougherty [Tue, 29 Oct 2013 23:42:53 +0000 (16:42 -0700)]
am
3b676732: am
57ab9435: Merge "Adjust samples output pages." into klp-dev
* commit '
3b676732913c1fcfbf6b948fe4e1a69e42f5faeb':
Adjust samples output pages.
Dirk Dougherty [Tue, 29 Oct 2013 23:40:56 +0000 (16:40 -0700)]
am
57ab9435: Merge "Adjust samples output pages." into klp-dev
* commit '
57ab94354c02b06f548293e22bd7186da11f07a2':
Adjust samples output pages.
Dirk Dougherty [Tue, 29 Oct 2013 23:35:11 +0000 (23:35 +0000)]
Merge "Adjust samples output pages." into klp-dev
Dirk Dougherty [Tue, 29 Oct 2013 23:25:00 +0000 (16:25 -0700)]
Add n5 landscape-13 device video frame and css.
Change-Id: I3b18782680e74bd8d4022e6701bfd61887101cf1
Ben Cheng [Tue, 29 Oct 2013 23:13:30 +0000 (16:13 -0700)]
AArch64: Enable AArch64 support
This patch completes the support for AArch64. It adds the last few
tweaks that will enable a AArch64 build of bionic.
Please note that though AArch64 uses the new kernel infrastructure,
where the userspace exported headers live in uapi folders, we still
need to include "kernel/common" in the include search path
(take a look at external/kernel-headers/uapi/asm-generic/signal-defs.h).
Also remove the relro linker flags for now as they crash the foundation
model.
Change-Id: Ie2fa8c1056c84dc15fec4469f2d65b8d0c5e712b
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Dirk Dougherty [Tue, 29 Oct 2013 21:33:15 +0000 (14:33 -0700)]
Adjust samples output pages.
Change-Id: I78a523f218f8733d4a3428e1d54c3c5c471cfa17
Scott Main [Tue, 29 Oct 2013 18:23:47 +0000 (11:23 -0700)]
am
ba5b20eb: am
1a00f7fe: fix \'next\' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
* commit '
ba5b20eb9f1714193780518aa1ac2ac8087fb3b7':
fix 'next' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
Scott Main [Tue, 29 Oct 2013 18:22:07 +0000 (11:22 -0700)]
am
1a00f7fe: fix \'next\' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
* commit '
1a00f7fecd240871caa219bb45460b43c652c604':
fix 'next' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
Scott Main [Tue, 29 Oct 2013 18:11:19 +0000 (11:11 -0700)]
fix 'next' links to disable them when at the end of a list.
Also remove the "next class" link at the end of training.
Change-Id: I1d81919a0498d57b451741a7a0c12f011921f2cb
The Android Automerger [Tue, 29 Oct 2013 13:02:00 +0000 (06:02 -0700)]
"KOT29"
The Android Automerger [Tue, 29 Oct 2013 13:00:27 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Ying Wang [Sat, 21 Sep 2013 00:11:43 +0000 (17:11 -0700)]
Add experimental flag to support OpenJDK builds.
bug:
8992787
Change-Id: Ice0fc7dea1d855914fdab9a01b1ac9c722031288
Ben Cheng [Mon, 28 Oct 2013 17:57:40 +0000 (10:57 -0700)]
am
281778a3: am
72e9dab0: am
7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."
* commit '
281778a373f5034195bda7c652e353770dae8242':
Add the search path for libgcc.a and crt*.o.
Ben Cheng [Mon, 28 Oct 2013 17:52:52 +0000 (10:52 -0700)]
am
72e9dab0: am
7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."
* commit '
72e9dab0127e4200d5770d0fa7944fc0db29632b':
Add the search path for libgcc.a and crt*.o.
Ben Cheng [Mon, 28 Oct 2013 17:48:10 +0000 (10:48 -0700)]
am
7b954f4c: Merge "Add the search path for libgcc.a and crt*.o."
* commit '
7b954f4c77aa49633caac196dd9343775d05e81a':
Add the search path for libgcc.a and crt*.o.
Ben Cheng [Mon, 28 Oct 2013 17:44:38 +0000 (17:44 +0000)]
Merge "Add the search path for libgcc.a and crt*.o."
Ben Cheng [Mon, 28 Oct 2013 17:27:58 +0000 (10:27 -0700)]
Add the search path for libgcc.a and crt*.o.
Change-Id: I727f5630f7667b98770d779d43be6a7901471c55
The Android Automerger [Mon, 28 Oct 2013 13:07:58 +0000 (06:07 -0700)]
"KOT28"
The Android Automerger [Mon, 28 Oct 2013 13:02:16 +0000 (06:02 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Dirk Dougherty [Sun, 27 Oct 2013 00:12:26 +0000 (17:12 -0700)]
am
e45fbe5e: am
db932024: Merge "Doc change: css for n5 device video frame." into klp-dev
* commit '
e45fbe5ea73784d2290ff26f6bbd9275743b1135':
Doc change: css for n5 device video frame.
Dirk Dougherty [Sun, 27 Oct 2013 00:09:24 +0000 (17:09 -0700)]
am
db932024: Merge "Doc change: css for n5 device video frame." into klp-dev
* commit '
db932024363c1a8d867dd7b5eb6eca0c185d325e':
Doc change: css for n5 device video frame.
Dirk Dougherty [Sun, 27 Oct 2013 00:04:00 +0000 (00:04 +0000)]
Merge "Doc change: css for n5 device video frame." into klp-dev
Dirk Dougherty [Sat, 26 Oct 2013 19:14:47 +0000 (12:14 -0700)]
Doc change: css for n5 device video frame.
Change-Id: I283c5c7cb3bb84c494b493b333e47f69b2595501
Ben Cheng [Sat, 26 Oct 2013 01:16:25 +0000 (18:16 -0700)]
am
4f2abfff: am
24834ffd: am
4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
* commit '
4f2abfff484db165335fc3922ca692d846d93177':
Two quick fixes: fix kernel header location and nostdlib.
Ben Cheng [Sat, 26 Oct 2013 01:13:14 +0000 (18:13 -0700)]
am
24834ffd: am
4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
* commit '
24834ffddd64f80c93089033c214f0996c2f18c6':
Two quick fixes: fix kernel header location and nostdlib.
Ben Cheng [Fri, 25 Oct 2013 23:11:34 +0000 (16:11 -0700)]
am
4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
* commit '
4f92abad95f724c0bf29c93d6b1c8fff41049007':
Two quick fixes: fix kernel header location and nostdlib.
Ben Cheng [Fri, 25 Oct 2013 16:36:39 +0000 (16:36 +0000)]
Merge "Two quick fixes: fix kernel header location and nostdlib."
Ben Cheng [Fri, 25 Oct 2013 16:33:22 +0000 (09:33 -0700)]
Two quick fixes: fix kernel header location and nostdlib.
Change-Id: Idf2d101e16e895ca75a74a095091e3543b2b482b
Narayan Kamath [Fri, 25 Oct 2013 14:55:46 +0000 (15:55 +0100)]
Fix droiddoc generation.
We want javadoc generated from the standard libraries
we supply and not the host standard libraries.
This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.
bug:
8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d