OSDN Git Service
Ben Cheng [Thu, 14 Nov 2013 22:14:22 +0000 (14:14 -0800)]
am
2e6753a0: am
de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit '
2e6753a058a766d7c0607437224470c14574a94e':
Switch AOSP ARM build to use GCC 4.8.
Ben Cheng [Thu, 14 Nov 2013 22:09:57 +0000 (14:09 -0800)]
am
de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit '
de9b1835b3f3a025c2ab57154d0b5840469868f6':
Switch AOSP ARM build to use GCC 4.8.
Ben Cheng [Thu, 14 Nov 2013 22:06:34 +0000 (22:06 +0000)]
Merge "Switch AOSP ARM build to use GCC 4.8."
Ben Cheng [Thu, 14 Nov 2013 22:05:29 +0000 (14:05 -0800)]
Switch AOSP ARM build to use GCC 4.8.
Change-Id: I65051773153ad5bc2c093cd1313acd212eb427b1
Ying Wang [Thu, 14 Nov 2013 05:02:17 +0000 (21:02 -0800)]
am
18b86b97: am
77f27f1d: Merge "Cleanup x86 and x86_64 flags"
* commit '
18b86b97b83e7d254125723363f170bc6f8d391e':
Cleanup x86 and x86_64 flags
Ying Wang [Thu, 14 Nov 2013 04:57:48 +0000 (20:57 -0800)]
am
77f27f1d: Merge "Cleanup x86 and x86_64 flags"
* commit '
77f27f1dbe485d80692102743529e6973ba4a121':
Cleanup x86 and x86_64 flags
Ying Wang [Thu, 14 Nov 2013 04:54:55 +0000 (04:54 +0000)]
Merge "Cleanup x86 and x86_64 flags"
Scott Main [Thu, 14 Nov 2013 02:12:20 +0000 (18:12 -0800)]
am
9526eefb: am
4e5b39d8: style adjustment to design/dev/video buttons
* commit '
9526eefbf30da333c003d7278d2977e70304a180':
style adjustment to design/dev/video buttons
Scott Main [Thu, 14 Nov 2013 02:08:29 +0000 (02:08 +0000)]
am
4e5b39d8: style adjustment to design/dev/video buttons
* commit '
4e5b39d843548acaac73d1d1f729324805eda0a8':
style adjustment to design/dev/video buttons
Scott Main [Thu, 14 Nov 2013 00:49:22 +0000 (16:49 -0800)]
style adjustment to design/dev/video buttons
Change-Id: I97a147336805aeb340efcd12009794b02afab681
Ed Heyl [Wed, 13 Nov 2013 23:31:00 +0000 (15:31 -0800)]
am
2c8415fb: am
eebb7301: merge in release branch changes (no-op).
* commit '
2c8415fb088dcc2adde6c666f979159552609bbc':
"KOT43B"
"KOT43"
KOT42B
"KOT42"
"KOT41B"
"KOT41"
"KOT38D"
Ed Heyl [Wed, 13 Nov 2013 23:26:51 +0000 (15:26 -0800)]
am
eebb7301: merge in release branch changes (no-op).
* commit '
eebb7301b4de7c9767ef8794af34cd728bf78e06':
"KOT43B"
"KOT43"
KOT42B
"KOT42"
"KOT41B"
"KOT41"
"KOT38D"
Ed Heyl [Wed, 13 Nov 2013 23:19:15 +0000 (15:19 -0800)]
merge in release branch changes (no-op).
The Android Automerger [Wed, 13 Nov 2013 04:00:54 +0000 (20:00 -0800)]
"KOT43B"
The Android Automerger [Wed, 13 Nov 2013 04:00:37 +0000 (20:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 13 Nov 2013 01:25:32 +0000 (17:25 -0800)]
"KOT43"
The Android Automerger [Wed, 13 Nov 2013 01:24:10 +0000 (17:24 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Baligh Uddin [Wed, 13 Nov 2013 00:46:48 +0000 (16:46 -0800)]
am
dcc645eb: am
dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
* commit '
dcc645ebb1a87982d2a067b8584ff167ae2c5287':
Revert the revert. (its time to sign MR1)
Baligh Uddin [Wed, 13 Nov 2013 00:42:25 +0000 (16:42 -0800)]
am
dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
* commit '
dd00a9677b21d2dbdef6b085570e1358f172de80':
Revert the revert. (its time to sign MR1)
Baligh Uddin [Wed, 13 Nov 2013 00:38:47 +0000 (00:38 +0000)]
Merge "Revert the revert. (its time to sign MR1)" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 00:22:34 +0000 (00:22 +0000)]
Revert the revert. (its time to sign MR1)
Revert "Waiting till post MR0 - this impacts signing tools for MR0."
This reverts commit
a7b5c4a7dc77a0896d6314828b9ce85f82d103e8.
Bug:
11334314
Change-Id: I89f8996161e4258b80bf2d0bc7817f0e8e32df13
Scott Main [Tue, 12 Nov 2013 20:22:03 +0000 (12:22 -0800)]
am
680821ed: am
13cd8f15: add style for video button in docs
* commit '
680821ed27a2a2dfce7298434307065aa5ed56aa':
add style for video button in docs
Scott Main [Tue, 12 Nov 2013 20:22:02 +0000 (12:22 -0800)]
am
faff9f52: am
641c2c2f: clarify the hidden APIs in reference with better tooltips
* commit '
faff9f52c1882d4a2eadce90bf90b0fbd7082632':
clarify the hidden APIs in reference with better tooltips
Scott Main [Tue, 12 Nov 2013 20:22:02 +0000 (12:22 -0800)]
am
6ca30dab: am
03aca9a7: script to handle new static landing pages for sample topics
* commit '
6ca30dab2ad44318541dea0da28c247c49a3f79e':
script to handle new static landing pages for sample topics
Scott Main [Tue, 12 Nov 2013 20:22:01 +0000 (12:22 -0800)]
am
4a557dc9: am
f1435b73: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '
4a557dc958028c46e7fa5d6b1d4661bfda8c7f23':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
Scott Main [Tue, 12 Nov 2013 20:22:00 +0000 (12:22 -0800)]
am
e84e4c20: am
70557ee5: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '
e84e4c20d2e34f13b4c158494caac28e22f6c18e':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
13cd8f15: add style for video button in docs
* commit '
13cd8f15476ec66145b3685ca5ce181491fe28c0':
add style for video button in docs
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
641c2c2f: clarify the hidden APIs in reference with better tooltips
* commit '
641c2c2fdaf68fa48b044177fef7c890a42c8a11':
clarify the hidden APIs in reference with better tooltips
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
03aca9a7: script to handle new static landing pages for sample topics
* commit '
03aca9a71235d3a79bf47631103ff42862af6adc':
script to handle new static landing pages for sample topics
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
f1435b73: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '
f1435b73bd373cad0bcd06f38f458f8706e07162':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
Scott Main [Tue, 12 Nov 2013 20:18:38 +0000 (20:18 +0000)]
am
70557ee5: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '
70557ee5fc71cc6b61c3a84ea28e97bd40573779':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
Scott Main [Tue, 12 Nov 2013 19:50:59 +0000 (11:50 -0800)]
add style for video button in docs
Change-Id: I2f2dcf80aef9c55ad6a11f13549b8dd8709cbc84
The Android Automerger [Mon, 11 Nov 2013 23:50:17 +0000 (15:50 -0800)]
KOT42B
The Android Automerger [Mon, 11 Nov 2013 18:50:43 +0000 (10:50 -0800)]
"KOT42"
The Android Automerger [Mon, 11 Nov 2013 18:50:07 +0000 (10:50 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Sun, 10 Nov 2013 18:04:50 +0000 (10:04 -0800)]
"KOT41B"
The Android Automerger [Sun, 10 Nov 2013 14:01:59 +0000 (06:01 -0800)]
"KOT41"
The Android Automerger [Sun, 10 Nov 2013 14:00:23 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Elliott Hughes [Fri, 8 Nov 2013 22:54:12 +0000 (14:54 -0800)]
am
f8c5a6ae: am
bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit '
f8c5a6ae006cfa8a6e30b850cbf930a043e5e842':
Switch x86_64 over to uapi headers.
Elliott Hughes [Fri, 8 Nov 2013 22:52:30 +0000 (14:52 -0800)]
am
bd10e2c0: Merge "Switch x86_64 over to uapi headers."
* commit '
bd10e2c019b9f6a6e13f050c0e52924f456e482f':
Switch x86_64 over to uapi headers.
Elliott Hughes [Fri, 8 Nov 2013 22:50:55 +0000 (22:50 +0000)]
Merge "Switch x86_64 over to uapi headers."
Elliott Hughes [Fri, 8 Nov 2013 22:47:10 +0000 (14:47 -0800)]
Switch x86_64 over to uapi headers.
Bug:
11559337
Change-Id: Ia0a8dff9194375172d1c89daae917d2d8952ace7
Ed Heyl [Fri, 8 Nov 2013 21:59:49 +0000 (13:59 -0800)]
am
5b684e99: merge in release branch changes (no-op).
* commit '
5b684e9972b5fc3efa1814ae9b5d68ac49a60f79':
"KOT38C"
"KOT38B"
"KOT38"
"KOT37B"
"KOT37"
"KOT36"
"KOT35B"
"KOT35"
KOT31C
"KOT31B"
"KOT32"
"KOT31"
"KOT30"
"KOT29"
"KOT28"
"KOT24"
"KOT23"
"KOT22"
"KOT21"
"KOT18"
The Android Automerger [Fri, 8 Nov 2013 21:46:12 +0000 (13:46 -0800)]
"KOT38D"
Raphael Moll [Fri, 8 Nov 2013 21:38:54 +0000 (13:38 -0800)]
am
79a9a324: am
3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '
79a9a3243ae701e7bc40b85b4a085ad91821d921':
Windows SDK: define BEGIN_DECLS/END_DECLS.
Raphael Moll [Fri, 8 Nov 2013 21:36:17 +0000 (13:36 -0800)]
am
3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
* commit '
3342bf0fea22efeb3df0a4e3a3c50fb78ecf96ff':
Windows SDK: define BEGIN_DECLS/END_DECLS.
Raphael Moll [Fri, 8 Nov 2013 21:33:57 +0000 (21:33 +0000)]
Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."
Ed Heyl [Fri, 8 Nov 2013 21:23:43 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
Raphael Moll [Fri, 8 Nov 2013 19:40:41 +0000 (11:40 -0800)]
Windows SDK: define BEGIN_DECLS/END_DECLS.
These macros are not provided by MingW by default.
Change-Id: I623fda6c8e25e26573543c9368ebad47abc7f5c3
Jeff Brown [Fri, 8 Nov 2013 01:44:06 +0000 (17:44 -0800)]
am
e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
* commit '
e17927e0859778638781d75e33a3d4c5184583c4':
Add a platform library for remote display providers.
Jeff Brown [Fri, 8 Nov 2013 01:37:11 +0000 (01:37 +0000)]
Merge "Add a platform library for remote display providers." into klp-dev
The Android Automerger [Fri, 8 Nov 2013 01:04:53 +0000 (17:04 -0800)]
"KOT38C"
Michael Runge [Thu, 7 Nov 2013 23:00:42 +0000 (15:00 -0800)]
am
37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '
37335b42385970d957d48056145a3d4c4dbc6087':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
The Android Automerger [Thu, 7 Nov 2013 22:40:43 +0000 (14:40 -0800)]
"KOT38B"
Michael Runge [Thu, 7 Nov 2013 01:59:29 +0000 (17:59 -0800)]
Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.
b/
11437930
Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
Elliott Hughes [Thu, 7 Nov 2013 17:08:00 +0000 (09:08 -0800)]
resolved conflicts for merge of
12f87a5b to klp-dev-plus-aosp
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
Elliott Hughes [Thu, 7 Nov 2013 16:35:17 +0000 (08:35 -0800)]
am
a05365ce: Merge "Remove the hacks needed to support ash and mksh concurrently."
* commit '
a05365ceceaead86651f61f7ba66153e36b7be5d':
Remove the hacks needed to support ash and mksh concurrently.
Elliott Hughes [Thu, 7 Nov 2013 16:07:31 +0000 (16:07 +0000)]
Merge "Remove the hacks needed to support ash and mksh concurrently."
The Android Automerger [Thu, 7 Nov 2013 14:02:30 +0000 (06:02 -0800)]
"KOT38"
The Android Automerger [Thu, 7 Nov 2013 14:00:31 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Nick Kralevich [Thu, 7 Nov 2013 00:10:16 +0000 (16:10 -0800)]
am
7717bcba: am
240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '
7717bcba28ce55bac10f6586feff89da569ff62b':
Move goldfish-specific policy rules to their own directory.
Nick Kralevich [Thu, 7 Nov 2013 00:02:06 +0000 (16:02 -0800)]
am
240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '
240cd127eb0a14515b37b2e691645a1e83ab31f9':
Move goldfish-specific policy rules to their own directory.
Nick Kralevich [Wed, 6 Nov 2013 23:58:08 +0000 (23:58 +0000)]
Merge "Move goldfish-specific policy rules to their own directory."
The Android Automerger [Wed, 6 Nov 2013 23:14:20 +0000 (15:14 -0800)]
"KOT37B"
Stephen Smalley [Tue, 5 Nov 2013 14:37:41 +0000 (09:37 -0500)]
Move goldfish-specific policy rules to their own directory.
Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
The Android Automerger [Wed, 6 Nov 2013 14:02:35 +0000 (06:02 -0800)]
"KOT37"
The Android Automerger [Wed, 6 Nov 2013 14:00:25 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
Jeff Brown [Wed, 6 Nov 2013 06:17:57 +0000 (22:17 -0800)]
Add a platform library for remote display providers.
Bug:
11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
Elliott Hughes [Tue, 5 Nov 2013 19:13:49 +0000 (11:13 -0800)]
Remove the hacks needed to support ash and mksh concurrently.
We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.
Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
Elliott Hughes [Tue, 5 Nov 2013 18:35:26 +0000 (10:35 -0800)]
am
e19ebfee: am
a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit '
e19ebfee3cede975d0dce0b0badf1251c44ec453':
Remove shell_ash; ash is but ashes.
Elliott Hughes [Tue, 5 Nov 2013 18:30:03 +0000 (10:30 -0800)]
am
a7f254fe: Merge "Remove shell_ash; ash is but ashes."
* commit '
a7f254feb77db5a1358be869c39757eab487bbde':
Remove shell_ash; ash is but ashes.
Elliott Hughes [Tue, 5 Nov 2013 18:01:25 +0000 (18:01 +0000)]
Merge "Remove shell_ash; ash is but ashes."
Elliott Hughes [Tue, 5 Nov 2013 17:05:50 +0000 (09:05 -0800)]
Remove shell_ash; ash is but ashes.
Change-Id: I88040e39c51986b14e3a764e7bb9e2c8c05ed86b
The Android Automerger [Tue, 5 Nov 2013 14:05:13 +0000 (06:05 -0800)]
"KOT36"
The Android Automerger [Tue, 5 Nov 2013 14:03:41 +0000 (06:03 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 4 Nov 2013 22:43:58 +0000 (14:43 -0800)]
"KOT35B"
The Android Automerger [Mon, 4 Nov 2013 14:02:25 +0000 (06:02 -0800)]
"KOT35"
The Android Automerger [Mon, 4 Nov 2013 14:00:28 +0000 (06:00 -0800)]
merge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Mon, 4 Nov 2013 01:59:15 +0000 (17:59 -0800)]
KOT31C
The Android Automerger [Fri, 1 Nov 2013 19:58:12 +0000 (12:58 -0700)]
"KOT31B"
The Android Automerger [Fri, 1 Nov 2013 19:57:01 +0000 (12:57 -0700)]
"KOT32"
Scott Main [Thu, 31 Oct 2013 21:48:45 +0000 (14:48 -0700)]
clarify the hidden APIs in reference with better tooltips
Change-Id: Iaa843b4a0462195084fb7a35e826eeec92d50c64
Scott Main [Thu, 31 Oct 2013 14:20:55 +0000 (07:20 -0700)]
script to handle new static landing pages for sample topics
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
(cherry picked from commit
241dbd1565b3693bfc2cc9ee3e9e50bcd2f8a7f0)
Scott Main [Thu, 31 Oct 2013 14:33:07 +0000 (07:33 -0700)]
am
241dbd15: script to handle new static landing pages for sample topics
* commit '
241dbd1565b3693bfc2cc9ee3e9e50bcd2f8a7f0':
script to handle new static landing pages for sample topics
Scott Main [Thu, 31 Oct 2013 14:20:55 +0000 (07:20 -0700)]
script to handle new static landing pages for sample topics
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
The Android Automerger [Thu, 31 Oct 2013 13:02:23 +0000 (06:02 -0700)]
"KOT31"
The Android Automerger [Thu, 31 Oct 2013 13:00:16 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Scott Main [Wed, 30 Oct 2013 23:41:42 +0000 (16:41 -0700)]
am
36ea7a3d: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
* commit '
36ea7a3d74c68d62a5d081401b887e848370f6d8':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
Scott Main [Wed, 30 Oct 2013 23:27:38 +0000 (16:27 -0700)]
remove the dummy sidenav from samples before populating the real list.
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.
Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
(cherry picked from commit
36ea7a3d74c68d62a5d081401b887e848370f6d8)
Scott Main [Wed, 30 Oct 2013 23:27:38 +0000 (16:27 -0700)]
remove the dummy sidenav from samples before populating the real list.
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.
Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
Scott Main [Wed, 30 Oct 2013 22:25:03 +0000 (15:25 -0700)]
am
e9fbac49: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
* commit '
e9fbac49bba45008d8741f3f93b47e866093e238':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
Scott Main [Wed, 30 Oct 2013 21:47:40 +0000 (14:47 -0700)]
make expandable lists under each sample sticky so they don't collapse
when opening other project directories.
change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.
Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
Scott Main [Wed, 30 Oct 2013 21:47:40 +0000 (14:47 -0700)]
make expandable lists under each sample sticky so they don't collapse
when opening other project directories.
change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.
Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
Ben Cheng [Wed, 30 Oct 2013 17:33:24 +0000 (10:33 -0700)]
am
d16a4913: am
48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit '
d16a49134914eec45f395c867f9e8e282009fffe':
AArch64: Enable AArch64 support
Ben Cheng [Wed, 30 Oct 2013 17:30:42 +0000 (10:30 -0700)]
am
48c4bac0: Merge "AArch64: Enable AArch64 support"
* commit '
48c4bac05f86b712f40b3a2f7dd846ed8f5eb0a4':
AArch64: Enable AArch64 support
Ben Cheng [Wed, 30 Oct 2013 17:27:17 +0000 (17:27 +0000)]
Merge "AArch64: Enable AArch64 support"
The Android Automerger [Wed, 30 Oct 2013 13:01:53 +0000 (06:01 -0700)]
"KOT30"
The Android Automerger [Wed, 30 Oct 2013 13:00:21 +0000 (06:00 -0700)]
merge in klp-mr1-release history after reset to klp-dev
Dirk Dougherty [Wed, 30 Oct 2013 01:30:35 +0000 (18:30 -0700)]
am
3c0c1274: Merge "Add n5 landscape-13 device video frame and css." into klp-dev
* commit '
3c0c127468bb29ceabb4651273efc386aca1ac85':
Add n5 landscape-13 device video frame and css.
Dirk Dougherty [Wed, 30 Oct 2013 01:27:10 +0000 (01:27 +0000)]
Merge "Add n5 landscape-13 device video frame and css." into klp-dev