OSDN Git Service
Robert Greenwalt [Thu, 17 Jan 2013 16:15:28 +0000 (16:15 +0000)]
Merge "Second pass tying into dns cache per interface"
Junichi Monma [Thu, 17 Jan 2013 07:13:22 +0000 (16:13 +0900)]
Added the necessary Harfbuzz scripts for rendering Japanese text correctly.
bug id : b/
8023135
Change-Id: Ie9a69f480026302ff949fdf2b4089e4d95a38fb0
Dianne Hackborn [Thu, 17 Jan 2013 02:51:09 +0000 (02:51 +0000)]
Merge "AppOps: fix nested op tracking, new API to get apps using permissions."
Dianne Hackborn [Thu, 17 Jan 2013 01:56:46 +0000 (17:56 -0800)]
AppOps: fix nested op tracking, new API to get apps using
permissions.
Change-Id: I20c7bd58febc01d6911a90440867eaacd133c464
Victoria Lease [Thu, 17 Jan 2013 00:33:17 +0000 (00:33 +0000)]
Merge "Prevent OOM death for services under ServiceWatcher's care."
Winson Chung [Thu, 17 Jan 2013 00:27:19 +0000 (00:27 +0000)]
Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)"
Justin Koh [Thu, 17 Jan 2013 00:23:32 +0000 (16:23 -0800)]
am
73d94a30: (-s ours) am
ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
* commit '
73d94a30a25aec25e27aa1d0a328f033465461c0':
Remove doSingleCrunch call DO NOT MERGE
Victoria Lease [Wed, 16 Jan 2013 20:51:04 +0000 (12:51 -0800)]
Prevent OOM death for services under ServiceWatcher's care.
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03
Justin Koh [Thu, 17 Jan 2013 00:21:28 +0000 (16:21 -0800)]
am
ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
* commit '
ba1992f8e9e50ca58f007ff528d2f6d2c2b18223':
Remove doSingleCrunch call DO NOT MERGE
Justin Koh [Thu, 17 Jan 2013 00:11:44 +0000 (00:11 +0000)]
Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
Amith Yamasani [Thu, 17 Jan 2013 00:10:16 +0000 (00:10 +0000)]
Merge "Fix test build failure"
Amith Yamasani [Thu, 17 Jan 2013 00:04:00 +0000 (16:04 -0800)]
Fix test build failure
Change-Id: Ic96c2490439a78af2fb92db49b25b67b56954a20
Dianne Hackborn [Wed, 16 Jan 2013 23:35:39 +0000 (23:35 +0000)]
Merge "Fix build."
Dianne Hackborn [Wed, 16 Jan 2013 23:34:35 +0000 (15:34 -0800)]
Fix build.
Change-Id: I068539623b3b133793fc9b8188d876eca59a8281
Amith Yamasani [Wed, 16 Jan 2013 23:26:30 +0000 (23:26 +0000)]
Merge "Rename bindService to bindServiceAsUser to follow convention."
Jeff Sharkey [Wed, 16 Jan 2013 23:09:27 +0000 (23:09 +0000)]
Merge "Create directory on background thread."
Jeff Sharkey [Wed, 16 Jan 2013 23:07:37 +0000 (15:07 -0800)]
Create directory on background thread.
Bug:
7726949
Change-Id: I707431075055cddb8da2c2bca37e91a846938dce
Winson Chung [Wed, 16 Jan 2013 22:59:18 +0000 (14:59 -0800)]
Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug
7974275)
Change-Id: Icb71d28eb80105757026d7fac530db936b327500
Jeff Sharkey [Wed, 16 Jan 2013 23:00:56 +0000 (23:00 +0000)]
Merge "Create screenshot directory if missing."
Justin Koh [Wed, 16 Jan 2013 22:51:29 +0000 (14:51 -0800)]
Remove doSingleCrunch call DO NOT MERGE
Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.
Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
Jeff Sharkey [Wed, 16 Jan 2013 22:38:49 +0000 (14:38 -0800)]
Create screenshot directory if missing.
Also use File to build paths instead of String template.
Bug:
7726949
Change-Id: I9aa0e6a0890c5450fe11e8007f8f4cb2e3287256
Siva Velusamy [Wed, 16 Jan 2013 22:23:39 +0000 (22:23 +0000)]
Merge "Support hierarchy viewer commands via DDM"
Amith Yamasani [Wed, 16 Jan 2013 20:30:11 +0000 (12:30 -0800)]
Rename bindService to bindServiceAsUser to follow convention.
This is for the multi-user version of bindService, not the original.
Change-Id: Ib2de35941196accf387b1a276a77e6f9af805ec0
Dianne Hackborn [Tue, 15 Jan 2013 01:38:02 +0000 (17:38 -0800)]
More work on App Ops service.
Implemented reading and writing state to retain information
across boots, API to retrieve state from it, improved location
manager interaction to monitor both coarse and fine access
and only note operations when location data is being delivered
back to app (not when it is just registering to get the data at
some time in the future).
Also implement tracking of read/write ops on contacts and the
call log. This involved tweaking the content provider protocol
to pass over the name of the calling package, and some
infrastructure in the ContentProvider transport to note incoming
calls with the app ops service. The contacts provider and call
log provider turn this on for themselves.
This also implements some of the mechanics of being able to ignore
incoming provider calls... all that is left are some new APIs for
the real content provider implementation to be involved with
providing the correct behavior for query() (return an empty
cursor with the right columns) and insert() (need to figure out
what URI to return).
Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
Scott Kennedy [Wed, 16 Jan 2013 18:18:02 +0000 (10:18 -0800)]
Scott Main [Wed, 16 Jan 2013 18:17:58 +0000 (10:17 -0800)]
am
465ef7f2: am
6f8fe8dd: am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
465ef7f2a2b1af43657d83bc1d12b8d646a6e335':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:17:53 +0000 (10:17 -0800)]
am
5c7c1468: am
29502977: am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
5c7c1468f71186488e91fe550777cd16e3e07645':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:15:54 +0000 (10:15 -0800)]
Scott Main [Wed, 16 Jan 2013 18:15:51 +0000 (10:15 -0800)]
am
6f8fe8dd: am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
6f8fe8dd4af55fb45ba9002cb0c36c8818a0b030':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:15:47 +0000 (10:15 -0800)]
am
29502977: am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
29502977fc4b4e05868775b9153714d4d6d050c1':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:13:02 +0000 (10:13 -0800)]
Scott Main [Wed, 16 Jan 2013 18:12:59 +0000 (10:12 -0800)]
am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
841c3491143e4946586caa7fe7cd4691d044ce62':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:12:56 +0000 (10:12 -0800)]
am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
de902da2c1f9e133de69267b5dbb122bce15adbc':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:09:46 +0000 (10:09 -0800)]
am
3332aa98: am
d7ec742c: docs: Minor typos
* commit '
3332aa985280d7e84c7cb70c33610efdd24873d7':
docs: Minor typos
Scott Main [Wed, 16 Jan 2013 18:09:46 +0000 (10:09 -0800)]
am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
ceddf9f8e824573d7e6be4b21edf0ffb89c7c929':
docs: put new devbytes playlist on the develop landing
Scott Kennedy [Wed, 16 Jan 2013 18:08:08 +0000 (10:08 -0800)]
am
d7ec742c: docs: Minor typos
* commit '
d7ec742c30be95da4d20930dd5000897bfe3f127':
docs: Minor typos
Siva Velusamy [Mon, 7 Jan 2013 00:03:12 +0000 (16:03 -0800)]
Support hierarchy viewer commands via DDM
Hierarchy Viewer currently interfaces to the host via a socket
opened by ViewServer which resides in the WindowManagerService.
Since this has access to all windows, it is enabled only on
debug builds.
This CL adds necessary support to DDM to handle all the commands
required for Hierarchy Viewer. It only misses two commands that
are sent to the Window Manager (which we don't have access to
from the applications).
A future CL will remove the ViewServer functionality.
Change-Id: I1dae316a00737b0cae4e640ccc97bf9bb1d05973
Scott Main [Tue, 15 Jan 2013 19:18:48 +0000 (11:18 -0800)]
docs: put new devbytes playlist on the develop landing
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
Scott Kennedy [Wed, 16 Jan 2013 03:33:56 +0000 (19:33 -0800)]
docs: Minor typos
One of these was mentioned in a comment in external 40435
Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4
Kristian Monsen [Wed, 16 Jan 2013 03:23:21 +0000 (19:23 -0800)]
Fix build break in master-chromium
Include needed headers and sort them correctly.
Change-Id: I8557c98234d86f4d0b105182f4f191a826c9aeb5
Xia Wang [Wed, 16 Jan 2013 02:02:59 +0000 (18:02 -0800)]
Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks."
Xia Wang [Wed, 21 Nov 2012 03:03:06 +0000 (19:03 -0800)]
Fix image processing test to include all benchmark tests
-- each test case can be excuted separately
-- add a test case to run all benchmarks.
Change-Id: I3c61dfe50267a6db11bc1895a4f37ed618a9103b
Sasha Levitskiy [Wed, 16 Jan 2013 00:55:41 +0000 (16:55 -0800)]
Merge "Removed Throttle Manager as obsolete"
Scott Kennedy [Wed, 16 Jan 2013 00:52:14 +0000 (16:52 -0800)]
am
7e553e15: am
d50a0383: am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
7e553e15d9f903f01e7038bd691aaa94e4524b97':
docs: Another fix for external 42607
Scott Main [Wed, 16 Jan 2013 00:52:11 +0000 (16:52 -0800)]
am
67db4218: am
7fb1b8c6: am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
67db4218edf93ee3db36f9ac0e10682ed74f4150':
docs: add download ZIPs for chet's devbyte samples
Yorke Lee [Wed, 16 Jan 2013 00:47:17 +0000 (16:47 -0800)]
Merge "Fix the build breakage due to incorrect javadoc link"
Yorke Lee [Wed, 16 Jan 2013 00:46:00 +0000 (16:46 -0800)]
Fix the build breakage due to incorrect javadoc link
Change-Id: I1789f7e324a06c45c1be4088e9bd4e5cd6879aee
Xavier Ducrohet [Wed, 16 Jan 2013 00:41:29 +0000 (16:41 -0800)]
resolved conflicts for merge of
c71c678e to master
Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
Scott Main [Tue, 15 Jan 2013 23:25:04 +0000 (15:25 -0800)]
am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
3c3995f5ab2d0bc38cd06effdd65395a6a9a0ac3':
docs: put new devbytes playlist on the develop landing
Scott Main [Tue, 15 Jan 2013 23:20:23 +0000 (15:20 -0800)]
Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
Raph Levien [Tue, 15 Jan 2013 22:58:17 +0000 (14:58 -0800)]
Merge "Attempt to resolve build breakage on x86"
Scott Kennedy [Tue, 15 Jan 2013 22:54:22 +0000 (14:54 -0800)]
am
d50a0383: am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
d50a038340935a0ea8cf8fadce7e21b640b58db0':
docs: Another fix for external 42607
Scott Main [Tue, 15 Jan 2013 22:54:18 +0000 (14:54 -0800)]
am
7fb1b8c6: am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
7fb1b8c61337313de6566b1afa6886ceb368dd50':
docs: add download ZIPs for chet's devbyte samples
Scott Kennedy [Tue, 15 Jan 2013 22:52:32 +0000 (14:52 -0800)]
am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
ff5b73933a0444aae30e3a1a41bb31d19f7ff649':
docs: Another fix for external 42607
Scott Main [Tue, 15 Jan 2013 22:52:29 +0000 (14:52 -0800)]
am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
946d68f3d0e0a10753cc6566766f149d779f45b6':
docs: add download ZIPs for chet's devbyte samples
Xavier Ducrohet [Tue, 15 Jan 2013 22:50:37 +0000 (14:50 -0800)]
am
a4e10cc7: am
6080cc5f: resolved conflicts for merge of
dd52dfed to jb-mr1.1-ub-dev
* commit '
a4e10cc746caea514216f436e2065b3bbefb25ef':
Fix the single crunch command to return the right error code.
Scott Kennedy [Tue, 15 Jan 2013 22:50:15 +0000 (14:50 -0800)]
am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
39ea055f9e1b697db0dee197818be8de608e461f':
docs: Another fix for external 42607
Scott Main [Tue, 15 Jan 2013 22:50:12 +0000 (14:50 -0800)]
am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
9ac31a78c85f2246cf49ff4a89a91e44375b1d56':
docs: add download ZIPs for chet's devbyte samples
Xavier Ducrohet [Tue, 15 Jan 2013 22:48:02 +0000 (14:48 -0800)]
am
6080cc5f: resolved conflicts for merge of
dd52dfed to jb-mr1.1-ub-dev
* commit '
6080cc5fd7c332c79098a50605c0c37d99d4c481':
Fix the single crunch command to return the right error code.
Raph Levien [Tue, 15 Jan 2013 22:37:27 +0000 (14:37 -0800)]
Attempt to resolve build breakage on x86
If the scalblnf function is not available but scalbnf is, this patch
should fix the build.
Change-Id: Id83faba3298a44d57f4c924862a15c5d2bef3ca0
Scott Kennedy [Tue, 15 Jan 2013 22:29:20 +0000 (14:29 -0800)]
am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
335da367a167d11eefb9d8127b9423093213bcc8':
docs: Another fix for external 42607
Xavier Ducrohet [Tue, 15 Jan 2013 22:24:56 +0000 (14:24 -0800)]
resolved conflicts for merge of
dd52dfed to jb-mr1.1-ub-dev
Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0
Scott Kennedy [Tue, 15 Jan 2013 22:24:24 +0000 (14:24 -0800)]
Merge "docs: Another fix for external 42607" into jb-mr1-dev
Chris Wren [Tue, 15 Jan 2013 22:20:43 +0000 (14:20 -0800)]
Merge "port system ui over to new ICU date formatting API."
Chris Wren [Tue, 15 Jan 2013 15:59:43 +0000 (10:59 -0500)]
port system ui over to new ICU date formatting API.
Bug:
7288134
Change-Id: Icea2ff96fd91c6db66b3aad6f6653b21203351b1
Victoria Lease [Tue, 15 Jan 2013 21:48:01 +0000 (13:48 -0800)]
Merge "fix NPE in updateClientUids"
Yorke Lee [Tue, 15 Jan 2013 19:24:16 +0000 (11:24 -0800)]
Merge "Allow supplying extras when assigning QuickContactsBadge"
Raph Levien [Tue, 15 Jan 2013 19:24:33 +0000 (11:24 -0800)]
Merge "Update framework text layout to use Harfbuzz NG"
Scott Main [Tue, 15 Jan 2013 19:18:48 +0000 (11:18 -0800)]
docs: put new devbytes playlist on the develop landing
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
Scott Main [Tue, 15 Jan 2013 19:11:16 +0000 (11:11 -0800)]
am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
ec171f3f48f49cffc49bf36d2d65a76489351034':
docs: add download ZIPs for chet's devbyte samples
Scott Main [Tue, 15 Jan 2013 19:03:49 +0000 (11:03 -0800)]
docs: add download ZIPs for chet's devbyte samples
Change-Id: I06ec87729afe2c5b161ae7877f2cc012db60db2f
Xavier Ducrohet [Tue, 15 Jan 2013 18:49:12 +0000 (10:49 -0800)]
am
de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev
* commit '
de3b69e0512c00158333a223f6c53c9eac7b3d34':
Fix the single crunch command to return the right error code.
Xavier Ducrohet [Tue, 15 Jan 2013 18:45:28 +0000 (10:45 -0800)]
Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev
Victoria Lease [Tue, 15 Jan 2013 18:39:28 +0000 (10:39 -0800)]
fix NPE in updateClientUids
Bug:
8009908
Change-Id: I54d97c587a3fa9d003f654f98fdfdbe21af791d6
Xavier Ducrohet [Tue, 15 Jan 2013 02:02:40 +0000 (18:02 -0800)]
Fix the single crunch command to return the right error code.
Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.
Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
Irfan Sheriff [Tue, 15 Jan 2013 18:36:40 +0000 (10:36 -0800)]
Merge "Fix connectivitymanagertest"
Irfan Sheriff [Tue, 15 Jan 2013 18:35:02 +0000 (10:35 -0800)]
Fix connectivitymanagertest
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
Romain Guy [Tue, 15 Jan 2013 18:24:46 +0000 (10:24 -0800)]
Merge "Preliminary Support for region clipping"
Irfan Sheriff [Tue, 15 Jan 2013 18:13:53 +0000 (10:13 -0800)]
Merge "Fix build"
Irfan Sheriff [Tue, 15 Jan 2013 18:02:31 +0000 (10:02 -0800)]
Fix build
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
Raph Levien [Tue, 30 Oct 2012 22:55:33 +0000 (15:55 -0700)]
Update framework text layout to use Harfbuzz NG
These are the frameworks changes to use the new version of Harfbuzz.
Change-Id: Idbef325e8fc1c27a9f2296414ddb1f79b778a00e
Dirk Dougherty [Tue, 15 Jan 2013 17:37:04 +0000 (09:37 -0800)]
am
f37d9c07: am
b78714b5: am
5941ff03: am
9af5cf2b: am
20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit '
f37d9c07b258ceeea991801f9223ecf071debd08':
Doc change: add developer video to carousel and spotlight pages.
Baligh Uddin [Tue, 15 Jan 2013 17:25:51 +0000 (09:25 -0800)]
Merge "Import translations. DO NOT MERGE"
Craig Mautner [Tue, 15 Jan 2013 17:10:10 +0000 (09:10 -0800)]
Merge "Add Overrides, remove trailing whitespace."
Craig Mautner [Tue, 15 Jan 2013 17:05:42 +0000 (09:05 -0800)]
Add Overrides, remove trailing whitespace.
Once and for all.
Change-Id: I0835515696c1a8ec7dff719fb734cbbd0b4252d6
Irfan Sheriff [Tue, 15 Jan 2013 17:02:46 +0000 (09:02 -0800)]
Merge "Refactor enterprise config"
Irfan Sheriff [Fri, 11 Jan 2013 22:03:55 +0000 (14:03 -0800)]
Refactor enterprise config
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
Scott Kennedy [Tue, 15 Jan 2013 16:52:37 +0000 (08:52 -0800)]
docs: Another fix for external 42607
Follow-up to If4215cef850ba8e4e8df356a68192566806e7914
Change-Id: I70a7a9f6a5be654b1fab9645c87da304b33aec5b
Dirk Dougherty [Tue, 15 Jan 2013 05:30:34 +0000 (21:30 -0800)]
am
b78714b5: am
5941ff03: am
9af5cf2b: am
20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit '
b78714b5dfc871fee251db125ec5e14f4e0aff5f':
Doc change: add developer video to carousel and spotlight pages.
Dirk Dougherty [Tue, 15 Jan 2013 05:28:11 +0000 (21:28 -0800)]
am
5941ff03: am
9af5cf2b: am
20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit '
5941ff03721005228072dca5b1c808cb5d12a001':
Doc change: add developer video to carousel and spotlight pages.
Dirk Dougherty [Tue, 15 Jan 2013 05:26:13 +0000 (21:26 -0800)]
am
9af5cf2b: am
20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit '
9af5cf2b38d82d5ddda5ada67aab51314b473800':
Doc change: add developer video to carousel and spotlight pages.
Dirk Dougherty [Tue, 15 Jan 2013 05:24:16 +0000 (21:24 -0800)]
am
20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit '
20d47ca81df71096fd74bc9205e0e2a744cb630a':
Doc change: add developer video to carousel and spotlight pages.
Dirk Dougherty [Tue, 15 Jan 2013 01:42:30 +0000 (17:42 -0800)]
Doc change: add developer video to carousel and spotlight pages.
Change-Id: Ia12eb98f4d86edea72dfa1142d782ea24d3373f7
Satoshi Kataoka [Fri, 11 Jan 2013 06:55:28 +0000 (15:55 +0900)]
Refactor utilities for InputMethodManagerSerivce that we want to share with the Settings application
Bug:
7872918
Change-Id: I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6
Elliott Hughes [Tue, 15 Jan 2013 03:28:24 +0000 (19:28 -0800)]
am
a99a9f4f: am
9fa542a5: am
727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit '
a99a9f4f80ceb47db0c7b3e9e32547cef4e3ee03':
Manual fix for some Norwegian format strings.
Elliott Hughes [Tue, 15 Jan 2013 03:28:20 +0000 (19:28 -0800)]
am
67ae48f3: am
fc91d730: am
cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit '
67ae48f32545791fe0a0574f02bfe714e106074b':
Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
Elliott Hughes [Tue, 15 Jan 2013 03:25:56 +0000 (19:25 -0800)]
am
9fa542a5: am
727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit '
9fa542a5032d8adc3f502cef0c5c98d8f10abbc2':
Manual fix for some Norwegian format strings.
Elliott Hughes [Tue, 15 Jan 2013 03:25:52 +0000 (19:25 -0800)]
am
fc91d730: am
cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit '
fc91d73067d76e129869fe472238f4c80aa5d435':
Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
Elliott Hughes [Tue, 15 Jan 2013 03:23:51 +0000 (19:23 -0800)]
am
727adb8b: Merge "Manual fix for some Norwegian format strings."
* commit '
727adb8b4795dd4eb708c03ecec69ff64fa8d552':
Manual fix for some Norwegian format strings.
Elliott Hughes [Tue, 15 Jan 2013 03:23:48 +0000 (19:23 -0800)]
am
cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
* commit '
cbfece8237cb9cf62547e75ab9572ccbf682369a':
Switch over to getting 12-/24-hour time formats from CLDR via icu4c.