OSDN Git Service
Scott Main [Thu, 21 Feb 2013 18:53:25 +0000 (18:53 +0000)]
Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
Scott Main [Thu, 21 Feb 2013 18:52:02 +0000 (10:52 -0800)]
docs: add image frame style and left-float figure box
Change-Id: I9103f6f9e9b416902fbb2add60782ba10ff9e900
Robert Ly [Thu, 21 Feb 2013 02:07:00 +0000 (02:07 +0000)]
Revert "support differently named lists.js files"
This reverts commit
a6043f76fa41d6062f3ba9e0aae06feb562f8b51
Change-Id: Id7212f9f1ffbe62fd26f97ab6dcea93bcb34e476
Robert Ly [Wed, 20 Feb 2013 22:47:44 +0000 (14:47 -0800)]
support differently named lists.js files
Change-Id: Id564c916e891051f73e4c7d7a3683d58a48ee16d
Scott Main [Wed, 13 Feb 2013 19:39:09 +0000 (11:39 -0800)]
docs: re-add dev-docs css because it's needed by diff reports
Change-Id: Ic3f334f5510b008cd1f744823e46fb4fdf5630bd
Scott Main [Tue, 12 Feb 2013 22:15:23 +0000 (14:15 -0800)]
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
Change-Id: I5785c63603d8da5dfa1118fe28a3106aa20835a6
Scott Main [Mon, 11 Feb 2013 19:54:11 +0000 (19:54 +0000)]
Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
Scott Main [Mon, 11 Feb 2013 19:42:14 +0000 (11:42 -0800)]
docs: udpate JS bundle URL for dac devsite
Change-Id: I06d8b8536c55581b8e7b2d59c55b3d3069d7fe1d
Dirk Dougherty [Fri, 8 Feb 2013 23:45:45 +0000 (15:45 -0800)]
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1
Scott Main [Fri, 8 Feb 2013 00:56:43 +0000 (16:56 -0800)]
docs: fix ::selection style to use Android blue for text highlighting
Change-Id: I485be948326fc40c349c8170dd1be13962b4c003
Scott Main [Fri, 1 Feb 2013 23:31:56 +0000 (23:31 +0000)]
Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
Scott Main [Fri, 1 Feb 2013 23:29:44 +0000 (15:29 -0800)]
docs: minimize code-font line-height.
Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Change-Id: I0f39655472d09f5af346c7c7e4df8eb0a5a144df
Scott Main [Wed, 30 Jan 2013 23:03:59 +0000 (15:03 -0800)]
docs: fix lang switcher for gae by deleting obsolete method call
Change-Id: I8d91d18e89d539960c93748557cccc5aabb0a263
Scott Main [Tue, 29 Jan 2013 23:12:52 +0000 (15:12 -0800)]
docs: delete obsolete asset files
Change-Id: I1aa8a8fa757dbc81180c0585eacb68df5fe0ceb1
Scott Main [Tue, 29 Jan 2013 21:34:17 +0000 (13:34 -0800)]
docs: update template files with those from the templates-ds directory
Change-Id: I47b07b17ea79d0b00300492ba7854e37f1ab00d0
Scott Main [Tue, 29 Jan 2013 17:01:52 +0000 (09:01 -0800)]
docs: use devsite hdf bool as a javascript condition for managing the lang toggle.
sync the sdk and ds templates so we can move toward one template set
Change-Id: I5316d4cd085734a47953beba203ba8beeb64549e
Dirk Dougherty [Tue, 29 Jan 2013 02:57:30 +0000 (18:57 -0800)]
Add new droiddoc option for project-specific secondary html input/output paths.
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
Dirk Dougherty [Mon, 28 Jan 2013 22:49:50 +0000 (14:49 -0800)]
Add templates for devsite docs builds.
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
Scott Main [Wed, 9 Jan 2013 02:47:45 +0000 (18:47 -0800)]
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
Scott Main [Wed, 9 Jan 2013 02:45:08 +0000 (18:45 -0800)]
docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
Ying Wang [Fri, 4 Jan 2013 22:43:18 +0000 (14:43 -0800)]
Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
Scott Main [Thu, 20 Dec 2012 03:23:32 +0000 (19:23 -0800)]
Merge "docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce." into jb-mr1-dev
Scott Main [Thu, 20 Dec 2012 02:38:24 +0000 (18:38 -0800)]
docs: don't allow setting the sidenav fixed if the doc body is
shorter than the sidenav. Scrolling won't be possible in this case
anyway, but this change fixes a glitch that happens on OSX Lion because
it will allow scrolling anyway for the overscroll bounce.
Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080
Ying Wang [Tue, 27 Nov 2012 02:10:23 +0000 (18:10 -0800)]
Run e2fsck on built sparse images.
Bug:
7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
Robert Ly [Mon, 3 Dec 2012 20:58:14 +0000 (12:58 -0800)]
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:57:50 +0000 (12:57 -0800)]
Merge "docs: support google css class for reference docs" into jb-mr1-dev
Robert Ly [Mon, 3 Dec 2012 20:53:42 +0000 (12:53 -0800)]
fix docs.js bug where changeApiLevel is getting called
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
Robert Ly [Mon, 3 Dec 2012 19:50:38 +0000 (11:50 -0800)]
docs: support google css class for reference docs
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
Scott Main [Mon, 3 Dec 2012 16:54:37 +0000 (08:54 -0800)]
docs: add "Google Services" search tab
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
Scott Main [Sat, 1 Dec 2012 04:16:42 +0000 (20:16 -0800)]
show build info only for android docs (not google)
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
Dirk Dougherty [Fri, 30 Nov 2012 23:39:03 +0000 (15:39 -0800)]
Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 22:40:58 +0000 (14:40 -0800)]
docs: revisions for google reference nav
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
Robert Ly [Fri, 30 Nov 2012 22:02:43 +0000 (14:02 -0800)]
add google class for body
Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb
Dirk Dougherty [Fri, 30 Nov 2012 20:44:40 +0000 (12:44 -0800)]
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
Change-Id: I384c5c5df053d9e98fa953c2e3998e7c99c08569
Scott Main [Fri, 30 Nov 2012 20:02:42 +0000 (12:02 -0800)]
enforce margin change for nolist class in training articles
Change-Id: I7da486d557c3d7629827d2b425fd387366bd7f18
Scott Main [Fri, 30 Nov 2012 19:32:41 +0000 (11:32 -0800)]
Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 19:27:17 +0000 (11:27 -0800)]
docs/css: break words that are too long to fit sidenav; add style for google javadocs
Change-Id: I69f062c5e1ddeafdae75e8f2ec77226aac836e48
Robert Ly [Fri, 30 Nov 2012 05:28:48 +0000 (21:28 -0800)]
add support for gms javadocs
Change-Id: Ieecf09794373a176430f554f39e1c632a7013519
Robert Ly [Thu, 29 Nov 2012 01:46:17 +0000 (17:46 -0800)]
add google services tab
Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58
Scott Main [Wed, 28 Nov 2012 19:10:09 +0000 (11:10 -0800)]
add 'external-link' class for links that go off-site
Change-Id: I9e78cd6a7cb2ce14e5e15fe43e87b55ac456f302
Robert Ly [Wed, 28 Nov 2012 01:27:34 +0000 (17:27 -0800)]
fix build
Change-Id: I3e98493aac48b0061d44351fb8c0f07a759b25c0
Scott Main [Tue, 27 Nov 2012 23:00:40 +0000 (15:00 -0800)]
docs: add support for an infinite number of nested lists in side nav
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
Ying Wang [Tue, 27 Nov 2012 04:51:59 +0000 (20:51 -0800)]
Put ANDROID_BUILD_PATHS before the system default PATH
So tools like adb that are built from source won't be overridden by the
host system tools, when you run these tools without specifying the path.
Change-Id: I2f0a288b38fabf57c7a4aa3bae5e42d7b734398d
Ed Heyl [Mon, 19 Nov 2012 22:20:48 +0000 (14:20 -0800)]
bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
Scott Main [Fri, 16 Nov 2012 18:43:23 +0000 (10:43 -0800)]
Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
Scott Main [Fri, 16 Nov 2012 18:34:22 +0000 (10:34 -0800)]
docs: revise message when api level for docs is too low;
make the message appear on package pages as well
Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
Scott Main [Thu, 15 Nov 2012 22:57:44 +0000 (14:57 -0800)]
docs: add script for 32/64-bit bundle downloads
Change-Id: I502e4ced8ac30cc19bf321e7a586f28244bf1294
Scott Main [Thu, 15 Nov 2012 01:40:58 +0000 (17:40 -0800)]
am
9efb6b09: am
be264b6d: am
5a1123ef: add script to generate list of classes for each training course landing page
* commit '
9efb6b09c4a32cc5cd190a224d15022968859ddb':
add script to generate list of classes for each training course landing page
Scott Main [Thu, 15 Nov 2012 01:39:42 +0000 (17:39 -0800)]
am
be264b6d: am
5a1123ef: add script to generate list of classes for each training course landing page
* commit '
be264b6da6631b8c7d526fc3dc76a6ddbb881fee':
add script to generate list of classes for each training course landing page
Scott Main [Thu, 15 Nov 2012 01:38:11 +0000 (17:38 -0800)]
am
5a1123ef: add script to generate list of classes for each training course landing page
* commit '
5a1123ef7a43c007ff4cfb6c04d3f9dc5436f1c6':
add script to generate list of classes for each training course landing page
Scott Main [Wed, 26 Sep 2012 19:51:28 +0000 (12:51 -0700)]
add script to generate list of classes for each training course landing page
Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d
Scott Main [Wed, 14 Nov 2012 22:12:29 +0000 (14:12 -0800)]
docs: add warning message for adt when on 32-bit os
Change-Id: I457a219bb1f9e07d6b94084c69c56309568a4881
Scott Main [Tue, 13 Nov 2012 19:25:06 +0000 (11:25 -0800)]
docs: add support for ndk tos wall
Change-Id: Ife49429b8241f4e9ce5aaa9f6494d52014a3f238
Scott Main [Tue, 13 Nov 2012 15:52:20 +0000 (07:52 -0800)]
docs: css fix
Change-Id: Ie03e7708866fd2e97347ee10f3a40b2f77b0a803
Scott Main [Tue, 13 Nov 2012 15:47:50 +0000 (07:47 -0800)]
docs: fix broken template
Change-Id: Ibb804bcf8851cdb15cf6c98dff25a3a391eb8301
Scott Main [Tue, 13 Nov 2012 15:40:16 +0000 (07:40 -0800)]
docs: add support for templated tabs with the doc title
Change-Id: I820a2704d21c94a9a452854a46ea88749d8274d0
Scott Main [Tue, 13 Nov 2012 13:36:12 +0000 (05:36 -0800)]
docs: something whatever
Change-Id: I08120f1e27a488dfec03868758ab6de2e75fdc09
Scott Main [Tue, 13 Nov 2012 07:03:59 +0000 (23:03 -0800)]
docs: changes to sdk page and script for toggles
Change-Id: Idef0c6099885cada3a4866ed7b5ec5b6f5078e39
Scott Main [Tue, 13 Nov 2012 02:07:58 +0000 (18:07 -0800)]
am
2953f0b0: am
fef18c61: am
db3678bc: add ADT Bundle to the download page
* commit '
2953f0b0b1fcd350ff269b611a2b43fa62773943':
add ADT Bundle to the download page
Scott Main [Tue, 13 Nov 2012 02:06:25 +0000 (18:06 -0800)]
am
fef18c61: am
db3678bc: add ADT Bundle to the download page
* commit '
fef18c61f5146d1a2eb7ed1f48bf5aaa2af08923':
add ADT Bundle to the download page
Scott Main [Tue, 13 Nov 2012 02:05:00 +0000 (18:05 -0800)]
am
db3678bc: add ADT Bundle to the download page
* commit '
db3678bcaadf74b1a940a3dafb9fda4e238250be':
add ADT Bundle to the download page
Scott Main [Tue, 23 Oct 2012 21:13:41 +0000 (14:13 -0700)]
add ADT Bundle to the download page
Change-Id: Ife533a32e29f2d5f1c58a42ad0b91c5053b44da4
Ying Wang [Wed, 7 Nov 2012 22:07:34 +0000 (14:07 -0800)]
Collapse multiple --extra-packages into one.
Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
Xavier Ducrohet [Wed, 7 Nov 2012 01:03:52 +0000 (17:03 -0800)]
Add dev settings to emulator.
Change-Id: I0f92257c0a6ac92f3bce4ad004c3e2414ef0f9da
Robert Ly [Fri, 2 Nov 2012 00:33:03 +0000 (17:33 -0700)]
am
0900e42e: am
12e6b988: am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
0900e42e488eec40dd40c6e82a9823ca338b11b5':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:31:20 +0000 (17:31 -0700)]
am
12e6b988: am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
12e6b988cbe32fda61957ed87bfb30337c2b8f9d':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:28:28 +0000 (17:28 -0700)]
am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
e896e3447145859371d2b7172122faabe44d10e2':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:26:34 +0000 (17:26 -0700)]
Merge "add css animation videos" into jb-dev-docs
Robert Ly [Fri, 2 Nov 2012 00:09:52 +0000 (17:09 -0700)]
add css animation videos
Change-Id: I2e51cfce1af378e03a9ac40be76ab55e61d19f24
Scott Main [Thu, 25 Oct 2012 02:38:51 +0000 (19:38 -0700)]
am
4810a244: am
71e20e2e: am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
4810a2440c5b9a890f653602164c72c8d0e86750':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:35:37 +0000 (19:35 -0700)]
am
71e20e2e: am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
71e20e2e562957681fdd3965dfc308edcbafa31f':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:33:16 +0000 (19:33 -0700)]
am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
ef4d10811ae7949357cffcd9aa1dda93c2a582ca':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:31:24 +0000 (19:31 -0700)]
Merge "update class header for deprecated info" into jb-dev-docs
Scott Main [Thu, 25 Oct 2012 01:20:23 +0000 (18:20 -0700)]
update class header for deprecated info
Change-Id: I4c41f0bdbac43dc49c99af7bcb5521f7e3278304
Dirk Dougherty [Wed, 24 Oct 2012 20:39:55 +0000 (13:39 -0700)]
am
80ebbc3c: am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
80ebbc3c5fde6d653c92a0288e1967f519b9c9ef':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:38:19 +0000 (13:38 -0700)]
am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
1a13c317627996234a1dfa2c0736733bd1c4c696':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:35:53 +0000 (13:35 -0700)]
am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
a4375a19c6ff958d33d62ee96f6ccdde223b0c7a':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:33:39 +0000 (13:33 -0700)]
Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
Scott Main [Tue, 23 Oct 2012 03:37:56 +0000 (20:37 -0700)]
am
ab84504b: am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
ab84504b8a9e24b15af916faa95dcf65685a22a3':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:35:42 +0000 (20:35 -0700)]
am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
6613a2327512f3742d55cf0eb79fc4d52cf9a7cb':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:33:41 +0000 (20:33 -0700)]
am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
0e585706f0199f9d277e0d099ece682a2ee502ef':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:30:22 +0000 (20:30 -0700)]
fix spacing in carousel text for Develop homepage
Change-Id: If8f95e66b4c1b4918b0d1dea59241d5a17acbfd9
Dirk Dougherty [Sun, 14 Oct 2012 00:32:23 +0000 (17:32 -0700)]
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Change-Id: I5a14bae715187c3d9307b39394f1b53d4fed39dd
Guang Zhu [Sat, 13 Oct 2012 00:04:57 +0000 (17:04 -0700)]
Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
Ying Wang [Fri, 12 Oct 2012 01:01:17 +0000 (18:01 -0700)]
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
Ying Wang [Fri, 12 Oct 2012 00:26:07 +0000 (17:26 -0700)]
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
Stephen Hines [Fri, 12 Oct 2012 00:25:20 +0000 (17:25 -0700)]
Merge "Add support for building Filterscript files." into jb-mr1-dev
Dirk Dougherty [Thu, 11 Oct 2012 23:57:43 +0000 (16:57 -0700)]
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.
Dirk Dougherty [Thu, 11 Oct 2012 22:33:05 +0000 (15:33 -0700)]
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.
Dirk Dougherty [Thu, 11 Oct 2012 22:31:29 +0000 (15:31 -0700)]
am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
8f20607ccb9c41469eec8f1f481d8d841bbeb2a1':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Mon, 8 Oct 2012 20:14:17 +0000 (13:14 -0700)]
Doc change: add new items to qv and adjust height.
Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
Stephen Hines [Thu, 11 Oct 2012 22:01:53 +0000 (15:01 -0700)]
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
Ying Wang [Thu, 11 Oct 2012 22:05:07 +0000 (15:05 -0700)]
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
Ying Wang [Thu, 11 Oct 2012 18:53:04 +0000 (11:53 -0700)]
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
Christopher Tate [Wed, 10 Oct 2012 22:35:00 +0000 (15:35 -0700)]
Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev
Christopher Tate [Wed, 10 Oct 2012 21:13:59 +0000 (14:13 -0700)]
Add the new 'settings' shell tool to the build
The tool isn't useful unless it's actually built into products.
Bug
7299066
Change-Id: I9aaf37bde73a986d871eac6fd4dea15c192110cb
Ying Wang [Wed, 26 Sep 2012 00:52:10 +0000 (17:52 -0700)]
Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.
Bug:
7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
Guang Zhu [Wed, 10 Oct 2012 01:39:40 +0000 (18:39 -0700)]
DO NOT MERGE: better late than never: fix build id for JB MR1
Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29
Scott Main [Mon, 8 Oct 2012 23:06:43 +0000 (16:06 -0700)]
am
b282c359: am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
b282c359fcbde7f36b579cde388ca044a0dd6d60':
fix layout bug on API Guide landing pages