Baligh Uddin
|
e3ceca2cf9
|
Merge "Import translations. DO NOT MERGE"
|
2014-06-04 04:40:39 +00:00 |
|
Baligh Uddin
|
6aa93994f3
|
Merge "Import translations. DO NOT MERGE"
|
2014-06-04 04:40:35 +00:00 |
|
Baligh Uddin
|
19c63ee77f
|
Merge "Import translations. DO NOT MERGE"
|
2014-06-04 04:40:28 +00:00 |
|
David Friedman
|
a8ac8d0bb5
|
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"
|
2014-06-04 03:16:27 +00:00 |
|
David Friedman
|
c1d8b0c4e9
|
am 689eb9e9: am dba68be3: am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '689eb9e98e5f03f4502358e52f07158b31b8e5e5':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
|
2014-06-04 03:13:09 +00:00 |
|
David Friedman
|
689eb9e98e
|
am dba68be3: am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit 'dba68be33efe4ee322a9ff3d895ed257162c0908':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
|
2014-06-04 03:09:34 +00:00 |
|
David Friedman
|
dba68be33e
|
am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
* commit '00aae2793d37ed098a80bc0a98e8008b36178714':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"
|
2014-06-04 03:05:26 +00:00 |
|
David Friedman
|
00aae2793d
|
Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs
|
2014-06-04 03:01:52 +00:00 |
|
Geoff Mendal
|
31d8ebdf19
|
Fix merge conflicts in 1b645ee0325615a9797fc8e0dba728c85507da0c
|
2014-06-03 18:13:26 -07:00 |
|
Dirk Dougherty
|
441eccc3cb
|
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.
|
2014-06-04 00:12:05 +00:00 |
|
Craig Mautner
|
87163eecf4
|
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
|
2014-06-04 00:11:50 +00:00 |
|
Dirk Dougherty
|
c5d7478c95
|
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.
|
2014-06-03 23:21:46 +00:00 |
|
Dirk Dougherty
|
e21d8d7b23
|
am 93a27e23: am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '93a27e236b88636e68543d5edd80e5a5c176fb57':
Adjust h3 margins for dynamic content blocks.
|
2014-06-03 23:18:15 +00:00 |
|
Dirk Dougherty
|
93a27e236b
|
am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
* commit '7f0c6478ae5266be92ebfa8b0c6244f1a101ce01':
Adjust h3 margins for dynamic content blocks.
|
2014-06-03 23:13:50 +00:00 |
|
Dirk Dougherty
|
7f0c6478ae
|
Merge "Adjust h3 margins for dynamic content blocks." into klp-docs
|
2014-06-03 23:09:37 +00:00 |
|
Tim Murray
|
e039531817
|
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.
|
2014-06-03 22:58:12 +00:00 |
|
Craig Mautner
|
22af5b8428
|
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
|
2014-06-03 22:44:52 +00:00 |
|
Craig Mautner
|
81dfc082d2
|
Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
|
2014-06-03 22:41:38 +00:00 |
|
Tim Murray
|
56f9e6f8d5
|
Add support for mixed 32/64 APKs using RenderScript.
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
|
2014-06-03 15:11:37 -07:00 |
|
Tim Murray
|
fbd6fe04fb
|
am 1afc29ae: Merge "Add support for mixed 32/64 APKs using RenderScript."
* commit '1afc29ae3895f7362e50f1d7b9f35bb689c96140':
Add support for mixed 32/64 APKs using RenderScript.
|
2014-06-03 21:52:53 +00:00 |
|
Tim Murray
|
1afc29ae38
|
Merge "Add support for mixed 32/64 APKs using RenderScript."
|
2014-06-03 21:36:19 +00:00 |
|
ztenghui
|
422b38f1a0
|
Merge "Add AnimationDrawable test"
|
2014-06-03 21:36:13 +00:00 |
|
ztenghui
|
7ac18b8445
|
Add AnimationDrawable test
Change-Id: Ieabd1f628cdccd4939f733f92c0cbefbf8bc0446
|
2014-06-03 14:26:29 -07:00 |
|
Deepanshu Gupta
|
b6abd08dcc
|
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]
|
2014-06-03 21:25:17 +00:00 |
|
Deepanshu Gupta
|
3fedec19e6
|
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]
|
2014-06-03 21:21:30 +00:00 |
|
Deepanshu Gupta
|
2e78de7f37
|
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]
|
2014-06-03 21:17:09 +00:00 |
|
Deepanshu Gupta
|
92641015c8
|
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]
|
2014-06-03 21:10:10 +00:00 |
|
Deepanshu Gupta
|
5f664a1119
|
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]
|
2014-06-03 21:06:02 +00:00 |
|
Deepanshu Gupta
|
2a57694d0a
|
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]
|
2014-06-03 21:02:55 +00:00 |
|
Deepanshu Gupta
|
af7649bc00
|
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]
|
2014-06-03 21:00:52 +00:00 |
|
Deepanshu Gupta
|
ae7bee94e8
|
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]
|
2014-06-03 21:00:47 +00:00 |
|
Deepanshu Gupta
|
e2edd753e8
|
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]
|
2014-06-03 20:58:41 +00:00 |
|
Deepanshu Gupta
|
6eff9e54eb
|
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]
|
2014-06-03 20:57:43 +00:00 |
|
Deepanshu Gupta
|
d76ac50187
|
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]
|
2014-06-03 20:57:40 +00:00 |
|
Deepanshu Gupta
|
728e72df9d
|
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]
|
2014-06-03 20:54:31 +00:00 |
|
Deepanshu Gupta
|
46a156a6d0
|
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]
|
2014-06-03 20:54:29 +00:00 |
|
Deepanshu Gupta
|
76364c6970
|
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]
|
2014-06-03 20:53:49 +00:00 |
|
Deepanshu Gupta
|
e81cafe113
|
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]
|
2014-06-03 20:50:33 +00:00 |
|
Deepanshu Gupta
|
d0f215756a
|
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]
|
2014-06-03 20:49:37 +00:00 |
|
Deepanshu Gupta
|
2bc3df2e3c
|
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]
|
2014-06-03 20:49:35 +00:00 |
|
Deepanshu Gupta
|
7e49737d80
|
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]
|
2014-06-03 20:49:32 +00:00 |
|
Adam Lesinski
|
8ee244355b
|
resolved conflicts for merge of 522c5ce2 to master
Change-Id: I15c7f78e9c81947e33270251d7b50e592fb61583
|
2014-06-03 13:47:54 -07:00 |
|
Deepanshu Gupta
|
b97ac2b6ac
|
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]
|
2014-06-03 20:47:34 +00:00 |
|
Deepanshu Gupta
|
fb6e2f3b56
|
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]
|
2014-06-03 20:47:30 +00:00 |
|
Deepanshu Gupta
|
896bdbea56
|
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]
|
2014-06-03 20:44:53 +00:00 |
|
Deepanshu Gupta
|
c8414f11d7
|
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]
|
2014-06-03 20:43:53 +00:00 |
|
Deepanshu Gupta
|
9bfbe93a7e
|
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]
|
2014-06-03 20:43:50 +00:00 |
|
Deepanshu Gupta
|
3c1d72c2ef
|
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]
|
2014-06-03 20:41:34 +00:00 |
|
Deepanshu Gupta
|
4dcb4a1f03
|
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]
|
2014-06-03 20:39:10 +00:00 |
|
Deepanshu Gupta
|
01041ec00e
|
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]
|
2014-06-03 20:39:09 +00:00 |
|