OSDN Git Service
Scott Main [Tue, 28 May 2013 15:58:18 +0000 (08:58 -0700)]
am
005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
* commit '
005d2afb308f474352ec4b504cf661851e4c2e59':
docs: SDK and ADT r22.0.1 Release Notes
Scott Main [Tue, 28 May 2013 15:57:27 +0000 (08:57 -0700)]
am
fb22f9cb: am
5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '
fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 15:56:23 +0000 (15:56 +0000)]
Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev
Scott Main [Tue, 28 May 2013 15:54:59 +0000 (08:54 -0700)]
am
5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
* commit '
5d64a1932d6c94628442b811c4be7bc41f0f1a8f':
update GPS setup page to include emulator support. revise the doc layout with headings
Scott Main [Tue, 28 May 2013 15:53:04 +0000 (15:53 +0000)]
Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev
Scott Main [Tue, 28 May 2013 15:39:42 +0000 (08:39 -0700)]
am
718011ac: am
d4b710c6: new android studio download v0.1.1
* commit '
718011ac851dcd8925ebeaf4f5516b7b1b62a647':
new android studio download v0.1.1
Scott Main [Tue, 28 May 2013 15:37:35 +0000 (08:37 -0700)]
am
d4b710c6: new android studio download v0.1.1
* commit '
d4b710c69800acd0a9237a64e73d62ac9ba3a517':
new android studio download v0.1.1
Scott Main [Thu, 23 May 2013 22:33:05 +0000 (15:33 -0700)]
new android studio download v0.1.1
Change-Id: I3a504365942fcf74b20ce06ae5356e4c05e53a95
Scott Main [Fri, 24 May 2013 17:54:24 +0000 (10:54 -0700)]
update GPS setup page to include emulator support.
revise the doc layout with headings
Change-Id: If063782474e4187779dbc1fd23743fa87a69d316
Scott Main [Fri, 24 May 2013 16:38:57 +0000 (09:38 -0700)]
update eclipse download URL; /mobile URL will be deprecated
Change-Id: I18117d83e01c7f2a3a9c325b4cb84ec4fa6911f4
Scott Main [Thu, 23 May 2013 22:43:37 +0000 (15:43 -0700)]
clean up the results for 'android' in search suggestions
Change-Id: Ia89dce3b2b911f4eaffbe1a224749cda39f65984
Joe Fernandez [Thu, 23 May 2013 05:19:29 +0000 (22:19 -0700)]
docs: SDK and ADT r22.0.1 Release Notes
Change-Id: I64fca371d2456f88c17309aaf5cef693792fcd58
Joe Fernandez [Thu, 23 May 2013 21:04:41 +0000 (14:04 -0700)]
am
a8b2186b: am
a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
* commit '
a8b2186b09a0f79b746d0fbab3611d95877af5fe':
docs: Add FileProvider to Support Library r13 Release Notes
Joe Fernandez [Thu, 23 May 2013 21:01:23 +0000 (14:01 -0700)]
am
a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
* commit '
a502c59e679c1b355d6ad3387449d82c590d84cf':
docs: Add FileProvider to Support Library r13 Release Notes
Joe Fernandez [Thu, 23 May 2013 18:16:09 +0000 (11:16 -0700)]
docs: Add FileProvider to Support Library r13 Release Notes
Change-Id: I9a87312f1bb5d4a18c720a9c3d3a558240450f6d
kmccormick [Thu, 23 May 2013 17:54:10 +0000 (10:54 -0700)]
am
84fb096e: am
e56e2483: am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:51:49 +0000 (10:51 -0700)]
am
e56e2483: am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
e56e2483c57f9d6a12421ca7e124e7ec0e61f0ab':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:49:58 +0000 (10:49 -0700)]
am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:47:13 +0000 (10:47 -0700)]
am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
c6c149aa14610925158ef1ba6320c9356e45e631':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:45:26 +0000 (17:45 +0000)]
Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
kmccormick [Thu, 23 May 2013 01:25:21 +0000 (18:25 -0700)]
Doc update: fix GCM TOC
Change-Id: I38753475fdf6c33d80e0e099cb6c5dcf2f05de0b
Scott Main [Thu, 23 May 2013 00:08:20 +0000 (17:08 -0700)]
am
38b9aaa0: am
2cc84c63: add VID for Haier to docs
* commit '
38b9aaa0fc1b49fa4e734bb0eba28711b6b0d165':
add VID for Haier to docs
Scott Main [Thu, 23 May 2013 00:06:45 +0000 (17:06 -0700)]
am
2cc84c63: add VID for Haier to docs
* commit '
2cc84c638a3a1048d9704a8c987d1436dd27fcd6':
add VID for Haier to docs
Scott Main [Wed, 22 May 2013 15:34:49 +0000 (08:34 -0700)]
add VID for Haier to docs
Change-Id: I3999d2b9d712ac3f5d2ce6325a30d07a743dbc15
Adam Koch [Wed, 22 May 2013 13:49:43 +0000 (06:49 -0700)]
am
4f6d0cbd: am
7258e6bc: am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
4f6d0cbdd9372754b1b5b112e2b724b3852ac12b':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:45:33 +0000 (06:45 -0700)]
am
7258e6bc: am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
7258e6bc57fb3cb023a4ca219f1355cf55ea93bf':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:43:16 +0000 (06:43 -0700)]
am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
1fc7e59b3301bb74223393354571ad4e6b7ecfce':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:41:26 +0000 (06:41 -0700)]
am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
14233ee5d06c468f953dff2d900a9cf32f9737c0':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:36:57 +0000 (13:36 +0000)]
Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
Dirk Dougherty [Tue, 21 May 2013 17:19:39 +0000 (10:19 -0700)]
am
a3d5a7a9: am
0269b3dd: am
6a4214f0: am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
a3d5a7a90fc9029e82e9e5cb64e789854ef99506':
Doc change: fix doc title.
Dirk Dougherty [Tue, 21 May 2013 17:14:58 +0000 (10:14 -0700)]
am
0269b3dd: am
6a4214f0: am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
0269b3dde009650192a3a746929e5f4c8b54e0c2':
Doc change: fix doc title.
Scott Main [Tue, 21 May 2013 17:14:03 +0000 (10:14 -0700)]
am
e6fbd9ed: am
86c25dec: add search tag for swipe view lesson
* commit '
e6fbd9ed6f9bda28d1279d4b762d8f0ab885ab47':
add search tag for swipe view lesson
Dirk Dougherty [Tue, 21 May 2013 17:12:55 +0000 (10:12 -0700)]
am
6a4214f0: am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
6a4214f065d05e9ec0480929c2ed800d0e3a86f8':
Doc change: fix doc title.
Scott Main [Tue, 21 May 2013 17:11:41 +0000 (10:11 -0700)]
am
86c25dec: add search tag for swipe view lesson
* commit '
86c25decc05bcf9f3085ccbcfb18e31d6d010970':
add search tag for swipe view lesson
Dirk Dougherty [Tue, 21 May 2013 17:07:03 +0000 (10:07 -0700)]
am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
a963459e3f96f2b27d87e3fccdfa8fb98f0f9ab6':
Doc change: fix doc title.
Dirk Dougherty [Tue, 21 May 2013 17:05:08 +0000 (17:05 +0000)]
Merge "Doc change: fix doc title." into jb-mr1.1-docs
Dirk Dougherty [Tue, 21 May 2013 17:03:35 +0000 (10:03 -0700)]
Doc change: fix doc title.
Change-Id: I2303ef05df89780ab3fa396b248097ea1115bb05
Adam Koch [Tue, 21 May 2013 13:47:55 +0000 (09:47 -0400)]
Doc change: fix minor typo in ContactsContract.RawContacts.
Change-Id: I31dbc85449fa81c9f5ea61fdaa0d4a89cf97cd86
Scott Main [Tue, 21 May 2013 03:54:31 +0000 (20:54 -0700)]
add search tag for swipe view lesson
Change-Id: I4e880dbe6d77c89eff7e9b56c4ec98d8b7df906d
Scott Main [Tue, 21 May 2013 01:53:18 +0000 (18:53 -0700)]
am
66e965dd: am
2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
* commit '
66e965dd0fec17a87781821f7a360964a075f18f':
delete orphaned and obsolete files
Scott Main [Tue, 21 May 2013 01:48:02 +0000 (18:48 -0700)]
am
2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
* commit '
2377da025abafe367359d8b2d9d1fecb615f7733':
delete orphaned and obsolete files
Scott Main [Tue, 21 May 2013 01:46:17 +0000 (01:46 +0000)]
Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
Dirk Dougherty [Tue, 21 May 2013 01:15:43 +0000 (18:15 -0700)]
am
45e87f4e: am
0775c1ba: am
b3d79b44: am
4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
* commit '
45e87f4ebe9ddde27dd5e0e28267c433c30b476b':
Doc change: fix tiny url.
Scott Main [Tue, 21 May 2013 00:26:25 +0000 (17:26 -0700)]
delete orphaned and obsolete files
Change-Id: I2e199ce5ff5c4e4c9622897eed0072c3aba02bc4
Dirk Dougherty [Tue, 21 May 2013 01:12:29 +0000 (18:12 -0700)]
am
0775c1ba: am
b3d79b44: am
4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
* commit '
0775c1ba90633c9d00116299a57ecd84142e67c8':
Doc change: fix tiny url.
Dirk Dougherty [Tue, 21 May 2013 01:11:22 +0000 (18:11 -0700)]
am
b3d79b44: am
4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
* commit '
b3d79b44ebb32bc3f9505a895728ad0a8a16ed2f':
Doc change: fix tiny url.
Dirk Dougherty [Tue, 21 May 2013 01:09:46 +0000 (18:09 -0700)]
am
4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
* commit '
4a3c55846ad488e68236837504ffd953498eb9fb':
Doc change: fix tiny url.
Dirk Dougherty [Tue, 21 May 2013 01:07:33 +0000 (01:07 +0000)]
Merge "Doc change: fix tiny url." into jb-mr1.1-docs
Scott Main [Mon, 20 May 2013 22:04:03 +0000 (15:04 -0700)]
am
6f190a71: am
0d3f6eda: add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
* commit '
6f190a71c5344f35bc05b80a7630cd8415b9dada':
add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
Scott Main [Mon, 20 May 2013 21:58:58 +0000 (14:58 -0700)]
am
0d3f6eda: add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
* commit '
0d3f6eda6ce63592da4d11841a195948d8d0b5d3':
add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
Scott Main [Mon, 20 May 2013 21:56:44 +0000 (14:56 -0700)]
add redirects for devsite, as per I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
Change-Id: Iea8a519c8d1888b89f4849e9290fa191f495581d
Scott Main [Mon, 20 May 2013 21:50:51 +0000 (14:50 -0700)]
am
b7d1f69a: am
84668136: Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev
* commit '
b7d1f69a7e4710b13308afc9018adb1ecd9e47c2':
delete obsolete duplicate files
Scott Main [Mon, 20 May 2013 21:47:34 +0000 (14:47 -0700)]
am
84668136: Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev
* commit '
8466813637cf2b1f5f12f8524237aed6c95ad4e9':
delete obsolete duplicate files
Scott Main [Mon, 20 May 2013 21:47:27 +0000 (14:47 -0700)]
am
efb6884c: am
3ff66535: add notice about corrupt DMG message bug:
8859130
* commit '
efb6884c3640b4c5f1307b8d109cc740597c6cfb':
add notice about corrupt DMG message bug:
8859130
Scott Main [Mon, 20 May 2013 21:44:16 +0000 (14:44 -0700)]
am
3ff66535: add notice about corrupt DMG message bug:
8859130
* commit '
3ff6653525fbda7e1bf5e06f59b5474e390f6de1':
add notice about corrupt DMG message bug:
8859130
Scott Main [Mon, 20 May 2013 21:43:33 +0000 (21:43 +0000)]
Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev
Scott Main [Mon, 20 May 2013 21:35:30 +0000 (14:35 -0700)]
add notice about corrupt DMG message
bug:
8859130
Change-Id: I6fffcbdd7d57235cb1fdc9861b569f6feedba6c5
Scott Main [Mon, 20 May 2013 21:23:44 +0000 (14:23 -0700)]
delete obsolete duplicate files
Change-Id: I715362c1dc7022581faf8653ec49da49b3c6ed4a
Alex Klyubin [Mon, 20 May 2013 21:13:19 +0000 (14:13 -0700)]
am
bce05d91: am
45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
* commit '
bce05d9125d7c9bf536bc6cb1758c7cd3e485166':
cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
Alex Klyubin [Mon, 20 May 2013 21:10:39 +0000 (14:10 -0700)]
am
45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
* commit '
45e56fd5e1d3747cc1a9f1ecd5883ee491bff532':
cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
Alex Klyubin [Mon, 20 May 2013 20:43:22 +0000 (13:43 -0700)]
cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276
Switch APK signing from MD5WithRSA to SHA1WithRSA.
While we're at it, remove duplicates of app-signing.jd.
Change-Id: I3b5441bc61107a4f6d9b67366517785e6792cf9e
Dirk Dougherty [Mon, 20 May 2013 20:45:04 +0000 (13:45 -0700)]
Doc change: fix tiny url.
Change-Id: Iea59aadd7b83e8f076e65b75fbb4bd9109e26307
Scott Main [Mon, 20 May 2013 19:30:38 +0000 (12:30 -0700)]
am
f657689a: am
f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev
* commit '
f657689ab5b7d46e5f3c9dd376c0cb89479a1075':
update video playlists and marquee announcements
Scott Main [Mon, 20 May 2013 19:28:54 +0000 (12:28 -0700)]
am
f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev
* commit '
f943b6def746217db06fc7c33e4d181fc55b87be':
update video playlists and marquee announcements
Scott Main [Mon, 20 May 2013 19:26:48 +0000 (19:26 +0000)]
Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev
Scott Main [Mon, 20 May 2013 18:54:36 +0000 (11:54 -0700)]
update video playlists and marquee announcements
Change-Id: I853a30370bb79d3f392da11e24358c15d42005e5
Scott Main [Fri, 17 May 2013 01:05:13 +0000 (18:05 -0700)]
am
ec5c93e0: am
df82d256: add info about Windows issue and link to issues page
* commit '
ec5c93e0ecd92223a20c049b03f183c588391592':
add info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 01:03:12 +0000 (18:03 -0700)]
am
df82d256: add info about Windows issue and link to issues page
* commit '
df82d256592d6743e400ccf1c82822ddb56fefbe':
add info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 00:58:11 +0000 (17:58 -0700)]
add info about Windows issue and link to issues page
Change-Id: I07f1962fd00fc87c783e090f3e6986449f7b6f7c
Scott Main [Thu, 16 May 2013 22:09:40 +0000 (15:09 -0700)]
am
26ab3060: am
c452f1e2: add nav drawer icon zip
* commit '
26ab3060ad402204c8a50e184c3947a897667642':
add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:07:46 +0000 (15:07 -0700)]
am
c452f1e2: add nav drawer icon zip
* commit '
c452f1e251ca7aa26a2cfbb04e2f1086f18ca5df':
add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:02:02 +0000 (15:02 -0700)]
add nav drawer icon zip
Change-Id: I1eef61cb27ec2b50c88d6d8aa3a34495e2d4c029
Scott Main [Thu, 16 May 2013 17:52:04 +0000 (10:52 -0700)]
am
14f1a995: am
67823512: add links to nav drawer icons
* commit '
14f1a9959311258eea47d1fd1c30b82ceddc9808':
add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:50:13 +0000 (10:50 -0700)]
am
67823512: add links to nav drawer icons
* commit '
678235122bb61304a36731e7a4ab1f4ad666980f':
add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:41:15 +0000 (10:41 -0700)]
add links to nav drawer icons
Change-Id: I97cf24421542d70402488f8c193c7bcc7ef7edd5
Dirk Dougherty [Thu, 16 May 2013 07:35:37 +0000 (00:35 -0700)]
am
d73dee30: am
a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev
* commit '
d73dee305b7b3b75fe2b6d5d4a99e35d65e06f85':
Doc change: change contact form for optimization tips review decisions.
Dirk Dougherty [Thu, 16 May 2013 07:33:29 +0000 (00:33 -0700)]
am
a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev
* commit '
a012887a7856c29e77cd9b08fab16a6c26c93c57':
Doc change: change contact form for optimization tips review decisions.
Dirk Dougherty [Thu, 16 May 2013 07:31:53 +0000 (07:31 +0000)]
Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev
Dirk Dougherty [Thu, 16 May 2013 07:27:42 +0000 (00:27 -0700)]
Doc change: change contact form for optimization tips review decisions.
Change-Id: Ib4d5c5d4a5d078fb7b5612d5908515032e69f565
Scott Main [Wed, 15 May 2013 21:50:03 +0000 (14:50 -0700)]
am
65b68f4a: am
0c39152f: add tags to lessons in navigation class
* commit '
65b68f4a760dc029805aff5f1fa804a3420ac38c':
add tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:47:44 +0000 (14:47 -0700)]
am
0c39152f: add tags to lessons in navigation class
* commit '
0c39152fc6847c8332aed46fd944579806d583df':
add tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:38:16 +0000 (14:38 -0700)]
add tags to lessons in navigation class
Change-Id: Icab52c7aa3069b4cf700a9f2bc84a6d833b48621
Scott Main [Wed, 15 May 2013 17:40:26 +0000 (10:40 -0700)]
Scott Main [Wed, 15 May 2013 17:40:23 +0000 (10:40 -0700)]
am
0a008991: am
98599ee7: final android studio package info
* commit '
0a0089913292eaa099fcca78efc2c06e76d13f22':
final android studio package info
Scott Main [Wed, 15 May 2013 17:38:50 +0000 (10:38 -0700)]
Scott Main [Wed, 15 May 2013 17:38:47 +0000 (10:38 -0700)]
am
98599ee7: final android studio package info
* commit '
98599ee71eb1af403cd2f122dafc53c7aa380335':
final android studio package info
Scott Main [Wed, 15 May 2013 16:09:11 +0000 (09:09 -0700)]
typo
Change-Id: I3d8ea3b012d530b4f9212fbac159fce37cf36a03
Scott Main [Wed, 15 May 2013 15:45:39 +0000 (08:45 -0700)]
final android studio package info
Change-Id: I1ec2c09e46c0eb563d6be3eda3fa92e1d692378d
Dirk Dougherty [Wed, 15 May 2013 14:35:52 +0000 (07:35 -0700)]
am
b7059861: am
2694897a: am
787cbb37: am
9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '
b705986179b1bbda80c9281477a4d6b6b6d27e88':
Doc change: add redirects for edu urls.
Dirk Dougherty [Wed, 15 May 2013 14:35:49 +0000 (07:35 -0700)]
am
aa0acfc8: am
231e2474: Merge commit \'
c3069c26\' into manualmerge
* commit '
aa0acfc8761fc8802879f90511b904061a523ed2':
Doc change: updates to location landing.
Dirk Dougherty [Wed, 15 May 2013 14:33:18 +0000 (07:33 -0700)]
am
2694897a: am
787cbb37: am
9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '
2694897a3c20b79e3b28601ee43bcaefec827232':
Doc change: add redirects for edu urls.
Dirk Dougherty [Wed, 15 May 2013 14:33:16 +0000 (07:33 -0700)]
am
231e2474: Merge commit \'
c3069c26\' into manualmerge
* commit '
231e2474f283dc0a1962b45f1c16c5280a8937df':
Doc change: updates to location landing.
Dirk Dougherty [Wed, 15 May 2013 14:32:03 +0000 (07:32 -0700)]
am
787cbb37: am
9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '
787cbb37d5cb2334af80d8da1b8fa4286e845eee':
Doc change: add redirects for edu urls.
Dirk Dougherty [Wed, 15 May 2013 14:30:11 +0000 (07:30 -0700)]
Merge commit '
c3069c26' into manualmerge
Conflicts:
docs/html/guide/topics/location/strategies.jd
Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
Dirk Dougherty [Wed, 15 May 2013 13:38:32 +0000 (06:38 -0700)]
am
9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
* commit '
9a51dfd4e3e10411ede67743f85cdd510ba3eb90':
Doc change: add redirects for edu urls.
Dirk Dougherty [Wed, 15 May 2013 13:35:10 +0000 (06:35 -0700)]
am
8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docs
* commit '
8d59513030cbc61c37aec2d2a2343a9bfc03ae2d':
Doc change: updates to location landing.
Dirk Dougherty [Wed, 15 May 2013 13:34:31 +0000 (13:34 +0000)]
Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 13:33:06 +0000 (13:33 +0000)]
Merge "Doc change: updates to location landing." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 06:25:49 +0000 (23:25 -0700)]
Doc change: updates to location landing.
Change-Id: Id7862fd966d9e80bf23521620e964813ad9065a6
Dirk Dougherty [Wed, 15 May 2013 12:28:14 +0000 (05:28 -0700)]
am
c3727b78: am
260f110f: am
7929aafe: am
6402d93e: Doc change: add files for edu content.
* commit '
c3727b78faf23f84a4888d96a0e21716ac0cecb7':
Doc change: add files for edu content.