OSDN Git Service
Zach Jang [Thu, 17 Sep 2015 20:16:43 +0000 (20:16 +0000)]
am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
4c710cbe7f5786c3df396ea4283da920fd5c351b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/
23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
Ying Wang [Fri, 20 Feb 2015 19:24:41 +0000 (19:24 +0000)]
am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
1c2ca59317b193d0aaaebdd8c8b7c5aefcbecc3d':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:19:18 +0000 (19:19 +0000)]
am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
289c9563e396f9b9d49487dc8807318fc7542549':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:09:45 +0000 (19:09 +0000)]
am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
6be36e0c5eb9ff65727b8f90591ba594deb040b4':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:00:00 +0000 (19:00 +0000)]
am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
7447c516722041d8df4cf18571f148aac6a57eb9':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:53:06 +0000 (18:53 +0000)]
am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
89a0e52e4097b2a080292ae65d39db05aceed500':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:45:36 +0000 (18:45 +0000)]
am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
01b35afe186050fd6140ad758a18ce13c9008c22':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:38:29 +0000 (18:38 +0000)]
am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
a9c86ef0959b50043503ab39608ab25c7cdc94b2':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:32:20 +0000 (18:32 +0000)]
am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f7bb2237c72d668068c6af0234311aeb096a2af2':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:28:48 +0000 (18:28 +0000)]
am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f2ac06828e41578bd13434fee7fcfee0f76419f9':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:23:29 +0000 (18:23 +0000)]
am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
7eba7cc49b527d6d6605810c1de497c4477db03f':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:18:07 +0000 (18:18 +0000)]
am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
fe3eeb8cf0fd03d020a0b49c4def441056eae157':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:13:23 +0000 (18:13 +0000)]
am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
c5ec654c6edb01c129c5371321fba1cc6e28940d':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:05:42 +0000 (18:05 +0000)]
am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
c646bbfbd6e5d9ea1826199ca43aae1f922074dc':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 22 Feb 2013 17:59:17 +0000 (09:59 -0800)]
We shouldn't use temporary variable in the build recipe.
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
(cherry picked from commit
b8a256a1facdae5b803335daf3c02af159749ab4)
smain@google.com [Wed, 15 Oct 2014 02:15:31 +0000 (02:15 +0000)]
am
05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
* commit '
05e55e9009435072ac25d2ce487d47b6c4f8a60b':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
smain@google.com [Wed, 15 Oct 2014 02:08:50 +0000 (02:08 +0000)]
Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
smain@google.com [Wed, 15 Oct 2014 01:47:36 +0000 (18:47 -0700)]
add butterbar for L announcement.
make the butterbar an encapsulated method for inclusion multiple places.
Change-Id: I7716bd293372dcf88cd0bd57fb399d01bfa897a0
smain@google.com [Sat, 4 Oct 2014 00:46:20 +0000 (00:46 +0000)]
am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
* commit '
08f336eaffa09581f2c33aee99847ee4edbeb370':
fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
smain@google.com [Sat, 4 Oct 2014 00:40:00 +0000 (17:40 -0700)]
fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c
that causes anchors in most docs other than reference to stop working
Change-Id: I58ed0f7a84c4478d482d63e675693a197088019a
smain@google.com [Fri, 3 Oct 2014 23:57:14 +0000 (23:57 +0000)]
am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906
* commit '
633f322b38c9a16aa0cac78a1f2a3fb6b1cacf86':
update the analytics tracking event calls to use new API for analytics.js bug:
16331906
smain@google.com [Fri, 3 Oct 2014 22:49:45 +0000 (15:49 -0700)]
update the analytics tracking event calls to use new API for analytics.js
bug:
16331906
Change-Id: I015b5aae825525822ca767d293b473f9f332961a
smain@google.com [Fri, 3 Oct 2014 18:54:36 +0000 (18:54 +0000)]
am
9a818f55: more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bu
* commit '
9a818f55f4a4ca4f88c2a29f8e77ea6cb2153de6':
more fixes to scroll offset for the sticky header. This offsets the layout position of all <a name=""> tags so they naturally show up below the sticky nav bar... though this is only for API reference, which uses <a> tags as anchors for all API members. bug:
16924057
smain@google.com [Fri, 3 Oct 2014 16:25:59 +0000 (09:25 -0700)]
more fixes to scroll offset for the sticky header.
This offsets the layout position of all <a name=""> tags so they naturally
show up below the sticky nav bar... though this is only for API reference,
which uses <a> tags as anchors for all API members.
bug:
16924057
Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c
Justin Koh [Wed, 1 Oct 2014 18:24:57 +0000 (11:24 -0700)]
DO NOT MERGE Update version code for MR1 (4.4W.2)
Change-Id: Ib87f27166f773d8e880e7ffcded8e8b739989b7c
Dirk Dougherty [Sat, 27 Sep 2014 05:14:16 +0000 (05:14 +0000)]
am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
83fadade5bbc43914059405c1e49dd112e66d28d':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Fri, 26 Sep 2014 22:00:55 +0000 (15:00 -0700)]
Doc change: increment queryparam to trigger cache flush on proxies.
Change-Id: I0ffbcc48761e697340e0c4a721893b33a085a137
Mark Renouf [Wed, 10 Sep 2014 00:08:46 +0000 (20:08 -0400)]
Allow for opt-in of proguard shrinking of tests with new flag
By adding 'shrinktests' to LOCAL_PROGUARD_ENABLED, the -dontshrink
flag will be omitted from the resulting proguard config allowing
tests to have unnecessary classes removed before dexxing.
Clockwork is running into 64k method limits on some tests which
depend on GmsCore. On 4.4W (klp-modular-dev) we don't have the
option for multi-dex so proguard is the only solution here.
This change leaves the default behavior unchanged. Shrinking is
still disabled for tests by default unless the 'shrinktests'
flag is set in the Makefile.
Change-Id: Ib586ae9e7f617072b41e95742559bf7c8a6a6ce1
Baligh Uddin [Sat, 6 Sep 2014 02:19:36 +0000 (02:19 +0000)]
Merge "Add java_args as a valid option" into klp-modular-dev
Baligh Uddin [Sat, 6 Sep 2014 00:36:20 +0000 (17:36 -0700)]
Add java_args as a valid option
Bug:
17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
(cherry picked from commit
bdc2e3186fc4ab22b9249d8e1b317a024e295c7f)
Baligh Uddin [Fri, 5 Sep 2014 18:18:07 +0000 (11:18 -0700)]
Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
Bug:
17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
(cherry picked from commit
339ee4968a26d3a795ecfcd798c6e2d7b01d81d9)
Ricardo Cervera [Wed, 27 Aug 2014 16:10:44 +0000 (16:10 +0000)]
am
54d2ca33: docs: Changing adt bundle links to HTTPS
* commit '
54d2ca33a3ccf2716cb80f8cfa990adff6935c39':
docs: Changing adt bundle links to HTTPS
Ricardo Cervera [Wed, 27 Aug 2014 15:48:49 +0000 (08:48 -0700)]
docs: Changing adt bundle links to HTTPS
Change-Id: I35c291bfef9a267aab5b8f108a6c6592c4f08750
Ying Wang [Sat, 16 Aug 2014 06:01:13 +0000 (06:01 +0000)]
Ying Wang [Sat, 16 Aug 2014 05:56:06 +0000 (05:56 +0000)]
am
f7115dbe: am
2888b790: am
c48566fb: am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
f7115dbe3cbf2fc25e5d507517e6ca4dd1ce5dc9':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 05:52:42 +0000 (05:52 +0000)]
am
2888b790: am
c48566fb: am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
2888b790852af988331be1d59af01d242012f7e4':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 05:18:20 +0000 (05:18 +0000)]
am
c48566fb: am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
c48566fb6129c979186d919dcd55d7c682cf46a3':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 05:09:26 +0000 (05:09 +0000)]
am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
48b4f2b476b660977d1d2179d12efb933f187efb':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:55:50 +0000 (00:55 +0000)]
am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
ed7bdb8f48e6388f780da824be054fcc3c103523':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:48:31 +0000 (00:48 +0000)]
am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
6d1f2c647b68767880cb006df02fa9191d763e42':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:45:10 +0000 (00:45 +0000)]
am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
6afa19abfcce434f15ba2aa87e7dcbc53b66b402':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:39:04 +0000 (00:39 +0000)]
am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
40e0cfd31ccb46465ee510e7b7dac66c0b8be827':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:35:42 +0000 (00:35 +0000)]
am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
a5bb9a73cfb2cbc4a592ae45645c8440e169c746':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:29:58 +0000 (00:29 +0000)]
am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
66c28d86a47ed284492ffbe6a59d30bf201198cd':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:23:56 +0000 (00:23 +0000)]
am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
042e3b75b4847f675848203f91396a1740579d69':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:20:19 +0000 (00:20 +0000)]
am
a65eb8c7: Split to multiple bash commands.
* commit '
a65eb8c7899751f91fd34824f755fa4708cde30b':
Split to multiple bash commands.
Ying Wang [Fri, 26 Oct 2012 16:21:28 +0000 (09:21 -0700)]
Split to multiple bash commands.
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Link: http://code.google.com/p/android/issues/detail?id=38937
(cherry picked from commit
d9a88d585f162c5b99c5c6f995c0400fc616bd26)
Change-Id: I80cd07cf50cc2b04e4b6aa9d5ecb1faf80d4cb5c
Ying Wang [Fri, 15 Aug 2014 23:41:49 +0000 (23:41 +0000)]
am
39ddf5fc: am
e3999d7d: am
9aafe186: am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
39ddf5fc79f01c774407468631da2249bad4e904':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:36:32 +0000 (23:36 +0000)]
am
e3999d7d: am
9aafe186: am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
e3999d7d1ee7c891e3ee7f6108545aa183e22b1c':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:30:29 +0000 (23:30 +0000)]
am
9aafe186: am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
9aafe1861b269b32fdc6a42207a2197ddc38665d':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:22:46 +0000 (23:22 +0000)]
am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
9ec5c4d6f0fc9ef4b3285463175e5c8ff65b2bb3':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:16:35 +0000 (23:16 +0000)]
am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
9b7a2912e77d9397cf8b2b5218d34c20995586f5':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:10:07 +0000 (23:10 +0000)]
am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
d86851e11937bfebbfe42d1bb8b5e7526233781f':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:03:22 +0000 (23:03 +0000)]
am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
f412865c322e045606c2b354a4e20b8aaf5c5efa':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 22:59:26 +0000 (22:59 +0000)]
am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
ff71c49950682d31c5df9f9b979cc942d32dab9c':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 22:53:33 +0000 (22:53 +0000)]
am
2ff73494: Split to multiple bash commands.
* commit '
2ff73494bcc20d5812fd65a996c4a67016dbd8e8':
Split to multiple bash commands.
Ying Wang [Fri, 26 Oct 2012 16:21:28 +0000 (09:21 -0700)]
Split to multiple bash commands.
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Link: http://code.google.com/p/android/issues/detail?id=38937
(cherry picked from commit
d9a88d585f162c5b99c5c6f995c0400fc616bd26)
Change-Id: I80cd07cf50cc2b04e4b6aa9d5ecb1faf80d4cb5c
Justin Koh [Tue, 12 Aug 2014 20:55:57 +0000 (13:55 -0700)]
DO NOT MERGE Bump version string.
Bump version string for KKWT MR0
Bug:
16982332
Change-Id: I8636169362ec45891257c39fb47574a6e021a3f0
Ed Heyl [Fri, 18 Jul 2014 17:53:54 +0000 (10:53 -0700)]
back port
cc6be0a3: wrap make. do not merge
Bug:
16368823 | Lunch sets $out with extra text
Change-Id: I2a1d422865a073cd30e86f1e20b4d99a3747cc0b
David Friedman [Tue, 15 Jul 2014 18:38:40 +0000 (11:38 -0700)]
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
Change-Id: I33af76d23035067ed740d2bf734708aca8dcffe2
Deepanshu Gupta [Tue, 8 Jul 2014 23:58:18 +0000 (23:58 +0000)]
am
72146221: am
0b3aa00e: am
da111964: (-s ours) am
d23dcdf1: am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
721462210a5713e9bc59ed292a8bbea9c433a1c1':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:54:07 +0000 (23:54 +0000)]
am
0b3aa00e: am
da111964: (-s ours) am
d23dcdf1: am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
0b3aa00eaf7a836770681f69c096e915cd686dd9':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:48:54 +0000 (23:48 +0000)]
am
da111964: (-s ours) am
d23dcdf1: am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
da1119642d5a3eb4fd34459ef88d6e1cfbecd1da':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:44:34 +0000 (23:44 +0000)]
am
d23dcdf1: am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
d23dcdf135541f2c4d7e61b1f02a04fe6b0bac48':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:40:06 +0000 (23:40 +0000)]
am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
a0130a4d6fea1b0b256c5a5ad11886f9291a4c0a':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:35:01 +0000 (23:35 +0000)]
am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
9915a60c5d1a003f45455930e2a55033d6e15f3f':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:34:10 +0000 (23:34 +0000)]
am
307a8ec9: am
8eaddc6c: am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
307a8ec96132dc3d6859a5e1cf338b0dc9c25273':
Integrate build_font.py [DO NOT MERGE]
smain@google.com [Tue, 8 Jul 2014 23:34:10 +0000 (23:34 +0000)]
am
60d43dde: (-s ours) am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
60d43ddecf8f582348685f4bfc5cd980dca9a1ba':
DO NOT MERGE revise butter bar message for clarity
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:45 +0000 (23:28 +0000)]
am
8eaddc6c: am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
8eaddc6cac7f10e434dcdd4efc119e363353e8a8':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:26:18 +0000 (23:26 +0000)]
am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
1bb64302ad23e9edea50b09c673f59f681e4f47a':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:17 +0000 (23:24 +0000)]
am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
071a2f8363e32fd99da8c03e03dc8f7a9a5378c2':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:21:36 +0000 (23:21 +0000)]
am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
1699a434a669a70e8696c5e110cacaf0725a68c0':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:19:48 +0000 (23:19 +0000)]
am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
ea2f4e3cbbf21531d00ba966ca5863bb575c0cf4':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:17:25 +0000 (23:17 +0000)]
am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
075f7751faaa37394c8f24d0ed840edd0640a9e3':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:15:47 +0000 (23:15 +0000)]
am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
daee78227c9156704cce134f62f3e88416728652':
Integrate build_font.py [DO NOT MERGE]
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
Robert Ly [Wed, 25 Jun 2014 08:38:51 +0000 (01:38 -0700)]
css changes for index page card
Change-Id: I4fca8284acf50ad05bf9c06ada0daa636b3e9e6f
smain@google.com [Wed, 25 Jun 2014 17:52:35 +0000 (17:52 +0000)]
am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
97539b1c8e70e772b256f574fb95481df901851e':
DO NOT MERGE revise butter bar message for clarity
smain@google.com [Wed, 25 Jun 2014 02:45:51 +0000 (19:45 -0700)]
DO NOT MERGE
revise butter bar message for clarity
Change-Id: I3672f5537425580758bc40c2c41d8a11ee2d22ee
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
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
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
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
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
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
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 [Tue, 24 Jun 2014 17:29:50 +0000 (10:29 -0700)]
add a smaller version of the device frame for wear
Change-Id: I91ead3f689844c5cf4b6862f38c686263f7d5cbf
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
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 00:04:38 +0000 (00:04 +0000)]
Merge "new android logo for preview docs header" into klp-modular-dev
smain@google.com [Fri, 20 Jun 2014 23:54:50 +0000 (16:54 -0700)]
new android logo for preview docs header
Change-Id: I80a35bcbdb55c50a445e061212e32ed2361f983c
smain@google.com [Fri, 20 Jun 2014 17:22:38 +0000 (10:22 -0700)]
fix vertical spacing following collection
Change-Id: I50ec016d646a8fd92cf1f85a844cb6f3bf96cf79
smain@google.com [Fri, 20 Jun 2014 05:24:44 +0000 (22:24 -0700)]
make primary landing button dark red
Change-Id: I2d515991ccdca79a28ee1ebe7706e8fbc3afc57e
Griff Hazen [Fri, 20 Jun 2014 19:02:18 +0000 (19:02 +0000)]
Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
OSDN Git Service
