OSDN Git Service
Adrian Roos [Wed, 4 Jun 2014 17:03:01 +0000 (17:03 +0000)]
am
8d0c8451: (-s ours) Merge "Disable now defunct touch analysis facility - DO NOT MERGE" into lmp-preview-dev
* commit '
8d0c84512cb1d1fa7b2be072df0b8d9c1e16d837':
Disable now defunct touch analysis facility - DO NOT MERGE
Jungshik Jang [Wed, 4 Jun 2014 17:02:32 +0000 (17:02 +0000)]
am
20909bb0: (-s ours) Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev
* commit '
20909bb03bf636c6168ad19ccb481c7961fdb8a4':
DO NOT MERGE: Added missing entries in the cec device array
Evan Charlton [Wed, 4 Jun 2014 17:02:10 +0000 (17:02 +0000)]
am
44f3a86a: (-s ours) Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev
* commit '
44f3a86a67fc46065c1d17c1048694e880b87b30':
Revert sendEnvelope changes [DO NOT MERGE]
Wei Wang [Wed, 4 Jun 2014 17:02:02 +0000 (17:02 +0000)]
am
283a2233: Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/
15387925." into lmp-preview-dev
* commit '
283a223371df58274fdc4380f9710511775eecc5':
Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/
15387925.
Robert Greenwalt [Wed, 4 Jun 2014 17:01:56 +0000 (17:01 +0000)]
am
ead9aa35: Merge "Refactor NetworkFactory." into lmp-preview-dev
* commit '
ead9aa35d4f5b94d9d602247826ba97afe2b6791':
Refactor NetworkFactory.
Dongwon Kang [Wed, 4 Jun 2014 17:01:47 +0000 (17:01 +0000)]
am
65d95bfa: Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev
* commit '
65d95bfa011fa50e50403f41e08afa2af5d9746e':
Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application.
Robert Ly [Wed, 4 Jun 2014 17:01:11 +0000 (17:01 +0000)]
am
f4220ca1: am
f4f105f1: am
dd57a6b2: am
bb33ff04: update device dashboard for June
* commit '
f4220ca1fae79cb1cf2b9edeefe6462f3be2546d':
update device dashboard for June
Robert Ly [Wed, 4 Jun 2014 16:57:39 +0000 (16:57 +0000)]
am
f4f105f1: am
dd57a6b2: am
bb33ff04: update device dashboard for June
* commit '
f4f105f1615d61b9e5e63b2bd5184d54987b3bba':
update device dashboard for June
Robert Ly [Wed, 4 Jun 2014 16:54:45 +0000 (16:54 +0000)]
am
dd57a6b2: am
bb33ff04: update device dashboard for June
* commit '
dd57a6b24d819bbfd9d2422f52dfb0fe9d43b3e9':
update device dashboard for June
Robert Ly [Wed, 4 Jun 2014 16:50:26 +0000 (16:50 +0000)]
am
bb33ff04: update device dashboard for June
* commit '
bb33ff04b7d1f7f554331426bd9940edbbfd395d':
update device dashboard for June
vandwalle [Wed, 4 Jun 2014 16:45:13 +0000 (16:45 +0000)]
am
aca37776: handle removal of self added configurations
* commit '
aca3777661f2e29d5cca60a8a11dea2878eae6e5':
handle removal of self added configurations
Robert Greenwalt [Wed, 4 Jun 2014 16:45:02 +0000 (16:45 +0000)]
am
5fc756c3: (-s ours) Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev
* commit '
5fc756c3f4b7203d53834b9750332325ebf4e92d':
Rewrite startUsingNetworkFeature for new API
Robert Ly [Wed, 4 Jun 2014 15:34:40 +0000 (08:34 -0700)]
update device dashboard for June
Change-Id: Ibc02e80f4d4fa721039229f63dee0af878c21765
Florin Malita [Wed, 4 Jun 2014 16:04:44 +0000 (16:04 +0000)]
Merge "Canvas JNI cleanup."
Florin Malita [Tue, 3 Jun 2014 16:27:17 +0000 (12:27 -0400)]
Canvas JNI cleanup.
As pointed out in a previous patch review, some native Canvas methods do not
receive a native canvas handle and instead have to use GraphicsJNI to query
the object mNativeCanvasWrapper field.
To avoid the extra JNI call, this change adds the missing Java wrapper
methods and ensures that all native calls are passed efficient native
handles.
Also, some native methods are consolidated: save, saveAll -> save,
clipRect* -> clipRect.
Change-Id: I2eae4a633f6a463d9fbae2ca632661acc8b5cfc3
Leon Scroggins III [Wed, 4 Jun 2014 14:04:17 +0000 (14:04 +0000)]
Merge "Ignore inPurgeable and inInputShareable."
Yohei Yukawa [Wed, 4 Jun 2014 12:47:07 +0000 (12:47 +0000)]
Merge "Hardening token validation in InputMethodManagerService"
Katie McCormick [Wed, 4 Jun 2014 12:40:48 +0000 (12:40 +0000)]
am
c799a830: am
88d1c560: am
ea5fa98c: am
c659e746: Merge "Doc update: new Volley class" into klp-docs
* commit '
c799a830b2d29db5747cc89558c9effb6baddb22':
Doc update: new Volley class
Katie McCormick [Wed, 4 Jun 2014 12:36:21 +0000 (12:36 +0000)]
am
88d1c560: am
ea5fa98c: am
c659e746: Merge "Doc update: new Volley class" into klp-docs
* commit '
88d1c560ea797e3ec974fd735531c126f8453a64':
Doc update: new Volley class
Katie McCormick [Wed, 4 Jun 2014 12:32:09 +0000 (12:32 +0000)]
am
ea5fa98c: am
c659e746: Merge "Doc update: new Volley class" into klp-docs
* commit '
ea5fa98c7c381a37c113b7d2efdd6a406d902949':
Doc update: new Volley class
Katie McCormick [Wed, 4 Jun 2014 12:26:44 +0000 (12:26 +0000)]
am
c659e746: Merge "Doc update: new Volley class" into klp-docs
* commit '
c659e7465df342920f3906cbc0b024f610bf65bd':
Doc update: new Volley class
Yohei Yukawa [Wed, 4 Jun 2014 11:28:18 +0000 (20:28 +0900)]
Hardening token validation in InputMethodManagerService
This CL adds missing token validations in
InputMethodManagerService#switchToNextInputMethod and
InputMethodManagerService#shouldOfferSwitchingToNextInputMethod.
This CL also fixes a possible race condition when validating
the token in InputMethodManagerService#updateStatusIcon.
BUG:
15420379
Change-Id: I043aa30a19c821f33effd57dfd6590b0e3ed817b
Katie McCormick [Wed, 4 Jun 2014 12:01:38 +0000 (12:01 +0000)]
Merge "Doc update: new Volley class" into klp-docs
Yohei Yukawa [Wed, 4 Jun 2014 11:24:31 +0000 (11:24 +0000)]
Merge "Remove code duplication in InputMethodManagerService"
Yohei Yukawa [Wed, 4 Jun 2014 10:43:36 +0000 (19:43 +0900)]
Remove code duplication in InputMethodManagerService
This is a groundwork for the subsequent fix. It should not change
existing behavior.
BUG:
15420379
Change-Id: I106b3f50731c799e06b26d1eab9c6a406c06d78c
Sander Alewijnse [Wed, 4 Jun 2014 10:11:45 +0000 (10:11 +0000)]
Merge "Remove enableSystemApp() and enableSystemAppWithInten()."
Yohei Yukawa [Wed, 4 Jun 2014 10:01:12 +0000 (10:01 +0000)]
Merge "Remove redundant synchronization blocks from IMMS"
Yohei Yukawa [Wed, 4 Jun 2014 09:37:20 +0000 (18:37 +0900)]
Remove redundant synchronization blocks from IMMS
This is a groundwork for the subsequent fix. It should not change
existing behavior.
BUG:
15420379
Change-Id: I6f81ec77e748a8c7c26ffa1f5faf39684b210ae4
Przemyslaw Szczepaniak [Tue, 3 Jun 2014 15:37:01 +0000 (16:37 +0100)]
Add missing #isSpeaking to TTS API V2
TextToSpeech#isSpeaking queries TTS engine if it's
currently outputting any audio, it was present in the
TTS API V1.
Change-Id: Iee4a91976b9b80653811fb458ac48d75418752cf
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]
OSDN Git Service
