OSDN Git Service
Katie McCormick [Mon, 3 Dec 2012 00:52:22 +0000 (16:52 -0800)]
am
36166345: am
f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev
* commit '
361663455f2e665e6461f16f83d71ac39b1665df':
Doc change: updating lib links
Katie McCormick [Mon, 3 Dec 2012 00:50:46 +0000 (16:50 -0800)]
am
f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev
* commit '
f3dda7243c267a807d11a120219478f3a98f0275':
Doc change: updating lib links
Katie McCormick [Mon, 3 Dec 2012 00:48:14 +0000 (16:48 -0800)]
Merge "Doc change: updating lib links" into jb-mr1-dev
Scott Main [Mon, 3 Dec 2012 00:04:16 +0000 (16:04 -0800)]
am
12de574e: am
80aab876: move Setup link for play services
* commit '
12de574edecd47d83142c8225a8200073123f3b6':
move Setup link for play services
Scott Main [Mon, 3 Dec 2012 00:02:14 +0000 (16:02 -0800)]
am
80aab876: move Setup link for play services
* commit '
80aab87653aa6089e89039b74530073202f4c355':
move Setup link for play services
Katie McCormick [Sat, 1 Dec 2012 03:06:35 +0000 (19:06 -0800)]
Doc change: updating lib links
Bug #
7038255
Change-Id: I702aeaed5fcbf7a9cb46b2ccd0e7baff53e48dab
Scott Main [Sat, 1 Dec 2012 04:25:38 +0000 (20:25 -0800)]
move Setup link for play services
Change-Id: I436abf4929e2d69c5f9fadca0f79321d069618ea
Scott Main [Sat, 1 Dec 2012 04:13:15 +0000 (20:13 -0800)]
am
76277df2: am
5f7b668c: misc changes for landing pages
* commit '
76277df27c4d4df39321c400bd5adece32a59b58':
misc changes for landing pages
Scott Main [Sat, 1 Dec 2012 04:11:04 +0000 (20:11 -0800)]
am
5f7b668c: misc changes for landing pages
* commit '
5f7b668c966a886d5893ff89af59785fab9523f9':
misc changes for landing pages
Scott Main [Sat, 1 Dec 2012 00:50:00 +0000 (16:50 -0800)]
misc changes for landing pages
Change-Id: I4eff32dccbb111b419bb733035c7a145ac3944b6
Amith Yamasani [Sat, 1 Dec 2012 02:44:36 +0000 (18:44 -0800)]
am
c566b43d: Fix crosstalk between users for widgets hosted in lockscreen
* commit '
c566b43d02596cba437e9a2723e9f989297cca72':
Fix crosstalk between users for widgets hosted in lockscreen
Amith Yamasani [Fri, 30 Nov 2012 23:26:21 +0000 (15:26 -0800)]
Fix crosstalk between users for widgets hosted in lockscreen
This was initially about the Clock widget crashing repeatedly on some
devices with multiple users. Turned out that there were race conditions
when switching users that could result in remote views of one user calling
back to the RemoteViewsAdapter in keyguard that in turn sent an incorrect widget id
to a different user's widget, resulting in a crash.
Since KeyguardHostView is instantiated in the same process for different users,
it needs to carry a user identity to pass along to AppWidgetService so that
remote views services were bound to the correct user and callbacks were attached and
detached properly.
Added some aidl calls that take the userId to do the binding properly. A more
complete fix might be needed in the future so that all calls from Keyguard carry
the user id.
Also, there was a problem in comparing host uid for secondary users, since Settings
for a secondary user has a different uid than keyguard. Not an issue on single-user
systems. Changed the host.uid comparison to accomodate for the secondary user.
Bug:
7450247
Change-Id: Idbc36e3c60023cac74174f6cb7f2b2130dd3052c
Fabrice Di Meglio [Sat, 1 Dec 2012 01:18:49 +0000 (17:18 -0800)]
am
20b76b9f: am
1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
* commit '
20b76b9fff076241fe305fc99be3be7ab7d10407':
Fix typos in LinearLayout comments
Fabrice Di Meglio [Sat, 1 Dec 2012 01:17:03 +0000 (17:17 -0800)]
am
1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
* commit '
1e761ded55695a9d76a6f00ee9504625581e8d3a':
Fix typos in LinearLayout comments
Fabrice Di Meglio [Sat, 1 Dec 2012 01:14:11 +0000 (17:14 -0800)]
Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
Scott Main [Sat, 1 Dec 2012 01:08:59 +0000 (17:08 -0800)]
am
ed3d92ae: am
404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
* commit '
ed3d92aea49422c0e5ec117a04fe573ea141962a':
docs: gcm navtree
Scott Main [Sat, 1 Dec 2012 01:07:11 +0000 (17:07 -0800)]
am
404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
* commit '
404eeee14521e8b181a9ed28c2291e9389dcf3b1':
docs: gcm navtree
Scott Main [Sat, 1 Dec 2012 01:04:31 +0000 (17:04 -0800)]
Merge "docs: gcm navtree" into jb-mr1-dev
Robert Ly [Sat, 1 Dec 2012 01:02:22 +0000 (17:02 -0800)]
docs: gcm navtree
Change-Id: Ie20a0cc7caf8e0b5ff2a6f56ddc3932f25768fa3
Quddus Chong [Sat, 1 Dec 2012 00:44:29 +0000 (16:44 -0800)]
am
3a195029: am
51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
* commit '
3a195029066fab3bae5797003314e3fa5bbf7e29':
docs: Fixed typo in android tool syntax.
Craig Mautner [Sat, 1 Dec 2012 00:42:56 +0000 (16:42 -0800)]
am
46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev
* commit '
46732445b4c02c225544851cb6cf848ec0583494':
Include child windows when looking for insertion point.
Quddus Chong [Sat, 1 Dec 2012 00:41:49 +0000 (16:41 -0800)]
am
51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
* commit '
51f5bcac5269b44cd312d16569357416da7b3a82':
docs: Fixed typo in android tool syntax.
Fabrice Di Meglio [Sat, 1 Dec 2012 00:41:12 +0000 (16:41 -0800)]
am
ce463847: Merge "Fix bug #
7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
* commit '
ce463847db68afbb796377c6a55209e102774f8c':
Fix bug #
7651552 resetRtlProperties() is called way too often
Quddus Chong [Sat, 1 Dec 2012 00:38:50 +0000 (16:38 -0800)]
Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
Craig Mautner [Sat, 1 Dec 2012 00:38:36 +0000 (16:38 -0800)]
Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev
Robert Ly [Sat, 1 Dec 2012 00:38:12 +0000 (16:38 -0800)]
am
27dcf445: am
037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
* commit '
27dcf445eb66ea032992ff30b3cd36770e1ab929':
docs: update javadocs with gcm @value stuff
Fabrice Di Meglio [Sat, 1 Dec 2012 00:36:57 +0000 (16:36 -0800)]
Merge "Fix bug #
7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
Robert Ly [Sat, 1 Dec 2012 00:36:05 +0000 (16:36 -0800)]
am
037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
* commit '
037b7944bdd5909c503cdc959b0105ebb0ecca92':
docs: update javadocs with gcm @value stuff
Robert Ly [Sat, 1 Dec 2012 00:33:51 +0000 (16:33 -0800)]
Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
Quddus Chong [Sat, 1 Dec 2012 00:26:35 +0000 (16:26 -0800)]
docs: Fixed typo in android tool syntax.
Change-Id: Ic40f10e3f6b7c052dc40cb723f40956a750544e8
Robert Ly [Sat, 1 Dec 2012 00:15:46 +0000 (16:15 -0800)]
docs: update javadocs with gcm @value stuff
Change-Id: I837a1734e00d61f74cf8faac78f75258d66b6d05
Craig Mautner [Sat, 1 Dec 2012 00:14:45 +0000 (16:14 -0800)]
Include child windows when looking for insertion point.
After finding a window in the window list we turn around and look in
the AppWindowToken.windows list for it. If it is a child of a window
in that list we should use the parent windows index as the search
result. Instead we gave up and ended up inserting the window at the
beginning of the windows list.
Bug
7357465 fixed.
Change-Id: If77f343b8597bfbb0b7fa41dedf7972d78d03020
Jim Miller [Sat, 1 Dec 2012 00:00:17 +0000 (16:00 -0800)]
am
e431e6a3: Merge "Add logging to try and track down bug
7643792" into jb-mr1.1-dev
* commit '
e431e6a352125f2c51507130cc64e3405625a7ec':
Add logging to try and track down bug
7643792
Jim Miller [Fri, 30 Nov 2012 23:57:45 +0000 (15:57 -0800)]
Merge "Add logging to try and track down bug
7643792" into jb-mr1.1-dev
Jim Miller [Fri, 30 Nov 2012 23:42:18 +0000 (15:42 -0800)]
Add logging to try and track down bug
7643792
Fix whitespace & log message.
Change-Id: I9d241365503a6a9b02d3155dbb06ddb82065b375
Dirk Dougherty [Fri, 30 Nov 2012 23:41:21 +0000 (15:41 -0800)]
am
0a40f2d4: am
23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev
* commit '
0a40f2d4d28d99a6cd1216f3aa47cb10d6b905cc':
Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
Nicolas Klein [Fri, 30 Nov 2012 23:41:10 +0000 (15:41 -0800)]
am
5ea914f2: am
759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
* commit '
5ea914f21b397ae57195decd0b5e37544d85db8c':
Fix some typos and missing @param in android.os.Bundle
Dirk Dougherty [Fri, 30 Nov 2012 23:38:19 +0000 (15:38 -0800)]
am
23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev
* commit '
23b4e5b1b5c3af565f2af87be243e7b455002ae7':
Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
Dirk Dougherty [Fri, 30 Nov 2012 23:35:47 +0000 (15:35 -0800)]
Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev
Dirk Dougherty [Thu, 29 Nov 2012 02:53:10 +0000 (18:53 -0800)]
Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
Change-Id: I75826e12bb255e1fe85822b8c51e750ada01dfc5
Fabrice Di Meglio [Fri, 30 Nov 2012 23:32:56 +0000 (15:32 -0800)]
Fix bug #
7651552 resetRtlProperties() is called way too often
- remove unnecessary calls to resetRtlProperties().
- now reset of RTL properties will only be done when adding a View
(and no more when removing it)
Change-Id: I0d42128c9f7df6085fb92bb5af5c9bd4d1ba88a3
Nicolas Klein [Fri, 30 Nov 2012 22:54:50 +0000 (14:54 -0800)]
am
759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
* commit '
759c1005b3f96ea8bbf59192d206aacece315655':
Fix some typos and missing @param in android.os.Bundle
Nicolas Klein [Fri, 30 Nov 2012 22:50:37 +0000 (14:50 -0800)]
Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
Nicolas Klein [Fri, 30 Nov 2012 22:41:46 +0000 (14:41 -0800)]
Fix some typos and missing @param in android.os.Bundle
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.
Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
Robert Ly [Fri, 30 Nov 2012 22:38:18 +0000 (14:38 -0800)]
am
b67ab7cc: am
648de548: Merge "docs: gms fixes" into jb-mr1-dev
* commit '
b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
docs: gms fixes
Robert Ly [Fri, 30 Nov 2012 22:35:48 +0000 (14:35 -0800)]
am
648de548: Merge "docs: gms fixes" into jb-mr1-dev
* commit '
648de5483b20bd80bda267a4430daca2ae0b089a':
docs: gms fixes
Robert Ly [Fri, 30 Nov 2012 22:31:42 +0000 (14:31 -0800)]
Merge "docs: gms fixes" into jb-mr1-dev
John Spurlock [Fri, 30 Nov 2012 21:24:39 +0000 (13:24 -0800)]
am
4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev
* commit '
4015c3f815fa83e67aa72d2c474e7e6f4c2dd5d0':
Only show camera widget to setup users.
John Spurlock [Fri, 30 Nov 2012 21:20:09 +0000 (13:20 -0800)]
Merge "Only show camera widget to setup users." into jb-mr1.1-dev
Daniel Sandler [Fri, 30 Nov 2012 21:17:22 +0000 (13:17 -0800)]
am
924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
* commit '
924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
Add constant for Daydream settings.
Robert Ly [Fri, 30 Nov 2012 21:17:15 +0000 (13:17 -0800)]
am
861c55ff: am
2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '
861c55ffcc854563f4adec0b094c1b6948c72036':
docs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 21:17:11 +0000 (13:17 -0800)]
am
1c92ce10: am
24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
* commit '
1c92ce10b5123bc374f8cba2c61c4c56f9d4f319':
Revert "docs: gms javadocs"
Svetoslav Ganov [Fri, 30 Nov 2012 21:17:08 +0000 (13:17 -0800)]
am
0e7adaff: am
438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
* commit '
0e7adaff99778c596bfd3f4c1e42710592c472a2':
Cannot move edit text cursor to first position using character granularity.
Jason Sams [Fri, 30 Nov 2012 21:16:57 +0000 (13:16 -0800)]
am
718fb9f1: Fix sample code issues
* commit '
718fb9f12e31d92e8a81b08f0f2d818dd3654b9c':
Fix sample code issues
Daniel Sandler [Fri, 30 Nov 2012 21:03:07 +0000 (13:03 -0800)]
Merge "Add constant for Daydream settings." into jb-mr1.1-dev
Robert Ly [Fri, 30 Nov 2012 20:40:43 +0000 (12:40 -0800)]
am
2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '
2dd93e22b6504eda5fb35f8f9e58ddb3f4a22fea':
docs: add correct toc for google reference
Robert Ly [Fri, 30 Nov 2012 20:40:40 +0000 (12:40 -0800)]
am
24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
* commit '
24963e1f7b7ba2712618b8c0ff1750c47ad1c789':
Revert "docs: gms javadocs"
Svetoslav Ganov [Fri, 30 Nov 2012 20:40:37 +0000 (12:40 -0800)]
am
438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
* commit '
438a3b35f7a6184a19919de90f733be82e21a84c':
Cannot move edit text cursor to first position using character granularity.
Jason Sams [Fri, 30 Nov 2012 03:02:18 +0000 (19:02 -0800)]
Fix sample code issues
Correct min SDK.
Correct file extension on mandelbrot
Change-Id: I508c22c382f1a930b27d8c5f4414cac3a990a332
Robert Ly [Fri, 30 Nov 2012 20:12:32 +0000 (12:12 -0800)]
Merge "docs: add correct toc for google reference" into jb-mr1-dev
Robert Ly [Fri, 30 Nov 2012 19:58:19 +0000 (11:58 -0800)]
docs: add correct toc for google reference
Change-Id: I594794b8d7ed5c52acdc37d5a4eddd2fdd229bcd
Robert Ly [Fri, 30 Nov 2012 19:52:43 +0000 (11:52 -0800)]
Merge "Revert "docs: gms javadocs"" into jb-mr1-dev
Svetoslav Ganov [Fri, 30 Nov 2012 19:43:54 +0000 (11:43 -0800)]
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
Martijn Coenen [Fri, 30 Nov 2012 19:09:43 +0000 (11:09 -0800)]
am
b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
* commit '
b1a01ab01c2aa5136f7781c3a6ec682590e38ac4':
Allow the NFC process to call Bluetooth APIs.
Martijn Coenen [Fri, 30 Nov 2012 19:07:53 +0000 (11:07 -0800)]
Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
Dianne Hackborn [Fri, 30 Nov 2012 18:45:02 +0000 (10:45 -0800)]
am
675814d4: Merge "Maybe fix issue #
7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
* commit '
675814d488579582e0214cc720d9ccc310173f25':
Maybe fix issue #
7596986: Frequent runtime restarts; IAE at...
Dianne Hackborn [Fri, 30 Nov 2012 18:41:47 +0000 (10:41 -0800)]
Merge "Maybe fix issue #
7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev
Nick Kralevich [Fri, 30 Nov 2012 18:38:21 +0000 (10:38 -0800)]
am
849f5188: am
6643ea82: resolved conflicts for merge of
011132a7 to jb-mr1-dev
* commit '
849f5188e34ea667b689e795d88411a2412db2e8':
Secure a handful of framework broadcasts
Nick Kralevich [Fri, 30 Nov 2012 18:35:44 +0000 (10:35 -0800)]
am
6643ea82: resolved conflicts for merge of
011132a7 to jb-mr1-dev
* commit '
6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
Secure a handful of framework broadcasts
Nick Kralevich [Fri, 30 Nov 2012 18:23:56 +0000 (10:23 -0800)]
resolved conflicts for merge of
011132a7 to jb-mr1-dev
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
Daniel Sandler [Fri, 30 Nov 2012 18:07:01 +0000 (10:07 -0800)]
am
0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
* commit '
0a6620e8615ade341336730a5aa9f0e62a295c9f':
Suppress quick settings if setup has not been completed.
Robert Greenwalt [Fri, 30 Nov 2012 18:05:33 +0000 (10:05 -0800)]
am
b8da0376: Secure a handful of framework broadcasts
* commit '
b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
Secure a handful of framework broadcasts
Daniel Sandler [Fri, 30 Nov 2012 18:05:01 +0000 (10:05 -0800)]
Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev
Scott Main [Fri, 30 Nov 2012 18:01:19 +0000 (10:01 -0800)]
am
73117424: am
580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '
73117424029ce1983f2f0a2f706d08e1f5870955':
docs: gms and gcm javadocs
Scott Main [Fri, 30 Nov 2012 17:59:42 +0000 (09:59 -0800)]
am
580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev
* commit '
580aa579080b5f4ccddb31964bc0caa76ee73a7a':
docs: gms and gcm javadocs
Scott Main [Fri, 30 Nov 2012 17:56:48 +0000 (09:56 -0800)]
Merge "docs: gms and gcm javadocs" into jb-mr1-dev
Scott Main [Fri, 30 Nov 2012 17:52:22 +0000 (09:52 -0800)]
am
3cddba24: am
b74844cd: docs: revise doc titles
* commit '
3cddba247e4f9c188cc654a0c3df9db693874199':
docs: revise doc titles
Scott Main [Fri, 30 Nov 2012 17:49:51 +0000 (09:49 -0800)]
am
b74844cd: docs: revise doc titles
* commit '
b74844cd87160a21a77cdc1c35b3d19ce9f47249':
docs: revise doc titles
Scott Main [Fri, 30 Nov 2012 05:13:30 +0000 (21:13 -0800)]
docs: revise doc titles
Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd
Makoto Onuki [Fri, 30 Nov 2012 17:36:11 +0000 (09:36 -0800)]
am
c50ed032: Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
* commit '
c50ed032c71069893d9ad0bb81ee8013fdd44d66':
Remove unused IExtendedNetworkService
Makoto Onuki [Fri, 30 Nov 2012 17:33:09 +0000 (09:33 -0800)]
Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev
Eric Laurent [Fri, 30 Nov 2012 17:28:56 +0000 (09:28 -0800)]
am
c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
* commit '
c3eb57b22f930f07448e877f0814eb5659bfc3c5':
AudioService: improve initial safe volume delay
Eric Laurent [Fri, 30 Nov 2012 17:26:30 +0000 (09:26 -0800)]
Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev
Daniel Sandler [Fri, 30 Nov 2012 15:29:46 +0000 (07:29 -0800)]
am
386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
* commit '
386165a3ae09b150165e8e7c310e194231071271':
Only show "charging" if the battery is really charging.
Daniel Sandler [Fri, 30 Nov 2012 15:27:36 +0000 (07:27 -0800)]
Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
John Spurlock [Fri, 30 Nov 2012 14:20:43 +0000 (09:20 -0500)]
Only show camera widget to setup users.
And remove misspelled and unused field in KeyguardHostView.
Bug:
7645811
Change-Id: I3d6ceae8d25d0af7b504b4c22782611d25462a62
Robert Ly [Fri, 30 Nov 2012 12:02:04 +0000 (04:02 -0800)]
docs: gms and gcm javadocs
Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e
Robert Ly [Fri, 30 Nov 2012 11:07:11 +0000 (03:07 -0800)]
docs: gms fixes
Change-Id: I197678e85ea2d11f35ccecdd7abc9564035acad4
Robert Ly [Fri, 30 Nov 2012 08:18:20 +0000 (00:18 -0800)]
Revert "docs: gms javadocs"
This reverts commit
830b23b76676542cbcb5ef3c60c869460d4c5466
Change-Id: I75a9d4f6aa424ed4439b4415d575716a40b75343
Dirk Dougherty [Fri, 30 Nov 2012 05:17:03 +0000 (21:17 -0800)]
am
a4f67a88: am
49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit '
a4f67a88f421c454cb07a59e9ce5b0b720df55fc':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Dirk Dougherty [Fri, 30 Nov 2012 05:15:04 +0000 (21:15 -0800)]
am
49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
* commit '
49be1ef39cfa2c718cb56dee088338ea97019c11':
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Dirk Dougherty [Fri, 30 Nov 2012 05:11:24 +0000 (21:11 -0800)]
Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:09:05 +0000 (21:09 -0800)]
am
a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
a1b3b99c7f1c53648b4d2e631a1042be27173cd1':
Import translations. DO NOT MERGE
Dirk Dougherty [Fri, 30 Nov 2012 01:25:09 +0000 (17:25 -0800)]
Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
Baligh Uddin [Fri, 30 Nov 2012 05:07:30 +0000 (21:07 -0800)]
am
2c2b232b: am
2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2c2b232b4135e1534b00fb2690c72c0dc9266b2f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:05:08 +0000 (21:05 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:06:04 +0000 (21:06 -0800)]
am
2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2138e5c0f6b78e0e248945da498bd716c928505f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:02:54 +0000 (21:02 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:01:57 +0000 (21:01 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Scott Main [Fri, 30 Nov 2012 03:07:26 +0000 (19:07 -0800)]
am
48e794da: am
9748abb6: docs: add maps v2 announcement
* commit '
48e794dac4135a626b8b2135874331ffe3ace34f':
docs: add maps v2 announcement