OSDN Git Service
Baligh Uddin [Mon, 9 Dec 2013 18:25:34 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 9 Dec 2013 18:17:36 +0000 (10:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie859264a5323e31dde1529b33e9318949cc1668c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 9 Dec 2013 18:13:39 +0000 (18:13 +0000)]
am
0126e980: (-s ours) am
19158fc3: (-s ours) am
325a1352: (-s ours) am
0bfbb676: (-s ours) Import translations. DO NOT MERGE
* commit '
0126e9803401a657ea27e8ee8499fb52ca3810a9':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 18:10:32 +0000 (18:10 +0000)]
am
19158fc3: (-s ours) am
325a1352: (-s ours) am
0bfbb676: (-s ours) Import translations. DO NOT MERGE
* commit '
19158fc39a40f51c87195f5e3066bd891d359a2e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 18:08:25 +0000 (10:08 -0800)]
am
325a1352: (-s ours) am
0bfbb676: (-s ours) Import translations. DO NOT MERGE
* commit '
325a13527d8c18c93bee266475cade9037f71698':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 18:05:02 +0000 (10:05 -0800)]
am
0bfbb676: (-s ours) Import translations. DO NOT MERGE
* commit '
0bfbb676277c907444b09ba9e653491b32dddf9c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 17:53:12 +0000 (09:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
Auto-generated-cl: translation import
Scott Main [Sat, 7 Dec 2013 02:52:03 +0000 (02:52 +0000)]
am
427e05b4: am
6fc956c7: am
4681d452: am
9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '
427e05b4afdae4e8b67fe420dad1403fd22d06e7':
Revert "add Drive API feature page. fix link text on several pages"
Scott Main [Sat, 7 Dec 2013 02:51:55 +0000 (02:51 +0000)]
am
cf6c169f: am
71638ac4: am
2c93b68a: am
b821a87d: update robots.txt to disallow the community/ pages
* commit '
cf6c169fe0c2f13784af3559f25acad738b7a0ae':
update robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 02:51:49 +0000 (02:51 +0000)]
am
03775d95: am
2bbea2bb: am
38854cab: am
c45eebe1: add Android Community page
* commit '
03775d95a8cb6dd7c9fe471d832e4f7d1400471d':
add Android Community page
Scott Main [Sat, 7 Dec 2013 01:50:13 +0000 (01:50 +0000)]
am
6fc956c7: am
4681d452: am
9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '
6fc956c7ac7602e23f9bf164760db137cebdbbb8':
Revert "add Drive API feature page. fix link text on several pages"
Scott Main [Sat, 7 Dec 2013 01:48:00 +0000 (17:48 -0800)]
am
4681d452: am
9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '
4681d4521cb955fcf66b6aad809aa99836cbb30a':
Revert "add Drive API feature page. fix link text on several pages"
Scott Main [Sat, 7 Dec 2013 01:45:31 +0000 (01:45 +0000)]
am
9cefb571: Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
* commit '
9cefb57116653346729a9fc606e8ff4f899ad380':
Revert "add Drive API feature page. fix link text on several pages"
Scott Main [Sat, 7 Dec 2013 01:42:30 +0000 (01:42 +0000)]
Merge "Revert "add Drive API feature page. fix link text on several pages"" into klp-docs
Scott Main [Sat, 7 Dec 2013 01:42:10 +0000 (01:42 +0000)]
Revert "add Drive API feature page. fix link text on several pages"
This reverts commit
680a1f67cd39b127663d2e8bc4b5f3ca1d868274.
Change-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72
Scott Main [Sat, 7 Dec 2013 00:17:32 +0000 (00:17 +0000)]
am
71638ac4: am
2c93b68a: am
b821a87d: update robots.txt to disallow the community/ pages
* commit '
71638ac4afb54bd0f4849c1179c370ee75462565':
update robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 00:15:15 +0000 (16:15 -0800)]
am
2c93b68a: am
b821a87d: update robots.txt to disallow the community/ pages
* commit '
2c93b68a0309e74e5c011cba1ef98951236f9f29':
update robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 00:12:41 +0000 (00:12 +0000)]
am
b821a87d: update robots.txt to disallow the community/ pages
* commit '
b821a87d1b9310d7f07880c80d0b5ccafd59986a':
update robots.txt to disallow the community/ pages
Scott Main [Sat, 7 Dec 2013 00:11:35 +0000 (00:11 +0000)]
am
2bbea2bb: am
38854cab: am
c45eebe1: add Android Community page
* commit '
2bbea2bbc1b0efe60efcb255404661ca5160ab04':
add Android Community page
Scott Main [Sat, 7 Dec 2013 00:09:24 +0000 (16:09 -0800)]
am
38854cab: am
c45eebe1: add Android Community page
* commit '
38854cabba3524316f8e1a9ffe9f4ac15e14d72f':
add Android Community page
Scott Main [Sat, 7 Dec 2013 00:08:01 +0000 (16:08 -0800)]
update robots.txt to disallow the community/ pages
Change-Id: I318308f7219b296d92039cba2b6f5ace321f697f
Scott Main [Sat, 7 Dec 2013 00:06:29 +0000 (00:06 +0000)]
am
c45eebe1: add Android Community page
* commit '
c45eebe1868deb93c54c29885163a13a497eb86a':
add Android Community page
Scott Main [Thu, 5 Dec 2013 02:34:19 +0000 (18:34 -0800)]
add Android Community page
Change-Id: I8a9c98931b274dbb27d7952e2278eaf7798da343
Scott Main [Fri, 6 Dec 2013 23:47:44 +0000 (23:47 +0000)]
am
41d6be57: am
2d285312: am
37a8d7c5: am
680a1f67: add Drive API feature page. fix link text on several pages
* commit '
41d6be57d3d7cb6fda32398211b826e095e480c4':
add Drive API feature page. fix link text on several pages
Scott Main [Fri, 6 Dec 2013 23:44:59 +0000 (23:44 +0000)]
am
2d285312: am
37a8d7c5: am
680a1f67: add Drive API feature page. fix link text on several pages
* commit '
2d2853120eaf3ccd6867ec7038c38ef794baaecc':
add Drive API feature page. fix link text on several pages
Scott Main [Fri, 6 Dec 2013 23:41:23 +0000 (15:41 -0800)]
am
37a8d7c5: am
680a1f67: add Drive API feature page. fix link text on several pages
* commit '
37a8d7c54cbdb36cd6ff9c6688140b99e256c644':
add Drive API feature page. fix link text on several pages
Scott Main [Fri, 6 Dec 2013 23:38:43 +0000 (23:38 +0000)]
am
680a1f67: add Drive API feature page. fix link text on several pages
* commit '
680a1f67cd39b127663d2e8bc4b5f3ca1d868274':
add Drive API feature page. fix link text on several pages
Scott Main [Fri, 6 Dec 2013 20:57:13 +0000 (12:57 -0800)]
add Drive API feature page.
fix link text on several pages
Change-Id: I717eba278bc2cc09d3ee148a08700e8e353312d2
Robert Greenwalt [Fri, 6 Dec 2013 22:15:49 +0000 (22:15 +0000)]
Merge "Fix descriptor leak after accepting connections"
Dave Platt [Fri, 6 Dec 2013 22:03:47 +0000 (14:03 -0800)]
Fix descriptor leak after accepting connections
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.
Bug:
11805817
Change-Id: I0a1a7c62ec3fbcf647a44a22110ddc778d14e5f4
Alan Viverette [Fri, 6 Dec 2013 21:54:36 +0000 (21:54 +0000)]
Merge "Fix handling of constraints for unspecified height RelativeLayouts"
Nick Kralevich [Fri, 6 Dec 2013 16:26:08 +0000 (16:26 +0000)]
am
bf88b659: am
5fa89d55: am
6b8a3a52: am
f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '
bf88b659b6c02143b464c0551d4875f7911ed269':
Augment SELinuxMMAC functionality.
Nick Kralevich [Fri, 6 Dec 2013 16:22:58 +0000 (16:22 +0000)]
am
5fa89d55: am
6b8a3a52: am
f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '
5fa89d55712110c2932f76357216e7a77b3b317e':
Augment SELinuxMMAC functionality.
Nick Kralevich [Fri, 6 Dec 2013 16:20:18 +0000 (08:20 -0800)]
am
6b8a3a52: am
f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '
6b8a3a52acf1c2722551f1ea1ce47831f87939cd':
Augment SELinuxMMAC functionality.
Nick Kralevich [Fri, 6 Dec 2013 16:17:23 +0000 (08:17 -0800)]
am
f7422885: Merge "Augment SELinuxMMAC functionality."
* commit '
f7422885a99c5d240f70c2f8227ae44abeea3e5c':
Augment SELinuxMMAC functionality.
Nick Kralevich [Fri, 6 Dec 2013 16:13:58 +0000 (16:13 +0000)]
Merge "Augment SELinuxMMAC functionality."
Robert Craig [Mon, 2 Dec 2013 15:24:23 +0000 (10:24 -0500)]
Augment SELinuxMMAC functionality.
* No longer support a package name stanza outside of
a signature tag. Package names, by themselves, have
no security associated with them in Android and thus we
should not be allowing or encouraging this
type of policy.
* Allow for nested package name stanzas inside
signature stanzas. There are cases where a finer
distinction needs to be made among apps signed with
the same cert. New code allows a different seinfo
tag to be assigned to the listed package names
signed by the parent cert. When a determination needs
to be made concerning seinfo assignments, the inner
seinfo tag takes precedence over the outer seinfo
labels which are assigned to just the signature.
* Temp structures are now used to parse new policy files
until the entire xml file is parsed and deemed correct,
at which time the temp structures are copied over to the
permanent class structures. This ensures that any structural
errors with the policy will not result in partial loads.
* Valid stanzas look like the following with the inner
package piece being optional.
<signer signature="">
<seinfo value=""/>
<package name="">
<seinfo value=""/>
</package>
<signer>
<default>
<seinfo value=""/>
</default>
Change-Id: Ia204d71211776dcf9b2dcc86ad6d77c4ad39dc25
The Android Open Source Project [Fri, 6 Dec 2013 02:50:46 +0000 (02:50 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:43:38 +0000 (01:43 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:27:10 +0000 (17:27 -0800)]
Alan Viverette [Thu, 5 Dec 2013 23:35:48 +0000 (23:35 +0000)]
Merge "Fix typo in LayerDrawable"
Alan Viverette [Thu, 5 Dec 2013 23:34:28 +0000 (15:34 -0800)]
Fix typo in LayerDrawable
Change-Id: I6c73cb90d0c161d29e8d41c54850d66840c947d7
Baligh Uddin [Thu, 5 Dec 2013 22:51:20 +0000 (22:51 +0000)]
am
d22f6a62: (-s ours) am
61c9706b: (-s ours) am
43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
d22f6a6296b0fc7dee08bc442a54343c1b478a4c':
Baligh Uddin [Thu, 5 Dec 2013 22:51:15 +0000 (22:51 +0000)]
am
4830bc50: (-s ours) am
dc5f592c: (-s ours) am
78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4830bc50848e3c575e74ef9c996821af45943cf7':
Svetoslav Ganov [Thu, 5 Dec 2013 22:51:10 +0000 (22:51 +0000)]
am
335289aa: (-s ours) am
51843f8a: am
371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev
* commit '
335289aae79b5dc759629a89b97bf059a3d1e466':
Jose Lima [Thu, 5 Dec 2013 22:51:05 +0000 (22:51 +0000)]
am
758485f0: (-s ours) am
0d27bc29: am
56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev
* commit '
758485f003844b9426a6883f43f7354c3f8a4bfd':
David Christie [Thu, 5 Dec 2013 22:50:58 +0000 (22:50 +0000)]
am
e4fdda27: (-s ours) am
8810a0c3: am
69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and
* commit '
e4fdda2793bd1bd44259ae685d76ac4323a4de5e':
Kristian Monsen [Thu, 5 Dec 2013 22:50:53 +0000 (22:50 +0000)]
am
44e0da4e: (-s ours) am
c319ddd9: am
4c737496: Merge "Change the exception msg" into klp-dev
* commit '
44e0da4ebc2107d1bf92465bf9a1245da874ef0c':
Vinit Deshapnde [Thu, 5 Dec 2013 22:50:48 +0000 (22:50 +0000)]
am
ba690f48: (-s ours) am
f76c1685: am
049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev
* commit '
ba690f48b95010f096c4df04b5fec91bf6bf73c7':
keunyoung [Thu, 5 Dec 2013 22:50:43 +0000 (22:50 +0000)]
am
44894df5: (-s ours) am
72d29c2d: am
ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev
* commit '
44894df5d79500ade82cc8f250cc8fe70b28af87':
Michael Wright [Thu, 5 Dec 2013 22:50:37 +0000 (22:50 +0000)]
am
054a7f5c: (-s ours) am
aad62128: am
51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev
* commit '
054a7f5cba275b929c60b17128c13026cbdcd154':
Victoria Lease [Thu, 5 Dec 2013 22:50:31 +0000 (22:50 +0000)]
am
5126f194: (-s ours) am
4b982e49: am
ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev
* commit '
5126f194c08dcb230a74c5be1ceaf094d92f759e':
Romain Guy [Thu, 5 Dec 2013 22:50:26 +0000 (22:50 +0000)]
am
1668ebf4: (-s ours) am
76bf4d6d: am
d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #
10258621" into klp-dev
* commit '
1668ebf484d194156d12e2fb791bea39e7742074':
Alan Viverette [Thu, 5 Dec 2013 22:50:20 +0000 (22:50 +0000)]
am
f5a89a2b: (-s ours) am
1e68ffc7: am
890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev
* commit '
f5a89a2bb3fa4c48787d5c8c5f6fdec5005c0456':
Svetoslav [Thu, 5 Dec 2013 22:50:14 +0000 (22:50 +0000)]
am
ae2b3981: (-s ours) am
beb7b449: am
b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev
* commit '
ae2b398150a2ed66866aef2c3781020e1ca9f059':
Chet Haase [Thu, 5 Dec 2013 22:44:46 +0000 (22:44 +0000)]
am
a004f72c: (-s ours) am
54276ad3: am
cd89feb9: Merge "pause/resume for Animators" into klp-dev
* commit '
a004f72cf00555aa2694b97ff6c17b97397cd471':
Craig Mautner [Thu, 5 Dec 2013 22:44:40 +0000 (22:44 +0000)]
am
7a9ec2cd: (-s ours) am
afa1231e: am
b6da9115: Merge "Remove incorrect warning." into klp-dev
* commit '
7a9ec2cd8d00c906603c5cb88625c97b47378947':
Katie McCormick [Thu, 5 Dec 2013 22:44:35 +0000 (22:44 +0000)]
am
6acc2743: (-s ours) am
dfa36da5: am
076d3787: am
6441b9bd: am
e5007896: am
e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit '
6acc2743ee24268b1919c4eb25bb1437b0379fec':
Selim Gurun [Thu, 5 Dec 2013 22:44:29 +0000 (22:44 +0000)]
am
aff9c487: (-s ours) am
ff1b3f07: am
1232c51e: Merge "Add the API to support webview printing" into klp-dev
* commit '
aff9c48759619c4025927fec4cdf6d5e274db144':
Romain Guy [Thu, 5 Dec 2013 22:44:23 +0000 (22:44 +0000)]
am
9b7bf2ba: (-s ours) am
98e50c50: am
964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev
* commit '
9b7bf2ba1e9f3017a4edc498f455091935d675ab':
Scott Main [Thu, 5 Dec 2013 22:44:18 +0000 (22:44 +0000)]
am
d7889768: (-s ours) am
07b9b3ad: am
b45b39a2: am
cdf3455c: am
6dd38cc5: Revert "Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."
* commit '
d7889768b1bbb78e15ddc96575180252f1b4a5cf':
Scott Main [Thu, 5 Dec 2013 22:44:12 +0000 (22:44 +0000)]
am
6fa95b46: (-s ours) am
93e5dc65: am
fefff422: am
7466b998: am
ebcee197: Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later.
* commit '
6fa95b46ec7d2a267aa0b732a460588d7c75efcb':
Andreas Huber [Thu, 5 Dec 2013 22:44:06 +0000 (22:44 +0000)]
am
2717e4ea: (-s ours) am
cee3a2a5: am
8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef
* commit '
2717e4eabe581d4f461918f78fead736f65667ae':
Martin Kosiba [Thu, 5 Dec 2013 22:44:01 +0000 (22:44 +0000)]
am
1d4ddb05: (-s ours) am
f8d747b3: (-s ours) am
9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE
* commit '
1d4ddb05e609b2f04aec16c1a06edad1c2232741':
Ben Murdoch [Thu, 5 Dec 2013 22:43:56 +0000 (22:43 +0000)]
Jeff Sharkey [Thu, 5 Dec 2013 22:43:50 +0000 (22:43 +0000)]
am
20861b8f: (-s ours) am
35d525c9: am
998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev
* commit '
20861b8f16015c5e5b89bdc8025cc311aeff6883':
Jeff Sharkey [Thu, 5 Dec 2013 22:43:45 +0000 (22:43 +0000)]
am
49ab0f16: (-s ours) am
34412965: am
c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev
* commit '
49ab0f1636833270019b3c1ed733b0a4129f08be':
Jeff Sharkey [Thu, 5 Dec 2013 22:43:40 +0000 (22:43 +0000)]
am
ccff82ee: (-s ours) am
0c305430: am
436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev
* commit '
ccff82ee2f3d44088c4e7dd1de7e11de4150b63a':
Jeff Sharkey [Thu, 5 Dec 2013 22:43:35 +0000 (22:43 +0000)]
am
134f1e9b: (-s ours) am
1d685ec0: am
6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev
* commit '
134f1e9bdc0922e6e0a6c14978712736797ff04f':
Svetoslav Ganov [Thu, 5 Dec 2013 22:43:29 +0000 (22:43 +0000)]
am
892c8f3d: (-s ours) am
09848031: am
b8160401: Merge "Fix the build" into klp-dev
* commit '
892c8f3d633301b2c6efa5ca38dd375c907612a3':
Svetoslav Ganov [Thu, 5 Dec 2013 22:43:24 +0000 (22:43 +0000)]
am
ee6556ab: (-s ours) am
e1c2dfee: am
c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev
* commit '
ee6556abc93f40955a745b0d2c3329d731c360b4':
Craig Mautner [Thu, 5 Dec 2013 22:43:19 +0000 (22:43 +0000)]
am
61dce579: (-s ours) am
b8029214: am
0dd303cf: Merge "Put animation background behind visible wallpaper" into klp-dev
* commit '
61dce5799a9b037a1ce4d1e723453211391e9237':
Wink Saville [Thu, 5 Dec 2013 22:43:14 +0000 (22:43 +0000)]
am
0816267f: (-s ours) am
a9f2faa9: am
a48ad8bd: PROXY_SERVICE may be missing and its reference null.
* commit '
0816267f70c9ef14e31f49ffd9bdf4c38a917f48':
Katie McCormick [Thu, 5 Dec 2013 22:43:08 +0000 (22:43 +0000)]
am
980ae54d: (-s ours) am
2954c1b9: am
7a7c35e2: am
94c529b8: am
385bb2eb: resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev
* commit '
980ae54d3c1dec8e5e620b9e471fed98402b888c':
Zhihai Xu [Thu, 5 Dec 2013 22:43:03 +0000 (22:43 +0000)]
am
87251061: (-s ours) am
71716cc5: am
97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '
8725106123f62cb5057beaba65f3c013b4e5a140':
destradaa [Thu, 5 Dec 2013 22:42:57 +0000 (22:42 +0000)]
am
5174a7a0: (-s ours) am
1b90bdf2: am
f910d320: Merge "Address Robin\'s code review comments in initial FlpHal submission." into klp-dev
* commit '
5174a7a05e8b80b9e6fd9420ca781c2fe494bcc0':
Dianne Hackborn [Thu, 5 Dec 2013 22:42:52 +0000 (22:42 +0000)]
am
3edd90d4: (-s ours) am
8e4e7a20: am
35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev
* commit '
3edd90d47d89332235a260f2b0787789571b2848':
Romain Guy [Thu, 5 Dec 2013 22:42:46 +0000 (22:42 +0000)]
am
5d6930fe: (-s ours) am
c70629f1: am
583ed765: Merge "Take shadow bounds into account for quick rejects Bug #
8634346" into klp-dev
* commit '
5d6930fe4ea0c24f6e1fde4a250cfb941311ed7b':
Baligh Uddin [Thu, 5 Dec 2013 22:42:40 +0000 (22:42 +0000)]
am
e6eae160: (-s ours) am
2d1716a8: (-s ours) am
67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e6eae1609e73205edd560846a032c89dabe9827f':
Romain Guy [Thu, 5 Dec 2013 22:42:34 +0000 (22:42 +0000)]
am
1612eac0: (-s ours) am
06c2bad6: am
96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #
10228005" into klp-dev
* commit '
1612eac06df6ce849cb95935c70ba94093f8d321':
Baligh Uddin [Thu, 5 Dec 2013 22:42:28 +0000 (22:42 +0000)]
am
8c1df1b2: (-s ours) am
4b643f0e: (-s ours) am
40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8c1df1b24a5dd80174a548f30e9da0faf57d5ae9':
Dianne Hackborn [Thu, 5 Dec 2013 22:42:23 +0000 (22:42 +0000)]
am
a6872c84: (-s ours) am
d021b6b1: am
b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
* commit '
a6872c84027552661937aad7f4aa109a174eb23f':
Chet Haase [Thu, 5 Dec 2013 22:42:18 +0000 (22:42 +0000)]
am
fb113bd7: (-s ours) am
17198172: am
2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
* commit '
fb113bd71d22c32c0edc7b3da0afdbe5e38db9e6':
keunyoung [Thu, 5 Dec 2013 22:42:13 +0000 (22:42 +0000)]
am
3ecda672: (-s ours) am
c9bf4052: am
f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev
* commit '
3ecda6727db8ab035abc18a0e1505faec648c685':
Craig Mautner [Thu, 5 Dec 2013 22:42:08 +0000 (22:42 +0000)]
am
cf5e3137: (-s ours) am
f2424907: am
52f8ef21: Merge "Add extra layout pass after draw finished." into klp-dev
* commit '
cf5e3137023edf6360f78161dc704b24e8026c49':
Colin Cross [Thu, 5 Dec 2013 22:42:01 +0000 (22:42 +0000)]
am
9cdbcbad: (-s ours) am
00b581de: am
dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev
* commit '
9cdbcbadeb56041f4122343cbb2fe5d8026924d5':
Martijn Coenen [Thu, 5 Dec 2013 22:41:49 +0000 (22:41 +0000)]
am
e6a7f2c1: (-s ours) am
b59dbedc: am
4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev
* commit '
e6a7f2c197d60849c8ef56b1fb24b30d1fca0d04':
Alan Viverette [Thu, 5 Dec 2013 22:41:43 +0000 (22:41 +0000)]
am
3b59a334: (-s ours) am
bd430b25: am
be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev
* commit '
3b59a3345ea9d4f77a08741572d3ca4533cd216c':
Geoffrey Borggaard [Thu, 5 Dec 2013 22:41:37 +0000 (22:41 +0000)]
am
91e1cb99: (-s ours) am
d1715fda: am
9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev
* commit '
91e1cb99a8f32fcd8172f9e2c95c3ff414c0c031':
Fabrice Di Meglio [Thu, 5 Dec 2013 22:41:32 +0000 (22:41 +0000)]
am
9fe98de0: (-s ours) am
e4e68219: am
88dced29: Merge "Fix bug #
10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev
* commit '
9fe98de0a9f21c0e190362c9c03563dfb241ba52':
Dianne Hackborn [Thu, 5 Dec 2013 22:41:27 +0000 (22:41 +0000)]
am
e286c012: (-s ours) am
003b944d: am
d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev
* commit '
e286c012f2e7a71ae6de97a08dfe170fe9a50cd1':
Fabrice Di Meglio [Thu, 5 Dec 2013 22:41:21 +0000 (22:41 +0000)]
am
6317f13e: (-s ours) am
b945d80c: am
5af4edef: Merge "Fix bug #
10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
* commit '
6317f13e419f0df239de612d29ffda8209c6d6cd':
Elliott Hughes [Thu, 5 Dec 2013 22:41:16 +0000 (22:41 +0000)]
am
d7f6aff9: (-s ours) am
795a7dec: am
5adfb21e: am
a0b320a6: Merge "Remove possible leak when exception occurred."
* commit '
d7f6aff9544a5e1e9f553ee75866eaaf9c3e733d':
Mathias Agopian [Thu, 5 Dec 2013 22:41:10 +0000 (22:41 +0000)]
am
0a128348: (-s ours) am
2464fcdf: am
5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev
* commit '
0a12834894a90c592e20e69e64e28775537e954a':
Romain Guy [Thu, 5 Dec 2013 22:41:05 +0000 (22:41 +0000)]
am
8df8225d: (-s ours) am
ac322988: am
00312300: Remove an unnecessary allocation
* commit '
8df8225d8d5d15946f36e4b818c22d2e59eabe43':
Jeff Sharkey [Thu, 5 Dec 2013 22:40:59 +0000 (22:40 +0000)]
am
082c8154: (-s ours) am
1faca4cd: am
37ee68fc: Merge "Always include a default DocumentStack." into klp-dev
* commit '
082c81545be6cbdf14bc91bf42b09acf54ab0816':
Svetoslav [Thu, 5 Dec 2013 22:40:53 +0000 (22:40 +0000)]
am
0785ccc2: (-s ours) am
85dbba82: am
d3964489: Merge "Some hygiene for the touch explorer." into klp-dev
* commit '
0785ccc2ccb5f9401e9a701db0bffd9a9f51cdb0':
Jeff Sharkey [Thu, 5 Dec 2013 22:40:46 +0000 (22:40 +0000)]
am
bb76afa9: (-s ours) am
87a61b83: am
8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
* commit '
bb76afa9bcf923944786f0ce3ab76c9114cba351':
Jonathan Dixon [Thu, 5 Dec 2013 22:40:41 +0000 (22:40 +0000)]
am
177b89e9: (-s ours) am
de3ff4b4: am
42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
* commit '
177b89e91102bd58016d9ce474a281e22426e463':
Wink Saville [Thu, 5 Dec 2013 22:40:33 +0000 (22:40 +0000)]
am
f3aca5f7: (-s ours) am
8418a309: am
89d16f75: am
9b7b4450: am
02eab434: am
4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '
f3aca5f7ca94aad3f0fe7068762474e8e3f98894':
OSDN Git Service
