OSDN Git Service
Robert Ly [Thu, 15 Mar 2012 01:44:33 +0000 (18:44 -0700)]
am
cce995d7: am
957f716c: docs: fix toc in search au class
* commit '
cce995d72d2b5936e06e7e78dd1638fa4cde40c0':
docs: fix toc in search au class
Robert Ly [Thu, 15 Mar 2012 01:44:28 +0000 (18:44 -0700)]
am
badd0a1a: am
b285125d: Merge "docs: android u search class" into ics-mr1
* commit '
badd0a1a349052c47f0e586024591f7724c7f6ae':
docs: android u search class
Scott Main [Thu, 15 Mar 2012 01:43:48 +0000 (18:43 -0700)]
am
a5ccec20: am
7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '
a5ccec20a677a9e3d129aa0d3d2accd67d260c46':
docs: remove link from GP logo
Eric Fischer [Thu, 15 Mar 2012 01:43:01 +0000 (18:43 -0700)]
am
c65c4459: (-s ours) Import translations. DO NOT MERGE
* commit '
c65c445976db26927cfd0807e6b82b450111df45':
Import translations. DO NOT MERGE
Daniel Lehmann [Thu, 15 Mar 2012 01:42:16 +0000 (18:42 -0700)]
am
3982af7b: am
0e873700: Remove the country detector logging
* commit '
3982af7b9ce0eb49dc54c9172422805a220c8b9c':
Remove the country detector logging
Justin Mattson [Thu, 15 Mar 2012 01:42:09 +0000 (18:42 -0700)]
am
4ad90984: Merge "Add information to CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into ics-aah
* commit '
4ad90984e7559cbbda7c886ed51e6b2a42e8bc9e':
Add information to CONFIGURED_NETWORKS_CHANGED_ACTION broadcast
Wink Saville [Thu, 15 Mar 2012 01:42:00 +0000 (18:42 -0700)]
am
a1c97c65: am
f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
* commit '
a1c97c65de830358e1ebc15badcbcc46c63c526e':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
Robert Ly [Wed, 14 Mar 2012 23:55:19 +0000 (16:55 -0700)]
am
957f716c: docs: fix toc in search au class
* commit '
957f716cf1686145ba4c06ca8669eaa2e22f54e8':
docs: fix toc in search au class
Robert Ly [Wed, 14 Mar 2012 23:24:25 +0000 (16:24 -0700)]
docs: fix toc in search au class
Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
Robert Ly [Wed, 14 Mar 2012 22:46:05 +0000 (15:46 -0700)]
am
b285125d: Merge "docs: android u search class" into ics-mr1
* commit '
b285125d4bad1c76e95cd24956711deb9908c4a8':
docs: android u search class
Robert Ly [Wed, 14 Mar 2012 22:41:02 +0000 (15:41 -0700)]
Merge "docs: android u search class" into ics-mr1
Eric Fischer [Wed, 14 Mar 2012 20:07:30 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib681cdcb9417c130fd2c09d6922e4794101663d6
Scott Main [Wed, 14 Mar 2012 06:12:36 +0000 (23:12 -0700)]
am
7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '
7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
docs: remove link from GP logo
Scott Main [Wed, 14 Mar 2012 06:09:09 +0000 (23:09 -0700)]
Merge "docs: remove link from GP logo" into ics-mr1
Robert Ly [Fri, 3 Feb 2012 19:00:47 +0000 (11:00 -0800)]
docs: android u search class
Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
Eric Fischer [Tue, 13 Mar 2012 20:52:30 +0000 (13:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I100cc30d4d8d7912f99b99a9833ec9d927360931
Eric Fischer [Tue, 13 Mar 2012 18:34:45 +0000 (11:34 -0700)]
am
b9445007: (-s ours) Import translations. DO NOT MERGE
* commit '
b944500710e9f95bb52d14f07f03df13f9465370':
Import translations. DO NOT MERGE
Daniel Lehmann [Tue, 13 Mar 2012 01:25:02 +0000 (18:25 -0700)]
am
0e873700: Remove the country detector logging
* commit '
0e87370077b322b3a88c345a44c6bf3d56617071':
Remove the country detector logging
Daniel Lehmann [Tue, 13 Mar 2012 00:04:17 +0000 (17:04 -0700)]
Remove the country detector logging
Bug:
6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
Justin Mattson [Mon, 12 Mar 2012 23:34:24 +0000 (16:34 -0700)]
Merge "Add information to CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into ics-aah
Justin Mattson [Fri, 9 Mar 2012 03:48:38 +0000 (19:48 -0800)]
Add information to CONFIGURED_NETWORKS_CHANGED_ACTION broadcast
This will allow listeners to better determine what configuration
change occurred.
Bug:
6133917
Change-Id: Ib53949713c4574036313c3b0f69e1ecf3350cae4
Wink Saville [Mon, 12 Mar 2012 22:54:07 +0000 (15:54 -0700)]
am
f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
* commit '
f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
Eric Fischer [Mon, 12 Mar 2012 20:36:47 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5316a81c3c8519d34844c3b71c43583d76f0b15e
Eric Fischer [Mon, 12 Mar 2012 20:35:01 +0000 (13:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I321910cd4d58216f0258fd66048b2ceb56a235db
Wink Saville [Sat, 10 Mar 2012 21:23:35 +0000 (13:23 -0800)]
Allow CDMA on LTE devices to get data connections even if otasp is needed.
Bearer Independent Protocol (BIP) connections as defined in
ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)"
need to be able to establish data connections even when not provisioned.
This can occur when trying to provision on via and EVDO network.
Bug:
6110632
Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
Scott Main [Sat, 10 Mar 2012 03:12:53 +0000 (19:12 -0800)]
docs: remove link from GP logo
Change-Id: I6dff28e84b341054874995e78d20945e70d24cae
Eric Fischer [Fri, 9 Mar 2012 22:33:59 +0000 (14:33 -0800)]
am
f14005c0: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-aah
* commit '
f14005c014665c94a35305ac6218f5731c97d195':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 9 Mar 2012 22:32:25 +0000 (14:32 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-aah-exp
Eric Fischer [Fri, 9 Mar 2012 22:32:07 +0000 (14:32 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-aah
Kevin Hester [Fri, 9 Mar 2012 20:40:51 +0000 (12:40 -0800)]
Merge "Do not allow Surface creation on machines without SurfaceFlinger We will fail later anyways, but this change makes it much easier to track down places where we are inadvertently doing operations that depend on the flinger." into ics-aah-exp
Eric Fischer [Fri, 9 Mar 2012 20:24:17 +0000 (12:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idd71e59c312c5f4790d9d68d70126bfa45ebccd7
Eric Fischer [Fri, 9 Mar 2012 20:22:34 +0000 (12:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib01393301d0a27b63bd9b25ce5dfd2bda4fdc9d0
Travis Geiselbrecht [Fri, 9 Mar 2012 19:59:59 +0000 (11:59 -0800)]
am
15ce1934: add config_bluetooth_default_profiles config var and use it to disable bt profiles
* commit '
15ce193455dda9dcebbb40bd37d9fbfbb7e772d3':
add config_bluetooth_default_profiles config var and use it to disable bt profiles
Travis Geiselbrecht [Tue, 6 Mar 2012 19:41:58 +0000 (11:41 -0800)]
add config_bluetooth_default_profiles config var and use it to disable bt profiles
For devices that don't care about the previously default bluetooth profiles,
add a config var to disable them.
Change-Id: I21a894130d280016cfd5db1b8bbda70cbef348c3
Kevin Hester [Fri, 9 Mar 2012 01:06:56 +0000 (17:06 -0800)]
Do not allow Surface creation on machines without SurfaceFlinger
We will fail later anyways, but this change makes it much easier to track
down places where we are inadvertently doing operations that depend on the
flinger.
Change-Id: Ie28d3f892098240f363dabb4a8cf1f9e0e1679fb
Eric Fischer [Fri, 9 Mar 2012 01:44:36 +0000 (17:44 -0800)]
am
19891328: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-aah
* commit '
19891328f6718a64f47555eccb580400fb325959':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 9 Mar 2012 01:43:11 +0000 (17:43 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-aah-exp
Eric Fischer [Fri, 9 Mar 2012 01:42:45 +0000 (17:42 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-aah
Eric Fischer [Thu, 8 Mar 2012 20:29:42 +0000 (12:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8657f236b2c916182a03d1eb73ab66facfb08f20
Megha Joshi [Thu, 8 Mar 2012 20:28:39 +0000 (12:28 -0800)]
am
1d721583: am
33372b21: Merge "A few updates for TVs." into ics-mr1
* commit '
1d72158331a4b3273d282fd170a6d03d5d9e2da3':
A few updates for TVs.
Eric Fischer [Thu, 8 Mar 2012 20:28:02 +0000 (12:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6065f9517281fcdb1fff020ef0661135723c524d
Megha Joshi [Thu, 8 Mar 2012 20:26:14 +0000 (12:26 -0800)]
am
9452f4d8: am
84099f3d: Merge "Adding TV related updates." into ics-mr1
* commit '
9452f4d899295269f3dc8f3f06c60b757c7d34f9':
Adding TV related updates.
Megha Joshi [Thu, 8 Mar 2012 20:24:51 +0000 (12:24 -0800)]
am
33372b21: Merge "A few updates for TVs." into ics-mr1
* commit '
33372b217ea5e9950560449aa5c86e0f0ddacc74':
A few updates for TVs.
Megha Joshi [Thu, 8 Mar 2012 20:22:49 +0000 (12:22 -0800)]
Merge "A few updates for TVs." into ics-mr1
Megha Joshi [Thu, 8 Mar 2012 20:22:37 +0000 (12:22 -0800)]
am
84099f3d: Merge "Adding TV related updates." into ics-mr1
* commit '
84099f3d788974169a8ea282f9413cb399d17012':
Adding TV related updates.
Megha Joshi [Thu, 8 Mar 2012 20:20:21 +0000 (12:20 -0800)]
Merge "Adding TV related updates." into ics-mr1
Megha Joshi [Thu, 8 Mar 2012 00:09:05 +0000 (16:09 -0800)]
A few updates for TVs.
Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
RoboErik [Thu, 8 Mar 2012 17:48:14 +0000 (09:48 -0800)]
am
9162cd59: fix setting only usb mode
* commit '
9162cd596b958c1e59ec69257b2e596290ad73c3':
fix setting only usb mode
RoboErik [Thu, 8 Mar 2012 01:53:36 +0000 (17:53 -0800)]
fix setting only usb mode
If you cleared the last usb mode it would fail (and so would setting
it if you started with none). This fixes it to set and unset the
last property correctly.
Change-Id: I8aa62a65ccda5f3872d2995f30d80426f07a281c
Scott Main [Thu, 8 Mar 2012 01:22:27 +0000 (17:22 -0800)]
am
8891e01e: am
99e790de: docs: add troido adk link
* commit '
8891e01eef2d67f68f71ad6051cf8efdc0dfc55f':
docs: add troido adk link
Scott Main [Thu, 8 Mar 2012 01:19:57 +0000 (17:19 -0800)]
am
99e790de: docs: add troido adk link
* commit '
99e790de9ea23f59933fd695ca35bb6d1033b4e9':
docs: add troido adk link
Megha Joshi [Thu, 8 Mar 2012 01:11:12 +0000 (17:11 -0800)]
Adding TV related updates.
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
Kevin Hester-Chow [Wed, 7 Mar 2012 23:37:08 +0000 (15:37 -0800)]
am
e0cbb81b: Merge "Do not assume that there is always a running activity (Necessary for headless devices)" into ics-aah
* commit '
e0cbb81b7ac0985a839a384ab3227bb6bc1acd43':
Do not assume that there is always a running activity (Necessary for headless devices)
Kevin Hester-Chow [Wed, 7 Mar 2012 23:35:05 +0000 (15:35 -0800)]
Merge "Do not assume that there is always a running activity (Necessary for headless devices)" into ics-aah
Eric Fischer [Wed, 7 Mar 2012 22:55:25 +0000 (14:55 -0800)]
am
48f5744b: (-s ours) Import translations. DO NOT MERGE
* commit '
48f5744b69249da2f01af50a0fbeae12cfe13b31':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 7 Mar 2012 20:55:53 +0000 (12:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iacba0954e7a037e022cc08cbc303ffeb1b51334e
Eric Fischer [Wed, 7 Mar 2012 20:54:08 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4c99687a25aaa3b92cc97d4719ed3196ea4b22ee
John Grossman [Wed, 7 Mar 2012 02:59:47 +0000 (18:59 -0800)]
am
d7af3479: Detect (at runtime) kernel support for the "hdmi_audio" switch.
* commit '
d7af347922064be585d3b9406cf7f9edd9d2f049':
Detect (at runtime) kernel support for the "hdmi_audio" switch.
John Grossman [Tue, 6 Mar 2012 00:01:26 +0000 (16:01 -0800)]
Detect (at runtime) kernel support for the "hdmi_audio" switch.
A new switch was introduced in AndroidAtHome to deal with a race
condition between the WiredAccessoryObserver and the HW composer HAL.
When the new switch ("hdmi_audio") is present, we want to pay
attention to it instead of paying attention to the old switch
("hdmi"). This change checks at startup for the presence or absence
of the new switch and uses it if available, otherwise it falls back on
classic behavior.
see change ID I960cfc2f3e8df5342e7248a26fd313fdad2ca322 for the kernel
side changes.
see bug
6023647 for a discussion of the issue.
Change-Id: Ia2f2c399c3d85896ede0fff57ecbd51f332b3e0e
Signed-off-by: John Grossman <johngro@google.com>
Scott Main [Wed, 7 Mar 2012 00:17:08 +0000 (16:17 -0800)]
docs: add troido adk link
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
Roman Nurik [Tue, 6 Mar 2012 22:51:35 +0000 (14:51 -0800)]
am
9e879c80: am
96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '
9e879c806ed199e043bee5f83ef1c5e5d9470112':
docs: move Android Design from static HTML to JD
Scott Main [Tue, 6 Mar 2012 22:51:32 +0000 (14:51 -0800)]
am
784c1ee3: am
66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '
784c1ee394010685c8c2ae75207de0039537e86e':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
Scott Main [Tue, 6 Mar 2012 22:51:25 +0000 (14:51 -0800)]
am
fb7cd4fa: am
97b94e78: docs: a few more Market -> Play strings
* commit '
fb7cd4fad6a107d6fe067e748ce59a4f9b7a50e5':
docs: a few more Market -> Play strings
Roman Nurik [Tue, 6 Mar 2012 22:43:34 +0000 (14:43 -0800)]
am
96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '
96c757e557ed40da4400b82fd62dfbd4bc8151d1':
docs: move Android Design from static HTML to JD
Roman Nurik [Tue, 6 Mar 2012 22:39:54 +0000 (14:39 -0800)]
Merge "docs: move Android Design from static HTML to JD" into ics-mr1
Scott Main [Tue, 6 Mar 2012 22:25:57 +0000 (14:25 -0800)]
am
66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '
66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
Scott Main [Tue, 6 Mar 2012 22:23:23 +0000 (14:23 -0800)]
Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
Scott Main [Tue, 6 Mar 2012 21:57:04 +0000 (13:57 -0800)]
am
97b94e78: docs: a few more Market -> Play strings
* commit '
97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
docs: a few more Market -> Play strings
Eric Fischer [Tue, 6 Mar 2012 21:45:09 +0000 (13:45 -0800)]
Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into ics-aah-exp
Eric Fischer [Tue, 6 Mar 2012 20:41:41 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I31b5992fd0e53c50c63ca4e40485d05b590d7a0e
Eric Fischer [Tue, 6 Mar 2012 20:40:07 +0000 (12:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icb18cf9b2983959a07c5abfd084f63f5632483d0
Roman Nurik [Tue, 6 Mar 2012 20:26:15 +0000 (12:26 -0800)]
docs: move Android Design from static HTML to JD
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
Scott Main [Tue, 6 Mar 2012 20:10:17 +0000 (12:10 -0800)]
docs: a few more Market -> Play strings
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
Scott Main [Tue, 6 Mar 2012 19:23:36 +0000 (11:23 -0800)]
Fix badge generator URLs and images, and update
script to generate different alt text for the different button styles.
Also change homepage announce link for blog post.
Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
Jason Simmons [Tue, 6 Mar 2012 17:41:04 +0000 (09:41 -0800)]
Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into ics-aah-exp
Dirk Dougherty [Tue, 6 Mar 2012 17:38:37 +0000 (09:38 -0800)]
am
9ad3d0ee: Update build-a-button to use new assets.
* commit '
9ad3d0ee5bc481933a4acb10397226ffad8e03a2':
Update build-a-button to use new assets.
Dirk Dougherty [Tue, 6 Mar 2012 09:48:26 +0000 (01:48 -0800)]
Update build-a-button to use new assets.
Change-Id: I2218af60519fa3adbe574aaedb1a72270ea3c1da
Android Git Automerger [Tue, 6 Mar 2012 09:28:05 +0000 (01:28 -0800)]
Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into ics-aah-exp
Pin Ting [Tue, 6 Mar 2012 08:57:27 +0000 (00:57 -0800)]
am
25c66c3a: Merge "Fix document." into ics-mr1
* commit '
25c66c3a4a51617099e848a9376313c90a1ec9ae':
Fix document.
Pin Ting [Tue, 6 Mar 2012 08:55:49 +0000 (00:55 -0800)]
Merge "Fix document." into ics-mr1
Ed Heyl [Tue, 6 Mar 2012 08:50:01 +0000 (00:50 -0800)]
Merge remote-tracking branch 'goog/ics-aah' into ics-aah-exp
Scott Main [Tue, 6 Mar 2012 08:48:17 +0000 (00:48 -0800)]
am
1c247304: docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
* commit '
1c2473042236dd63774d7a2c5edfd991b4ef1b3e':
docs: update homepage announcement for GP Still needs an update with proper blog link (will probably do by hand for launch push)
Pin Ting [Fri, 2 Mar 2012 16:13:32 +0000 (00:13 +0800)]
Fix document.
Change-Id: I661b259c8438f9290d57fae29a828cf4495ce335
Scott Main [Fri, 2 Mar 2012 23:49:34 +0000 (15:49 -0800)]
docs: update homepage announcement for GP
Still needs an update with proper blog link
(will probably do by hand for launch push)
Change-Id: I660082780ffd27cf591351e6b65be61a109a6d5d
Dirk Dougherty [Tue, 6 Mar 2012 06:55:39 +0000 (22:55 -0800)]
am
4d7bc655: Doc change: String changes for Android Market
* commit '
4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
Dirk Dougherty [Sat, 28 Jan 2012 01:56:49 +0000 (17:56 -0800)]
Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
Scott Main [Tue, 6 Mar 2012 04:19:51 +0000 (20:19 -0800)]
am
e606cb46: docs: fix api dashboard
* commit '
e606cb460272cd99bac05b4477a5e489827b368b':
docs: fix api dashboard
Scott Main [Tue, 6 Mar 2012 04:14:16 +0000 (20:14 -0800)]
docs: fix api dashboard
Change-Id: Ifbd596860f3368811e31494176682571be919459
Christopher Tate [Tue, 6 Mar 2012 03:11:08 +0000 (19:11 -0800)]
Merge "Add a config resource to disable key-chord screenshotting" into ics-aah
Christopher Tate [Tue, 6 Mar 2012 02:56:25 +0000 (18:56 -0800)]
Add a config resource to disable key-chord screenshotting
The key chord screenshot mechanism introduces significant latency into
processing of volume-key input; enough to be quite noticeable and
annoying on some kinds of device. This patch introduces a new config
resource entry ("config_enableScreenshotChord"), true by default, so
that products on which this functionality is inapplicable can avoid
its runtime overhead.
Bug
6039047
Change-Id: I3da16080d3a6842f50da8a8b677153dca943382a
Scott Main [Tue, 6 Mar 2012 01:41:25 +0000 (17:41 -0800)]
am
290684ac: docs: fix expansion library package name
* commit '
290684ac2eadf786d2f478d3d280eb3058627789':
docs: fix expansion library package name
Scott Main [Tue, 6 Mar 2012 01:35:36 +0000 (17:35 -0800)]
docs: fix expansion library package name
Change-Id: I38303b5650fd924ac25281baf4a7da51aa939394
Ed Heyl [Tue, 6 Mar 2012 01:08:37 +0000 (17:08 -0800)]
Merge remote-tracking branch 'goog/ics-aah' into ics-aah-exp
Eric Fischer [Mon, 5 Mar 2012 23:16:56 +0000 (15:16 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-aah
Scott Main [Mon, 5 Mar 2012 22:36:11 +0000 (14:36 -0800)]
am
a47d88a7: docs: dashboard update for march 5
* commit '
a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:21:24 +0000 (14:21 -0800)]
docs: dashboard update for march 5
Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444
Eric Fischer [Mon, 5 Mar 2012 22:06:13 +0000 (14:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I35314a3c07de9cb717e537e3e57972e918797e63
Eric Fischer [Mon, 5 Mar 2012 22:04:40 +0000 (14:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib5184c43b98ced2c4386c3e55a078c96198e1238
Scott Main [Mon, 5 Mar 2012 21:26:53 +0000 (13:26 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:22:56 +0000 (13:22 -0800)]
docs: add note about declaring file sizes with sample app's code
Change-Id: I7858956916c0db5a585228a890a20fb004155b8c
OSDN Git Service
