OSDN Git Service
Santos Cordon [Tue, 1 Jul 2014 22:57:36 +0000 (15:57 -0700)]
Add phone directory to frameworks/base.
Necessary to support the change: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5
Change-Id: I1a00d2cdcb26fa796c5d0840cfe16b0e416ad299
Ying Wang [Tue, 1 Jul 2014 01:01:46 +0000 (18:01 -0700)]
Fix typo.
Bug:
15978907
Bug:
15018047
Change-Id: I6250bb6d67af8c612283541efe0e2120077ad2fb
Ying Wang [Tue, 1 Jul 2014 00:35:21 +0000 (00:35 +0000)]
am
0d0b7b36: am
2530c787: am
4b539d15: Merge "More consistent host library path in multilib build."
* commit '
0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
More consistent host library path in multilib build.
Ying Wang [Tue, 1 Jul 2014 00:28:14 +0000 (00:28 +0000)]
am
2530c787: am
4b539d15: Merge "More consistent host library path in multilib build."
* commit '
2530c787db272bfb4afab80e37323b9b7d00671c':
More consistent host library path in multilib build.
Ying Wang [Tue, 1 Jul 2014 00:22:30 +0000 (00:22 +0000)]
am
4b539d15: Merge "More consistent host library path in multilib build."
* commit '
4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
More consistent host library path in multilib build.
Elliott Hughes [Mon, 30 Jun 2014 23:04:35 +0000 (23:04 +0000)]
am
3a2f6ecf: am
491871aa: am
4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '
3a2f6ecf3f7af6819b601645334d4c563401d37a':
Add -Wl,--fatal-warnings to x86_64.
Elliott Hughes [Mon, 30 Jun 2014 22:59:37 +0000 (22:59 +0000)]
am
491871aa: am
4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '
491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
Add -Wl,--fatal-warnings to x86_64.
Elliott Hughes [Mon, 30 Jun 2014 22:53:49 +0000 (22:53 +0000)]
am
4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '
4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
Add -Wl,--fatal-warnings to x86_64.
Ying Wang [Tue, 1 Jul 2014 00:16:30 +0000 (00:16 +0000)]
Merge "More consistent host library path in multilib build."
Ying Wang [Tue, 1 Jul 2014 00:06:21 +0000 (17:06 -0700)]
More consistent host library path in multilib build.
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.
Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
Ying Wang [Mon, 30 Jun 2014 18:36:07 +0000 (18:36 +0000)]
am
9327f77a: am
ccbf5930: am
51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '
9327f77a01828e0d13dc32be295d6338fe339abc':
Fix missing rs_compatibility_jni_libs.
Ying Wang [Mon, 30 Jun 2014 18:30:46 +0000 (18:30 +0000)]
am
ccbf5930: am
51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '
ccbf59304645dde557e24e7a8dd1440111d1a3ce':
Fix missing rs_compatibility_jni_libs.
Ying Wang [Mon, 30 Jun 2014 18:25:37 +0000 (18:25 +0000)]
am
51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '
51254e6c6065c0c771886472853e6dbc5377c6ae':
Fix missing rs_compatibility_jni_libs.
Ying Wang [Mon, 30 Jun 2014 18:17:16 +0000 (11:17 -0700)]
Fix missing rs_compatibility_jni_libs.
Bug:
15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
Ying Wang [Mon, 30 Jun 2014 17:39:28 +0000 (17:39 +0000)]
am
556efe00: am
9e05c9e4: am
dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-a
* commit '
556efe002f852dfa5ca5331e92b1d65a32339f26':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
Ying Wang [Mon, 30 Jun 2014 17:36:39 +0000 (17:36 +0000)]
am
9e05c9e4: am
dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.r
* commit '
9e05c9e4e642673dc6d9104c44d26810773c382d':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
Ying Wang [Mon, 30 Jun 2014 17:32:05 +0000 (17:32 +0000)]
am
dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/usr/lib/google-golang/bin:/usr/local/buildtools/java/jdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/buildbot/automergers:/buildbot/automergers."
* commit '
dc58c2a6c216577110682521fa787fd9640cc89d':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
Brian Carlstrom [Sat, 28 Jun 2014 20:49:26 +0000 (13:49 -0700)]
resolved conflicts for merge of
da92aef7 to master
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
Ian Rogers [Sat, 28 Jun 2014 00:36:10 +0000 (00:36 +0000)]
am
8625b6e7: am
7634e413: Merge "Host support for prefer symlink"
* commit '
8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
Host support for prefer symlink
Ian Rogers [Sat, 28 Jun 2014 00:30:43 +0000 (00:30 +0000)]
am
7634e413: Merge "Host support for prefer symlink"
* commit '
7634e4136fee6c7a02f4a343072400ba575c0051':
Host support for prefer symlink
Ying Wang [Mon, 30 Jun 2014 18:21:22 +0000 (18:21 +0000)]
Merge "Fix missing rs_compatibility_jni_libs."
Ying Wang [Mon, 30 Jun 2014 18:17:16 +0000 (11:17 -0700)]
Fix missing rs_compatibility_jni_libs.
Bug:
15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
Ying Wang [Mon, 30 Jun 2014 17:27:07 +0000 (17:27 +0000)]
Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."
Ying Wang [Mon, 30 Jun 2014 17:25:33 +0000 (10:25 -0700)]
Remove nonexistent $ANDROID_QTOOLS from $PATH.
Bug:
15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
Ian Rogers [Sat, 28 Jun 2014 00:26:33 +0000 (00:26 +0000)]
Merge "Host support for prefer symlink"
Ian Rogers [Wed, 25 Jun 2014 07:04:30 +0000 (00:04 -0700)]
Host support for prefer symlink
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.
Change-Id: I6045de20c948b456a150033deb3459895aff83c6
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.
Ying Wang [Sat, 28 Jun 2014 00:10:20 +0000 (00:10 +0000)]
Merge "Support to check System API."
Ed Heyl [Fri, 27 Jun 2014 20:32:39 +0000 (13:32 -0700)]
no color output, thanks Mac; better callback to real make
Change-Id: Iff2a15ed8aad28c264209b26a33d1206ec80b794
JP Abgrall [Fri, 27 Jun 2014 21:12:10 +0000 (21:12 +0000)]
Merge "releasetools: only allow yaffs to have no userdata image size (fix build)"
JP Abgrall [Fri, 27 Jun 2014 04:15:39 +0000 (21:15 -0700)]
releasetools: only allow yaffs to have no userdata image size (fix build)
In the past, there was an exception for ext-base fs types to
deal with the lack of image size.
Back then it was only yaffs and ext*.
So now we explicitely only allow yaffs to have no userdata image size.
Change-Id: Ie354ee6222a58228dbcce2c6934971a0737422af
Signed-off-by: JP Abgrall <jpa@google.com>
Ying Wang [Fri, 27 Jun 2014 00:54:28 +0000 (17:54 -0700)]
Support to check System API.
Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
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
Colin Cross [Fri, 27 Jun 2014 19:17:37 +0000 (19:17 +0000)]
Merge "build: fix vendor symbols in gdb"
Colin Cross [Thu, 26 Jun 2014 20:05:29 +0000 (13:05 -0700)]
HACK: report CPU abi as 2nd arch if present
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.
Bug:
15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
Colin Cross [Fri, 20 Jun 2014 20:33:36 +0000 (13:33 -0700)]
build: fix vendor symbols in gdb
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries
Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
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.
Elliott Hughes [Mon, 30 Jun 2014 22:48:54 +0000 (22:48 +0000)]
Merge "Add -Wl,--fatal-warnings to x86_64."
Elliott Hughes [Mon, 30 Jun 2014 21:52:30 +0000 (14:52 -0700)]
Add -Wl,--fatal-warnings to x86_64.
Bug:
11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
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"