OSDN Git Service
Michael Wright [Wed, 4 Jun 2014 19:38:18 +0000 (12:38 -0700)]
Making KEYCODE_PAIRING a wakeup key.
Bug:
15430207
Change-Id: I4bb862e22d32af1a89741d39a694b790aa52dfcd
Yuncheol Heo [Wed, 4 Jun 2014 05:12:54 +0000 (05:12 +0000)]
Merge "Add API definition for WebSettings.setVideoOverlayForEmbeddedEncryptedVideoEnabled."
Baligh Uddin [Wed, 4 Jun 2014 04:41:03 +0000 (04:41 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 4 Jun 2014 04:40:58 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 4 Jun 2014 04:40:56 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 4 Jun 2014 04:40:39 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 4 Jun 2014 04:40:35 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 4 Jun 2014 04:40:28 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE"
David Friedman [Wed, 4 Jun 2014 03:16:27 +0000 (03:16 +0000)]
am
c1d8b0c4: am
689eb9e9: am
dba68be3: am
00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '
c1d8b0c4e904b7aaeb0897fd008f5525cb731dd0':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
David Friedman [Wed, 4 Jun 2014 03:13:09 +0000 (03:13 +0000)]
am
689eb9e9: am
dba68be3: am
00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '
689eb9e98e5f03f4502358e52f07158b31b8e5e5':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
David Friedman [Wed, 4 Jun 2014 03:09:34 +0000 (03:09 +0000)]
am
dba68be3: am
00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '
dba68be33efe4ee322a9ff3d895ed257162c0908':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
David Friedman [Wed, 4 Jun 2014 03:05:26 +0000 (03:05 +0000)]
am
00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '
00aae2793d37ed098a80bc0a98e8008b36178714':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
David Friedman [Wed, 4 Jun 2014 03:01:52 +0000 (03:01 +0000)]
Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
Geoff Mendal [Wed, 4 Jun 2014 01:13:26 +0000 (18:13 -0700)]
Dirk Dougherty [Wed, 4 Jun 2014 00:12:05 +0000 (00:12 +0000)]
am
c5d7478c: am
e21d8d7b: am
93a27e23: am
7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '
c5d7478c956817382d93fea3654ae6ba386bb32c':
Adjust h3 margins for dynamic content blocks.
Craig Mautner [Wed, 4 Jun 2014 00:11:50 +0000 (00:11 +0000)]
am
22af5b84: (-s ours) am
81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
* commit '
22af5b842869abff5418263e6fb0b4b925077629':
Force all windows to redraw before unblanking screen
Dirk Dougherty [Tue, 3 Jun 2014 23:21:46 +0000 (23:21 +0000)]
am
e21d8d7b: am
93a27e23: am
7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '
e21d8d7b23f3978ad78d71a7e4b2b4311035d679':
Adjust h3 margins for dynamic content blocks.
Dirk Dougherty [Tue, 3 Jun 2014 23:18:15 +0000 (23:18 +0000)]
am
93a27e23: am
7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '
93a27e236b88636e68543d5edd80e5a5c176fb57':
Adjust h3 margins for dynamic content blocks.
Dirk Dougherty [Tue, 3 Jun 2014 23:13:50 +0000 (23:13 +0000)]
am
7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '
7f0c6478ae5266be92ebfa8b0c6244f1a101ce01':
Adjust h3 margins for dynamic content blocks.
Dirk Dougherty [Tue, 3 Jun 2014 23:09:37 +0000 (23:09 +0000)]
Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
Tim Murray [Tue, 3 Jun 2014 22:58:12 +0000 (22:58 +0000)]
am
fbd6fe04: (-s ours) am
1afc29ae: Merge "Add support for mixed 32/64 APKs using RenderScript."
* commit '
fbd6fe04fb26eb94d2fe131dd18a5f37b3d3e52d':
Add support for mixed 32/64 APKs using RenderScript.
Craig Mautner [Tue, 3 Jun 2014 22:44:52 +0000 (22:44 +0000)]
am
81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
* commit '
81dfc082d2add8463469e3eac9db94d6d93005ce':
Force all windows to redraw before unblanking screen
Craig Mautner [Tue, 3 Jun 2014 22:41:38 +0000 (22:41 +0000)]
Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
Tim Murray [Fri, 16 May 2014 18:47:26 +0000 (11:47 -0700)]
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
Tim Murray [Tue, 3 Jun 2014 21:52:53 +0000 (21:52 +0000)]
am
1afc29ae: Merge "Add support for mixed 32/64 APKs using RenderScript."
* commit '
1afc29ae3895f7362e50f1d7b9f35bb689c96140':
Add support for mixed 32/64 APKs using RenderScript.
Tim Murray [Tue, 3 Jun 2014 21:36:19 +0000 (21:36 +0000)]
Merge "Add support for mixed 32/64 APKs using RenderScript."
ztenghui [Tue, 3 Jun 2014 21:36:12 +0000 (21:36 +0000)]
Merge "Add AnimationDrawable test"
ztenghui [Tue, 3 Jun 2014 21:02:10 +0000 (14:02 -0700)]
Add AnimationDrawable test
Change-Id: Ieabd1f628cdccd4939f733f92c0cbefbf8bc0446
Deepanshu Gupta [Tue, 3 Jun 2014 21:25:17 +0000 (21:25 +0000)]
am
3fedec19: (-s ours) am
2e78de7f: am
92641015: am
5f664a11: am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
3fedec19e6efc22755b1e2e4bed67615d2acb9c2':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:21:30 +0000 (21:21 +0000)]
am
2e78de7f: am
92641015: am
5f664a11: am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
2e78de7f37fd2fb8666e31a610aeb0efba5ad626':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:17:09 +0000 (21:17 +0000)]
am
92641015: am
5f664a11: am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
92641015c83ec027f0d06b8047804f5ffc2dc16b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:10:10 +0000 (21:10 +0000)]
am
5f664a11: am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
5f664a1119f9008feeb924ec50c2ac896a8550db':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:06:02 +0000 (21:06 +0000)]
am
2a57694d: (-s ours) am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
2a57694d0ae30eeca7239c7efae4e6bf478b781a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:02:55 +0000 (21:02 +0000)]
am
e2edd753: am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:00:52 +0000 (21:00 +0000)]
am
6eff9e54: (-s ours) am
728e72df: am
2bc3df2e: am
b97ac2b6: am
c8414f11: (-s ours) am
4dcb4a1f: am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
6eff9e54ebcc9d416ba008a0106708240f3abf9b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 21:00:47 +0000 (21:00 +0000)]
am
d76ac501: (-s ours) am
46a156a6: am
7e49737d: am
fb6e2f3b: am
9bfbe93a: (-s ours) am
dd46bfd0: am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
d76ac50187226d08937235b441a142164576533a':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:58:41 +0000 (20:58 +0000)]
am
76364c69: am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
76364c6970f86bdf67622c14c9f1ebac6883998b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:57:43 +0000 (20:57 +0000)]
am
728e72df: am
2bc3df2e: am
b97ac2b6: am
c8414f11: (-s ours) am
4dcb4a1f: am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
728e72df9ded3ad4b007b0c615aec6d03ab0b789':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:57:40 +0000 (20:57 +0000)]
am
46a156a6: am
7e49737d: am
fb6e2f3b: am
9bfbe93a: (-s ours) am
dd46bfd0: am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
46a156a6d0c54506d835d350b97dd855b7821729':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:54:31 +0000 (20:54 +0000)]
am
2bc3df2e: am
b97ac2b6: am
c8414f11: (-s ours) am
4dcb4a1f: am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
2bc3df2e3cd8e27609ca4c9f2aa1c1f3304d199d':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:54:29 +0000 (20:54 +0000)]
am
7e49737d: am
fb6e2f3b: am
9bfbe93a: (-s ours) am
dd46bfd0: am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
7e49737d80fa37731af44dff2f88a6054778f907':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:53:49 +0000 (20:53 +0000)]
am
d0f21575: (-s ours) am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
d0f215756aa3767db8a73ece7fe9f401256dd263':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:50:33 +0000 (20:50 +0000)]
am
896bdbea: (-s ours) am
01041ec0: am
7e0b1d59: am
d056218b: am
661e158b: (-s ours) am
2ac96a09: am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
896bdbea56b5a5b7dfe82c559dd11437bff5adf5':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:49:37 +0000 (20:49 +0000)]
am
3c1d72c2: am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
3c1d72c2ef1819e0de5599761b21f00351ca3feb':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:49:35 +0000 (20:49 +0000)]
am
b97ac2b6: am
c8414f11: (-s ours) am
4dcb4a1f: am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
b97ac2b6acc84b02ebe16a8c875bae5cfd0898f2':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:49:32 +0000 (20:49 +0000)]
am
fb6e2f3b: am
9bfbe93a: (-s ours) am
dd46bfd0: am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
fb6e2f3b56fc067c634c122d605abe3841c309a9':
Remove @NonNull attribute [DO NOT MERGE]
Adam Lesinski [Tue, 3 Jun 2014 20:47:54 +0000 (13:47 -0700)]
resolved conflicts for merge of
522c5ce2 to master
Change-Id: I15c7f78e9c81947e33270251d7b50e592fb61583
Deepanshu Gupta [Tue, 3 Jun 2014 20:47:34 +0000 (20:47 +0000)]
am
c8414f11: (-s ours) am
4dcb4a1f: am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
c8414f11d7738dafc530178fd6dfa365d8b3d884':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:47:30 +0000 (20:47 +0000)]
am
9bfbe93a: (-s ours) am
dd46bfd0: am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
9bfbe93a7e7165a7daef68175aa7dde9dbe0223a':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:44:53 +0000 (20:44 +0000)]
am
01041ec0: am
7e0b1d59: am
d056218b: am
661e158b: (-s ours) am
2ac96a09: am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
01041ec00e671b5d52880ded067f044136470c0c':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:43:53 +0000 (20:43 +0000)]
am
4dcb4a1f: am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
4dcb4a1f03abb2a4d3f1ceb9aed0feb6264ebfb5':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:43:50 +0000 (20:43 +0000)]
am
dd46bfd0: am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:41:34 +0000 (20:41 +0000)]
am
ab869de1: am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
ab869de19efc24265eebda19a97628713e072178':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:39:10 +0000 (20:39 +0000)]
am
236b7164: am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
236b71649ce008578cf77557033df322e93a1e17':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:39:09 +0000 (20:39 +0000)]
am
7e0b1d59: am
d056218b: am
661e158b: (-s ours) am
2ac96a09: am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
7e0b1d59010ad69372575e5d87dc6b6f2c9486da':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:39:08 +0000 (20:39 +0000)]
am
02d88f7b: am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
02d88f7b350e166da3b1f480c912351a5c72d00c':
Remove @NonNull attribute [DO NOT MERGE]
Glenn Kasten [Tue, 3 Jun 2014 20:38:08 +0000 (20:38 +0000)]
Merge "Update android.media.AudioTrack.getTimestamp API documentation"
Deepanshu Gupta [Tue, 3 Jun 2014 20:36:41 +0000 (20:36 +0000)]
am
cd192c0b: am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
cd192c0b1ca56af3ed3dfdb38626304de0412254':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:36:40 +0000 (20:36 +0000)]
am
4f69d5b8: (-s ours) am
8af310c0: am
8f6a9a65: am
8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
4f69d5b8e976751e9dd0ff2c8bf1b385f06435c4':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:35:12 +0000 (20:35 +0000)]
am
0ab0d875: (-s ours) am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Adam Lesinski [Tue, 3 Jun 2014 20:35:11 +0000 (20:35 +0000)]
am
7e547e0d: Merge "Add --pseudo-localize option to generate resources for pseudolocales."
* commit '
7e547e0d72817032737909952f00acc2e777a35a':
Add --pseudo-localize option to generate resources for pseudolocales.
Deepanshu Gupta [Tue, 3 Jun 2014 20:35:09 +0000 (20:35 +0000)]
am
ffbf2447: (-s ours) am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
ffbf24476c153bbd9293261cc14d9648f72b7369':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:35:02 +0000 (20:35 +0000)]
am
d056218b: am
661e158b: (-s ours) am
2ac96a09: am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
d056218b0486676f8e3b68854f94e2d36209ea18':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
destradaa [Tue, 3 Jun 2014 20:34:10 +0000 (20:34 +0000)]
Merge "Re-work the initialization of FLP HAL to make isSupported() static. b/
14839888"
Deepanshu Gupta [Tue, 3 Jun 2014 20:32:57 +0000 (20:32 +0000)]
am
8af310c0: am
8f6a9a65: am
8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
8af310c0c6a0922d2a84600f9abf7877009d12ba':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:32:55 +0000 (20:32 +0000)]
am
704954c9: am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
704954c96a797e45d421b8d910ca2426d19f6b37':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:30:57 +0000 (20:30 +0000)]
am
661e158b: (-s ours) am
2ac96a09: am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
661e158b0a754f1123485673ac050e388e8056a2':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:30:53 +0000 (20:30 +0000)]
am
28f550f0: am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
28f550f010045d5df9e7762a567fb0351499b846':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:30:50 +0000 (20:30 +0000)]
am
083af20d: am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
083af20d9dc0d14eadd2ba03951579f88cd1f671':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:29:01 +0000 (20:29 +0000)]
am
8f6a9a65: am
8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
8f6a9a658a8a06eb4f11cfff5dca7edf3c7462ad':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:28:48 +0000 (20:28 +0000)]
am
5f56ea8d: am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:27:08 +0000 (20:27 +0000)]
am
2ac96a09: am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
2ac96a093b12883c44327edba899e6c79ee71a7b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:25:51 +0000 (20:25 +0000)]
am
03a83266: am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
03a832669ded18a99d4ac37f047a82d2b198302a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:25:48 +0000 (20:25 +0000)]
am
531bdb5b: am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
531bdb5b57a7a903cea16baedb914e34df941651':
Remove @NonNull attribute [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:24:25 +0000 (20:24 +0000)]
am
f48ab8fe: am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
f48ab8feec71419e574a2d2f08a29be87743ef07':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:23:30 +0000 (20:23 +0000)]
am
8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
8974a5e6d8408b4cd93f1befb05cc9b654b71e4a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:21:20 +0000 (20:21 +0000)]
am
a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
a0fc1f46264e316449402525fbeb033138ec5f49':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:21:12 +0000 (20:21 +0000)]
am
08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
08d2007b33838570a96c8df890f0757fa920904c':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:21:10 +0000 (20:21 +0000)]
am
3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '
3b7c09b4336f421c489523c10278ecfbfb0708a7':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Deepanshu Gupta [Tue, 3 Jun 2014 20:21:08 +0000 (20:21 +0000)]
am
fe6f3049: Remove @NonNull attribute [DO NOT MERGE]
* commit '
fe6f30491f8506a4b2ad895a0f3e68de180e4243':
Remove @NonNull attribute [DO NOT MERGE]
Jean-Michel Trivi [Tue, 3 Jun 2014 20:17:38 +0000 (20:17 +0000)]
Merge "AudioFormat class"
Adam Lesinski [Tue, 3 Jun 2014 20:11:13 +0000 (20:11 +0000)]
Merge "Add --pseudo-localize option to generate resources for pseudolocales."
Tim Murray [Fri, 16 May 2014 18:47:26 +0000 (11:47 -0700)]
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
Igor Viarheichyk [Tue, 3 Jun 2014 00:16:24 +0000 (17:16 -0700)]
Add --pseudo-localize option to generate resources for pseudolocales.
Update help output with new option, remove mention of obsolete zz_ZZ
pseudolocale.
Change-Id: Ie2cfc8d11ef6a57e2b9a2333514a7340a3a8c075
Andrew Solovay [Tue, 3 Jun 2014 18:14:06 +0000 (18:14 +0000)]
am
50cf4a6a: am
aaaa7769: am
9dc2412d: am
47ede834: docs: Fixed alphabetization on Play Store icons page.
* commit '
50cf4a6a3045cd3ffe0a6b51351c53c5b611ca33':
docs: Fixed alphabetization on Play Store icons page.
Michael Kolb [Tue, 3 Jun 2014 18:14:00 +0000 (18:14 +0000)]
am
a4f593d7: am
576a0d14: Merge "Fix circular mask" into klp-modular-dev
* commit '
a4f593d7fb205b56412e3091fb21c592abe934cf':
Fix circular mask
destradaa [Thu, 29 May 2014 01:24:08 +0000 (18:24 -0700)]
Re-work the initialization of FLP HAL to make isSupported() static.
b/
14839888
Change-Id: Ib5973586fd8a2d4a1e5fd09cf82dd4f4493398d0
ztenghui [Tue, 3 Jun 2014 18:07:31 +0000 (18:07 +0000)]
Merge "Handle the alpha in the group setting and fix the fill issue."
Andrew Solovay [Tue, 3 Jun 2014 18:06:56 +0000 (18:06 +0000)]
am
aaaa7769: am
9dc2412d: am
47ede834: docs: Fixed alphabetization on Play Store icons page.
* commit '
aaaa7769139fd1ef683a445c76414f6dcfe07d3b':
docs: Fixed alphabetization on Play Store icons page.
Michael Kolb [Tue, 3 Jun 2014 18:06:25 +0000 (18:06 +0000)]
am
576a0d14: Merge "Fix circular mask" into klp-modular-dev
* commit '
576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
Fix circular mask
ztenghui [Fri, 30 May 2014 23:23:47 +0000 (16:23 -0700)]
Handle the alpha in the group setting and fix the fill issue.
The fill used to be dafault as "none".
Now it is default to opaque black, which is consistent with svg now.
So it is better to always set the fill value.
bug:
15288554
Change-Id: I07ac41c5adc77665e66e52f2c0220139586fb09b
Andrew Solovay [Tue, 3 Jun 2014 17:42:05 +0000 (17:42 +0000)]
am
9dc2412d: am
47ede834: docs: Fixed alphabetization on Play Store icons page.
* commit '
9dc2412dfcaa4d5c77ea892c3c1d3d6ea59597dd':
docs: Fixed alphabetization on Play Store icons page.
Yuhao Zheng [Tue, 3 Jun 2014 17:41:23 +0000 (17:41 +0000)]
Merge "Add class CellularNetwork for plmn parsing and retrieve mcc and mnc."
Andrew Solovay [Tue, 3 Jun 2014 17:38:04 +0000 (17:38 +0000)]
am
47ede834: docs: Fixed alphabetization on Play Store icons page.
* commit '
47ede8340b8bd4e5e5c500ddf84b3510dd12c1a0':
docs: Fixed alphabetization on Play Store icons page.
Jae Seo [Tue, 3 Jun 2014 17:17:00 +0000 (17:17 +0000)]
am
594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev
* commit '
594ac1575f8301023d37c329f8c676ba9bda396c':
TvContract: Address the feedback from the API review
Sungsoo Lim [Tue, 3 Jun 2014 17:16:49 +0000 (17:16 +0000)]
am
61e4b1cf: Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev
* commit '
61e4b1cf302ea659329952dfcebffb2f387bff3f':
Add ClientState for handling the crash of clients.
Alan Viverette [Tue, 3 Jun 2014 17:16:43 +0000 (17:16 +0000)]
Chulwoo Lee [Tue, 3 Jun 2014 17:16:33 +0000 (17:16 +0000)]
am
b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev
* commit '
b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
Add a way to get the class name of SetupActivity and SettingsActivity
Alan Viverette [Tue, 3 Jun 2014 17:16:27 +0000 (17:16 +0000)]
am
25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev
* commit '
25931adee5ba954220190f48901bb66c8c9dd462':
Clean up drawable theming APIs
Dianne Hackborn [Tue, 3 Jun 2014 17:16:01 +0000 (17:16 +0000)]
am
da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev
* commit '
da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
Some battery stats history fixes.
OSDN Git Service
