OSDN Git Service
Ying Wang [Fri, 27 Jun 2014 16:24:46 +0000 (16:24 +0000)]
am
7a6a9a55: am
4bdbd6d4: am
e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '
7a6a9a558271ac959a2e441fe27aae3df77d4421':
Add --pseudo-localize aapt parameter for builds.
Ying Wang [Fri, 27 Jun 2014 16:19:26 +0000 (16:19 +0000)]
am
4bdbd6d4: am
e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '
4bdbd6d4346a246df8edaf9323e15d84a1f35951':
Add --pseudo-localize aapt parameter for builds.
Ying Wang [Fri, 27 Jun 2014 16:14:30 +0000 (16:14 +0000)]
am
e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '
e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
Add --pseudo-localize aapt parameter for builds.
Dirk Dougherty [Thu, 26 Jun 2014 21:09:09 +0000 (21:09 +0000)]
am
23673843: Doc change: add query param to force refresh in proxy caches.
* commit '
236738439acab7c9b2afc2725b44c4867597ed7f':
Doc change: add query param to force refresh in proxy caches.
Dirk Dougherty [Thu, 26 Jun 2014 20:07:57 +0000 (13:07 -0700)]
Doc change: add query param to force refresh in proxy caches.
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
Ying Wang [Fri, 27 Jun 2014 16:09:37 +0000 (16:09 +0000)]
Merge "Add --pseudo-localize aapt parameter for builds."
Igor Viarheichyk [Thu, 26 Jun 2014 21:56:21 +0000 (14:56 -0700)]
Add --pseudo-localize aapt parameter for builds.
Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.
Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
Baligh Uddin [Fri, 27 Jun 2014 04:23:26 +0000 (04:23 +0000)]
Merge "Add new locales for Platform (L) release"
Baligh Uddin [Thu, 26 Jun 2014 22:39:18 +0000 (15:39 -0700)]
Add new locales for Platform (L) release
Bug:
13437459
Change-Id: Ic186d288469b503118513a437de3a2ef446e34fc
Ying Wang [Thu, 26 Jun 2014 21:19:17 +0000 (21:19 +0000)]
Merge "Set up oem.img directory structure for TARGET_2ND_ARCH."
Dirk Dougherty [Thu, 26 Jun 2014 21:14:40 +0000 (21:14 +0000)]
am
80b97e1c: am
23673843: Doc change: add query param to force refresh in proxy caches.
* commit '
80b97e1c193687d74a93e9f9b365ba11838817df':
Doc change: add query param to force refresh in proxy caches.
Ying Wang [Thu, 26 Jun 2014 21:12:35 +0000 (14:12 -0700)]
Set up oem.img directory structure for TARGET_2ND_ARCH.
Change-Id: Ia931a10708225c428b658cb4a30e8bba66fa7308
Nick Vaccaro [Wed, 25 Jun 2014 22:18:40 +0000 (15:18 -0700)]
Add logd to core_tiny.mk (for logcat functionality)
Bug:
15143878
Change-Id: Ief73aac31b0d4689d38c734dc23f0d20cdcdea17
Robert Ly [Thu, 26 Jun 2014 10:31:01 +0000 (10:31 +0000)]
am
13c416be: am
28d695a0: css changes for index page card
* commit '
13c416be55329150bbfefe2a51ae05c8c832db84':
css changes for index page card
Robert Ly [Thu, 26 Jun 2014 10:31:00 +0000 (10:31 +0000)]
am
8a782585: am
a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
* commit '
8a78258526e49957d285c48ddba5a8de64774256':
docs: Updating download dir for ADT 23.0.0 links to new location
Robert Ly [Thu, 26 Jun 2014 09:50:21 +0000 (09:50 +0000)]
am
28d695a0: css changes for index page card
* commit '
28d695a0051af88d72cd025cdd3df01ae5fffed1':
css changes for index page card
Robert Ly [Thu, 26 Jun 2014 09:49:40 +0000 (09:49 +0000)]
am
a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
* commit '
a34ef028a00192877209281490a468c29cdacd40':
docs: Updating download dir for ADT 23.0.0 links to new location
Robert Ly [Wed, 25 Jun 2014 08:38:51 +0000 (01:38 -0700)]
css changes for index page card
Change-Id: I4fca8284acf50ad05bf9c06ada0daa636b3e9e6f
Ying Wang [Wed, 25 Jun 2014 23:21:30 +0000 (23:21 +0000)]
am
01b179bf: am
bb964f00: am
432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
* commit '
01b179bf3b5c4c0307e0efb4004a1c44705fe780':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
smain@google.com [Wed, 25 Jun 2014 23:21:00 +0000 (23:21 +0000)]
am
0858c65a: am
5771ee3c: add style for stand-alone back link with left arrow
* commit '
0858c65a4d2e9cda9b9a6017bc1f4bf32125cafc':
add style for stand-alone back link with left arrow
Ying Wang [Wed, 25 Jun 2014 23:03:02 +0000 (23:03 +0000)]
am
bb964f00: am
432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
* commit '
bb964f00403a23d2f1ec3313f7b579a9e7f0f12a':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
Ying Wang [Wed, 25 Jun 2014 22:58:11 +0000 (22:58 +0000)]
am
432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
* commit '
432cd6dd78afe9c23cd0ddf669e4f0f973a17a7c':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
smain@google.com [Wed, 25 Jun 2014 22:23:02 +0000 (22:23 +0000)]
am
5771ee3c: add style for stand-alone back link with left arrow
* commit '
5771ee3c41afc7024ca8c76c7b8deef3798d0bcd':
add style for stand-alone back link with left arrow
smain@google.com [Wed, 25 Jun 2014 22:12:52 +0000 (15:12 -0700)]
add style for stand-alone back link with left arrow
Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386
smain@google.com [Wed, 25 Jun 2014 20:45:52 +0000 (20:45 +0000)]
am
e022e9a7: am
bb9ecf42: undo the butterbar change, because automerger is ruthless
* commit '
e022e9a7139a55ed8d9fcc9dca3ffdf37727b164':
undo the butterbar change, because automerger is ruthless
smain@google.com [Wed, 25 Jun 2014 19:12:42 +0000 (19:12 +0000)]
am
bb9ecf42: undo the butterbar change, because automerger is ruthless
* commit '
bb9ecf420f136681a3bd4d5503207733b4dc283b':
undo the butterbar change, because automerger is ruthless
Ying Wang [Wed, 25 Jun 2014 18:46:34 +0000 (18:46 +0000)]
am
1a3d260f: am
e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '
1a3d260f68755b476aa867477fc75d47ef5317bf':
Support to add JNI of both archs in multilib build.
Ying Wang [Wed, 25 Jun 2014 18:37:53 +0000 (18:37 +0000)]
am
e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '
e69d4350cd4af04349b703ba169ba516a96913ba':
Support to add JNI of both archs in multilib build.
Ying Wang [Wed, 25 Jun 2014 22:53:17 +0000 (22:53 +0000)]
Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
Ying Wang [Wed, 25 Jun 2014 20:23:58 +0000 (13:23 -0700)]
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
Bug:
15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
Ying Wang [Wed, 25 Jun 2014 18:33:51 +0000 (18:33 +0000)]
Merge "Support to add JNI of both archs in multilib build."
Clay Murphy [Wed, 25 Jun 2014 19:27:47 +0000 (19:27 +0000)]
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
Ying Wang [Wed, 25 Jun 2014 18:52:02 +0000 (18:52 +0000)]
am
904446ce: am
1a3d260f: am
e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '
904446ce0b3f430ac88ae0c08b9c613721474cd5':
Support to add JNI of both archs in multilib build.
Ying Wang [Wed, 25 Jun 2014 03:01:52 +0000 (20:01 -0700)]
Support to add JNI of both archs in multilib build.
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.
Bug:
15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
Dmitry Shmidt [Wed, 25 Jun 2014 16:37:49 +0000 (16:37 +0000)]
Merge "build: core: Add nxpsw for AEC function"
smain@google.com [Wed, 25 Jun 2014 01:40:36 +0000 (18:40 -0700)]
undo the butterbar change, because automerger is ruthless
Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
Michael Wright [Wed, 25 Jun 2014 01:42:54 +0000 (01:42 +0000)]
am
e75101af: am
e49d461a: am
b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit '
e75101afdfc528aed486adbc0170964d1b32a91d':
Invoke debuggerd64 when appropriate with stacks.
Michael Wright [Wed, 25 Jun 2014 01:36:16 +0000 (01:36 +0000)]
am
e49d461a: am
b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit '
e49d461a8f713e61ad39ba20b48d2b5fee7beafe':
Invoke debuggerd64 when appropriate with stacks.
Michael Wright [Wed, 25 Jun 2014 01:30:40 +0000 (01:30 +0000)]
am
b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit '
b0c6ea9f290261c12b6cb127b7bcd53f8ecc2d60':
Invoke debuggerd64 when appropriate with stacks.
smain@google.com [Wed, 25 Jun 2014 00:48:21 +0000 (00:48 +0000)]
am
263d6660: (-s ours) am
04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
* commit '
263d6660c803110495c0b70ea04afd33f74d39ca':
DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
smain@google.com [Wed, 25 Jun 2014 00:42:51 +0000 (00:42 +0000)]
am
04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
* commit '
04edc344a1887465692b49e3eb58e03dccedd675':
DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
smain@google.com [Wed, 25 Jun 2014 00:34:16 +0000 (00:34 +0000)]
am
0b65bf6b: (-s ours) am
58b617b9: am
cd59b7df: am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
0b65bf6b1b56efafb383c3902c0d8ba419f2657b':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:27:58 +0000 (00:27 +0000)]
am
58b617b9: am
cd59b7df: am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
58b617b902e5a9aa8c0367c894fefa747ea1b5e6':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:27:54 +0000 (00:27 +0000)]
am
c26839a9: am
cfb92aa9: add a smaller version of the device frame for wear
* commit '
c26839a901a1ea395a62bb82407c1316e281c52a':
add a smaller version of the device frame for wear
smain@google.com [Wed, 25 Jun 2014 00:24:34 +0000 (00:24 +0000)]
am
cd59b7df: am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
cd59b7dfdb392153422f5618e2d6e847dcff790b':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:19:46 +0000 (00:19 +0000)]
am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
5f6019ab6cdcb3000eaf4b695424361a5038ade9':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:10:19 +0000 (17:10 -0700)]
DO NOT MERGE
add butterbar notice for the google IO SDK announcements
Change-Id: I25bbb0ee4cab95b0c26cd2bd517e490e44ae1465
smain@google.com [Tue, 24 Jun 2014 21:14:30 +0000 (21:14 +0000)]
am
cfb92aa9: add a smaller version of the device frame for wear
* commit '
cfb92aa963f2fee3251c393bc6dcff9b194af3e1':
add a smaller version of the device frame for wear
bryant_liu [Thu, 22 May 2014 02:35:42 +0000 (10:35 +0800)]
build: core: Add nxpsw for AEC function
Change-Id: I27d9bf891e5c67aef843489c2136a586ad921cb2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Tue, 24 Jun 2014 19:42:46 +0000 (19:42 +0000)]
am
daaec135: am
5899ad25: am
b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '
daaec135b4d141335fc1f4e3edf9eb526c9f6954':
Resolve :32 to 32-bit variant only if the variant exists.
Ying Wang [Tue, 24 Jun 2014 19:35:31 +0000 (19:35 +0000)]
am
5899ad25: am
b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '
5899ad254d3b94653b88e5f0f41f54690f22bd24':
Resolve :32 to 32-bit variant only if the variant exists.
smain@google.com [Tue, 24 Jun 2014 17:29:50 +0000 (10:29 -0700)]
add a smaller version of the device frame for wear
Change-Id: I91ead3f689844c5cf4b6862f38c686263f7d5cbf
Clay Murphy [Tue, 24 Jun 2014 18:32:56 +0000 (11:32 -0700)]
Docs: Replacing s.a.c. Android logo to match other sites.
Bug:
15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
Ying Wang [Tue, 24 Jun 2014 18:17:52 +0000 (18:17 +0000)]
am
b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '
b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
Resolve :32 to 32-bit variant only if the variant exists.
smain@google.com [Tue, 24 Jun 2014 14:00:39 +0000 (14:00 +0000)]
am
47f94218: am
abf34118: more tweaks fixes to the next/prev logic. Fix the way \'articles\' include the links. was broken for design docs, all appeared disabled. also add \'white\' style for links that appear on colored background
* commit '
47f942184e61f830c8045db16d1ca692677e7f59':
more tweaks fixes to the next/prev logic. Fix the way 'articles' include the links. was broken for design docs, all appeared disabled. also add 'white' style for links that appear on colored background
smain@google.com [Tue, 24 Jun 2014 14:00:38 +0000 (14:00 +0000)]
am
9db3d88c: am
daa9e205: Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the \'
* commit '
9db3d88c34563f8f92fcefb66bd67da3a9661064':
update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set.
smain@google.com [Tue, 24 Jun 2014 13:55:13 +0000 (13:55 +0000)]
am
abf34118: more tweaks fixes to the next/prev logic. Fix the way \'articles\' include the links. was broken for design docs, all appeared disabled. also add \'white\' style for links that appear on colored background
* commit '
abf34118c3bf14bd4acfde657b3ef8b1fb913bea':
more tweaks fixes to the next/prev logic. Fix the way 'articles' include the links. was broken for design docs, all appeared disabled. also add 'white' style for links that appear on colored background
smain@google.com [Tue, 24 Jun 2014 13:55:12 +0000 (13:55 +0000)]
am
daa9e205: Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the \'next\' link in
* commit '
daa9e205bb7e0d1b0866f0ce919af7749388120f':
update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set.
Ying Wang [Tue, 24 Jun 2014 10:38:49 +0000 (10:38 +0000)]
am
995783d4: am
57befc90: am
eb12847b: Merge "Switch another reference from core to core-libart"
* commit '
995783d4fde29634e9c61379db5fedad0a232089':
Switch another reference from core to core-libart
Ying Wang [Tue, 24 Jun 2014 09:28:31 +0000 (09:28 +0000)]
am
57befc90: am
eb12847b: Merge "Switch another reference from core to core-libart"
* commit '
57befc90e924704a7c03bde9596483d0cf1bf36b':
Switch another reference from core to core-libart
Robert Ly [Thu, 26 Jun 2014 05:08:29 +0000 (05:08 +0000)]
Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
Ricardo Cervera [Wed, 25 Jun 2014 21:45:14 +0000 (14:45 -0700)]
docs: Updating download dir for ADT 23.0.0 links to new location
Change-Id: Ief0351a902366d0a6ddc5488cb5b6c900c0350e9
Ying Wang [Tue, 24 Jun 2014 06:53:20 +0000 (06:53 +0000)]
am
eb12847b: Merge "Switch another reference from core to core-libart"
* commit '
eb12847b332831e31a3cf7e2f89bd10fd626d7d5':
Switch another reference from core to core-libart
Ying Wang [Mon, 23 Jun 2014 22:44:38 +0000 (22:44 +0000)]
Merge "Switch another reference from core to core-libart"
Brian Carlstrom [Mon, 23 Jun 2014 22:34:17 +0000 (15:34 -0700)]
Switch another reference from core to core-libart
Bug:
14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
Michael Wright [Wed, 25 Jun 2014 01:25:49 +0000 (01:25 +0000)]
Merge "Invoke debuggerd64 when appropriate with stacks."
Michael Wright [Fri, 20 Jun 2014 02:58:12 +0000 (19:58 -0700)]
Invoke debuggerd64 when appropriate with stacks.
Read out the ELF header to see if the executable is 64-bit or 32-bit,
then call the appropriate debuggerd. In bash. Ugh.
Change-Id: I6550fe92e775659cd0370bcb70f40dd59238ad8f
Ying Wang [Tue, 24 Jun 2014 18:12:47 +0000 (18:12 +0000)]
Merge "Resolve :32 to 32-bit variant only if the variant exists."
Ying Wang [Tue, 24 Jun 2014 17:22:17 +0000 (10:22 -0700)]
Resolve :32 to 32-bit variant only if the variant exists.
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.
Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
smain@google.com [Wed, 25 Jun 2014 00:37:13 +0000 (00:37 +0000)]
Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
smain@google.com [Tue, 24 Jun 2014 20:52:13 +0000 (13:52 -0700)]
DO NOT MERGE
remove leanback and recyclerview from javadoc build for d.android.com
Change-Id: I0faa1db29dcadda9bfa96bcf4096e369f0a7a4e0
Elliott Hughes [Mon, 23 Jun 2014 19:54:11 +0000 (19:54 +0000)]
am
dde1a37e: am
fbc6f257: am
c04b4455: Merge "Updated gdbclient path support."
* commit '
dde1a37eb61a807af666c2adcfcb7c197465da90':
Updated gdbclient path support.
Elliott Hughes [Mon, 23 Jun 2014 19:48:57 +0000 (19:48 +0000)]
am
fbc6f257: am
c04b4455: Merge "Updated gdbclient path support."
* commit '
fbc6f25712362b1f9b7b8970a96833ed0be0f12c':
Updated gdbclient path support.
Narayan Kamath [Mon, 23 Jun 2014 19:46:09 +0000 (19:46 +0000)]
am
6fdf121c: Fix 64 bit emulator booting (again).
* commit '
6fdf121c192944f13255a8908df802051fec6535':
Fix 64 bit emulator booting (again).
Elliott Hughes [Mon, 23 Jun 2014 19:44:23 +0000 (19:44 +0000)]
am
c04b4455: Merge "Updated gdbclient path support."
* commit '
c04b4455689280fad51d48a5587fd93aa8980d01':
Updated gdbclient path support.
smain@google.com [Mon, 23 Jun 2014 18:39:02 +0000 (11:39 -0700)]
more tweaks fixes to the next/prev logic. Fix the way 'articles'
include the links. was broken for design docs, all appeared disabled.
also add 'white' style for links that appear on colored background
Change-Id: I6f59b91c1429014a90cb887a9e46880ebde0f75a
smain@google.com [Mon, 23 Jun 2014 17:43:04 +0000 (17:43 +0000)]
Merge "update the wear device frame style. rename and make frame part of css. also update some logic with next/prev links to make navigation prev possible while in design docs (or others that allow cross-boundary nav) and simply remove the 'next' link in the footer when at the end of a set." into klp-modular-dev
smain@google.com [Mon, 23 Jun 2014 17:22:23 +0000 (10:22 -0700)]
update the wear device frame style. rename and make frame part of css.
also update some logic with next/prev links to make navigation prev
possible while in design docs (or others that allow cross-boundary nav)
and simply remove the 'next' link in the footer when at the end of a set.
Change-Id: I83008e313fb07c9bc028e27c06e0e8478fa525f0
Ying Wang [Mon, 23 Jun 2014 17:01:38 +0000 (17:01 +0000)]
am
e9ef4005: am
cd66e5ca: am
6a8b3b43: Merge " delete duplicate variable definition"
* commit '
e9ef4005ea41b757bf1381236acaae124110d9fb':
delete duplicate variable definition
Ying Wang [Mon, 23 Jun 2014 16:57:53 +0000 (16:57 +0000)]
am
cd66e5ca: am
6a8b3b43: Merge " delete duplicate variable definition"
* commit '
cd66e5ca0a8ab3235b5a49c904a692ff9142999e':
delete duplicate variable definition
Ying Wang [Mon, 23 Jun 2014 16:54:01 +0000 (16:54 +0000)]
am
6a8b3b43: Merge " delete duplicate variable definition"
* commit '
6a8b3b43bbc99f23439ae32c0ec1180d5586b773':
delete duplicate variable definition
Narayan Kamath [Mon, 23 Jun 2014 16:52:53 +0000 (17:52 +0100)]
Fix 64 bit emulator booting (again).
Not only should they inherit from core_64_bit.mk, we should
inherit from that first to make sure sdk.mk doesn't override
those values with other cruft.
Change-Id: Ibcd3c47b5be92544c1e86b6e85608b875c468461
Robert Ly [Mon, 23 Jun 2014 09:56:06 +0000 (09:56 +0000)]
am
69a08861: fix preview link
* commit '
69a0886170560d76fe402cf21a99119689aa3a0a':
fix preview link
Robert Ly [Mon, 23 Jun 2014 06:17:33 +0000 (23:17 -0700)]
fix preview link
Change-Id: Ia4f409471e0c62b365fab7dba598e8bee690f0c3
smain@google.com [Sat, 21 Jun 2014 20:15:55 +0000 (20:15 +0000)]
am
ebed3b85: Merge "new android logo for preview docs header" into klp-modular-dev
* commit '
ebed3b8595b141de1ad8f282c52284dca1e72e19':
new android logo for preview docs header
Griff Hazen [Sat, 21 Jun 2014 20:14:40 +0000 (20:14 +0000)]
am
90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
* commit '
90e99716c8e8ebf9b3cfd56387a02f843af67351':
Move sdk staging dir to a product-specific dir. DO NOT MERGE.
Ed Heyl [Mon, 23 Jun 2014 15:18:11 +0000 (15:18 +0000)]
Merge "wrap make and print success/failure message, more later"
Ed Heyl [Wed, 18 Jun 2014 21:55:58 +0000 (14:55 -0700)]
wrap make and print success/failure message, more later
Change-Id: I48a4687d81bc4b950a1be42b34d2f0d76733574a
Robert Ly [Mon, 23 Jun 2014 10:42:00 +0000 (10:42 +0000)]
am
60a69946: am
69a08861: fix preview link
* commit '
60a69946da1904ee75d3ed615f8dbb81ef229d6d':
fix preview link
smain@google.com [Sat, 21 Jun 2014 20:19:17 +0000 (20:19 +0000)]
am
694b1a9a: am
ebed3b85: Merge "new android logo for preview docs header" into klp-modular-dev
* commit '
694b1a9a1b22ee50c81b0e5be92fe0c7500c6a86':
new android logo for preview docs header
Griff Hazen [Sat, 21 Jun 2014 20:19:17 +0000 (20:19 +0000)]
am
e47f4c65: (-s ours) am
90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
* commit '
e47f4c65dc70322f65584c4b4f747373a578a3e3':
Move sdk staging dir to a product-specific dir. DO NOT MERGE.
Tsu Chiang Chuang [Fri, 20 Jun 2014 23:27:21 +0000 (23:27 +0000)]
am
39175e17: (-s ours) Merge "Make default 64-bit primary, 32-bit secondary" into lmp-preview-dev
* commit '
39175e172c06181f727ace24a324e82e59aa312b':
Make default 64-bit primary, 32-bit secondary
Narayan Kamath [Fri, 20 Jun 2014 23:21:39 +0000 (23:21 +0000)]
am
0b638c08: Fix issue in symlinking 64 bit executables.
* commit '
0b638c087d21e2414290c4e02abb682bc53d48f3':
Fix issue in symlinking 64 bit executables.
Narayan Kamath [Fri, 20 Jun 2014 23:21:38 +0000 (23:21 +0000)]
am
31033fe0: SDK targets should inherit from core_64_bit.mk
* commit '
31033fe08d10990c0f820a603f221cf51b7c739e':
SDK targets should inherit from core_64_bit.mk
Brian Carlstrom [Fri, 20 Jun 2014 23:14:35 +0000 (23:14 +0000)]
am
515907a9: am
696f9d3e: am
e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit '
515907a98c3ddff2be42479364fd685103d06fe2':
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Bill Yi [Fri, 20 Jun 2014 23:14:34 +0000 (23:14 +0000)]
am
5ad302b0: (-s ours) am
9c623577: (-s ours) am
85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '
5ad302b0905f06454021fd636de4f2864eea6e82':
Restore AOSP-style version numbers - DO NOT MERGE
Brian Carlstrom [Fri, 20 Jun 2014 22:40:34 +0000 (22:40 +0000)]
am
696f9d3e: am
e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit '
696f9d3e9cedc221cf907a5cc49f4e6533033372':
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Bill Yi [Fri, 20 Jun 2014 22:40:15 +0000 (22:40 +0000)]
am
9c623577: (-s ours) am
85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '
9c6235777e89b54fd933c187ffa1d9184086a787':
Restore AOSP-style version numbers - DO NOT MERGE
smain@google.com [Fri, 20 Jun 2014 22:30:39 +0000 (22:30 +0000)]
am
1ac633c4: Merge "fix vertical spacing following collection" into klp-modular-dev
* commit '
1ac633c4c835b814545532ea71e230a5fd93cc1d':
fix vertical spacing following collection
smain@google.com [Fri, 20 Jun 2014 22:30:21 +0000 (22:30 +0000)]
am
eb01827b: reverse the blue button hover state color
* commit '
eb01827bef34ebbe8d867ec32a42b31e3c3f8abc':
reverse the blue button hover state color