git.osdn.net Git - android-x86/frameworks-base.git/log

Luan Nguyen [Mon, 3 Nov 2014 21:22:12 +0000 (21:22 +0000)]

am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391

* commit '9b1bad22a2cc6ff4d996d40c7c1cbbd56200ec38':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 21:22:02 +0000 (21:22 +0000)]

am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a

* commit 'f05f8a3036730389ced119ee9f4a44f2af96e06e':

commit | commitdiff | tree

Natalie Masse [Mon, 3 Nov 2014 21:21:52 +0000 (21:21 +0000)]

am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58

* commit '471a354c870ea02c2742c92c7b819ca1b1567f6f':

commit | commitdiff | tree

Scott Rowe [Mon, 3 Nov 2014 21:21:48 +0000 (21:21 +0000)]

am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd

* commit 'f6768bac864cdf9ed99b088dc88da6b38df6911e':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 21:17:18 +0000 (21:17 +0000)]

am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575

* commit '2fb449e9190abe7b3181d623091df378bc682a7b':

commit | commitdiff | tree

Prashant Malani [Mon, 3 Nov 2014 21:17:14 +0000 (21:17 +0000)]

am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours

* commit '80c26ce0f6893b2c97b88800467332b69d793e4c':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 21:17:11 +0000 (21:17 +0000)]

am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473

* commit 'b50fd5d569d03292fa0b4c4306077efbab87f70e':

commit | commitdiff | tree

Luan Nguyen [Mon, 3 Nov 2014 21:17:07 +0000 (21:17 +0000)]

am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367

* commit '879b948e2bfed25877ff89ac316885394139cc11':

commit | commitdiff | tree

Luan Nguyen [Mon, 3 Nov 2014 21:15:58 +0000 (21:15 +0000)]

am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391

* commit 'dcea6fa9ad14e2b1ba4cce5c1f6acd08219494c5':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 21:15:54 +0000 (21:15 +0000)]

am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a

* commit 'cbabe5761296d60bd26a76dff710c00b86d55f69':

commit | commitdiff | tree

Natalie Masse [Mon, 3 Nov 2014 21:15:51 +0000 (21:15 +0000)]

am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58

* commit '7d3bd06d2928942c6eedbcf5e9437b43a1268a6d':

commit | commitdiff | tree

Scott Rowe [Mon, 3 Nov 2014 21:15:47 +0000 (21:15 +0000)]

am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd

* commit 'c51276ec1fddf67c7d31b35bdc0632098233fbb6':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 21:11:38 +0000 (21:11 +0000)]

am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb

* commit 'afa68731cf249f19a293c42fafd4daf074fe20bd':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 21:11:34 +0000 (21:11 +0000)]

am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8

* commit '6df786d3b6a86cf6d43bf5b9f431fcc070711dd7':

commit | commitdiff | tree

Ricardo Cervera-Navarro [Mon, 3 Nov 2014 21:11:30 +0000 (21:11 +0000)]

am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757

* commit '521f964a6e79aa913e42f2449dab9d2fe58cf7cb':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 21:11:23 +0000 (21:11 +0000)]

am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b

* commit 'ec4bc00674168c78a0adbd6f48e8733e16486558':

commit | commitdiff | tree

Eric Gilmore [Mon, 3 Nov 2014 21:11:14 +0000 (21:11 +0000)]

am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36

* commit 'e9324d0f8204a82db45cd86cc7cd3fb3025f9681':

commit | commitdiff | tree

Luan Nguyen [Mon, 3 Nov 2014 21:10:02 +0000 (21:10 +0000)]

am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97
automerge: 4182391

* commit '418239190b0d0e6921ee0e1e498a34bb7cddc392':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 21:08:45 +0000 (21:08 +0000)]

am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e
automerge: 3d76f6a

* commit '3d76f6a9578302e4c6c0de694ec7e0923f3cabe2':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 21:08:40 +0000 (21:08 +0000)]

am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575

* commit '031a08631900b7863b3ea228db50062633a2decd':

commit | commitdiff | tree

Prashant Malani [Mon, 3 Nov 2014 21:08:37 +0000 (21:08 +0000)]

am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours

* commit 'ee2802ebedf920b43bd199b807b4d413c8c8cf0a':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 21:08:34 +0000 (21:08 +0000)]

am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473

* commit '764e61ad3ffecb0bcde4d1d5569757f9674f0849':

commit | commitdiff | tree

Luan Nguyen [Mon, 3 Nov 2014 21:08:30 +0000 (21:08 +0000)]

am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367

* commit 'acbfd20d53b4caeb6e1bb1fc564fe795cde3a5bc':

commit | commitdiff | tree

Natalie Masse [Mon, 3 Nov 2014 21:07:41 +0000 (21:07 +0000)]

am 1e5bb861: Link and typo fixed automerge: bcf9ced
automerge: 9f6ea58

* commit '9f6ea5841c139bf061bc8b212b6f3183558235a1':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 21:06:16 +0000 (21:06 +0000)]

am 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e

* commit '194d2026a3fc685a0ed9afc8080060155a983c95':

commit | commitdiff | tree

Fred Fettinger [Mon, 3 Nov 2014 21:06:12 +0000 (21:06 +0000)]

am eeeebfff: am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours

* commit 'eeeebfff30ef1bcd916ed5bbb82c78f7216c0a7d':

commit | commitdiff | tree

Scott Rowe [Mon, 3 Nov 2014 21:05:48 +0000 (21:05 +0000)]

am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063
automerge: e0da6dd

* commit 'e0da6ddc08ff014bf2e5cd619451d95f5ac5663b':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 21:04:37 +0000 (21:04 +0000)]

am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27
automerge: d6ed575

* commit 'd6ed5752da2c741b43d7c4d4d33da955c4fc72b9':

commit | commitdiff | tree

Prashant Malani [Mon, 3 Nov 2014 21:03:23 +0000 (21:03 +0000)]

Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours
automerge: a8f4b8a -s ours

* commit 'a8f4b8a26055055cc5efa3a33862db6f5ca572a5':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 21:02:22 +0000 (21:02 +0000)]

am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308
automerge: 884b473

* commit '884b473ad8bccfef4e379de9034278ffa2113780':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 21:02:16 +0000 (21:02 +0000)]

am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb

* commit '841b7a21f164f8fd9bf3c870e635d48861738751':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 21:02:12 +0000 (21:02 +0000)]

am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8

* commit '87c4d66ddd45829559f70eb921d0dbea66ca9982':

commit | commitdiff | tree

Ricardo Cervera-Navarro [Mon, 3 Nov 2014 21:02:07 +0000 (21:02 +0000)]

am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757

* commit 'e3e6193ea040a25691b68a780f16ebed3f685d0e':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 21:01:59 +0000 (21:01 +0000)]

am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b

* commit '4f8a41cccdd7d7c8070d925decf4893b397cb7bc':

commit | commitdiff | tree

Eric Gilmore [Mon, 3 Nov 2014 21:01:54 +0000 (21:01 +0000)]

am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36

* commit '7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 21:00:56 +0000 (21:00 +0000)]

am 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02

* commit '16bc5859b728d3fb74a538679920cf3846505616':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 21:00:52 +0000 (21:00 +0000)]

am 0323f8a6: am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b

* commit '0323f8a685f25cb8f2d95b73fa098d9641005adb':

commit | commitdiff | tree

Luan Nguyen [Mon, 3 Nov 2014 20:59:12 +0000 (20:59 +0000)]

am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288
automerge: cc8b367

* commit 'cc8b36706cd976d8313ba35c238920079005578e':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 20:58:03 +0000 (20:58 +0000)]

am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a
automerge: 870afdb

* commit '870afdb39abdb308aee8d035f5e72251059f7af4':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 20:57:20 +0000 (20:57 +0000)]

am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e

* commit '7d35425b98d7228f1b6fc58e96a2b3b9333318c2':

commit | commitdiff | tree

Fred Fettinger [Mon, 3 Nov 2014 20:57:15 +0000 (20:57 +0000)]

am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours

* commit 'b33ca4f38c6b2a804fda7dad4cb488134b485130':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 20:56:59 +0000 (20:56 +0000)]

am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299
automerge: 469c8c8

* commit '469c8c898389368b7fb9f34c302d810565e29326':

commit | commitdiff | tree

Ricardo Cervera-Navarro [Mon, 3 Nov 2014 20:55:52 +0000 (20:55 +0000)]

am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b
automerge: 4687757

* commit '46877572906d932d27bc39f0a347d17607411282':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 20:54:50 +0000 (20:54 +0000)]

am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad
automerge: d84910b

* commit 'd84910b06b8d8af7de04f975e58a77e65f888374':

commit | commitdiff | tree

Eric Gilmore [Mon, 3 Nov 2014 20:53:40 +0000 (20:53 +0000)]

Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp
automerge: 068cb36

* commit '068cb36877144dc337766c1113250f5ebc2cbf6f':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 20:52:11 +0000 (20:52 +0000)]

am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02

* commit 'a77da17ecc64f6125c954892c6d2dabf1a317be5':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:52:07 +0000 (20:52 +0000)]

am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b

* commit '68f8326eb4c7e7b56130979dc366c0aba32aa9f8':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 20:51:40 +0000 (20:51 +0000)]

am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af

* commit '3eff8312c9c742cc75086d006ecdf36695327f93':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 20:51:37 +0000 (20:51 +0000)]

am 1daece6f: am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657

* commit '1daece6f4aaf679dbbe5ba4fd54d399e96ff4639':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 20:51:33 +0000 (20:51 +0000)]

am dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours

* commit 'dabb6c0596a06cd9427070a4202f733db3e13a9d':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 20:51:29 +0000 (20:51 +0000)]

am 10e749a5: am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90

* commit '10e749a5730db65ceb656627c72583fec44ab0f7':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 20:50:40 +0000 (20:50 +0000)]

am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
automerge: a9d803e

* commit 'a9d803e0f7efe4c899ea37a50653452edb6d77fd':

commit | commitdiff | tree

Fred Fettinger [Mon, 3 Nov 2014 20:47:38 +0000 (20:47 +0000)]

am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
automerge: 7565da1 -s ours

* commit '7565da1f38f9bd1aad1749aa829b54fe2df223b6':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 20:47:37 +0000 (20:47 +0000)]

am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af

* commit 'ac875484041183a299a36534cbb5a5574f4f93e1':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 20:47:33 +0000 (20:47 +0000)]

am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657

* commit '9e22cd6fd10983cdd4a84e5a2143cb8ed49e084d':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 20:46:33 +0000 (20:46 +0000)]

am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below
automerge: 3f0cf02

* commit '3f0cf028aef394d91610344850cfc3c2e76b4ebb':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:44:37 +0000 (20:44 +0000)]

am b9120e4c: am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge: dfb86b9

* commit 'b9120e4c95f81cbee0563a2cbf47c466e72b16aa':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:44:33 +0000 (20:44 +0000)]

am 7045d963: am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2

* commit '7045d9639f77c6edaa892e1cacc489f1897f9899':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:44:30 +0000 (20:44 +0000)]

am 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680

* commit '5ef2d855f0a55377af53a05f2f48015a10a29151':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:44:26 +0000 (20:44 +0000)]

am ea4f3e79: am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30

* commit 'ea4f3e793a0be91bf6b06801fec08e028ade0a75':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 20:42:54 +0000 (20:42 +0000)]

am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours

* commit 'ec276ed12645cc1c735babab1dc7d272fc96a292':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 20:42:50 +0000 (20:42 +0000)]

am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90

* commit '6ae208d455fd2dba80ad9d7cf181ccdeac8c0bb7':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:42:23 +0000 (20:42 +0000)]

am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
automerge: 581d03b

* commit '581d03b1d539ebd3180dee5680d712f74011a3e4':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 20:40:55 +0000 (20:40 +0000)]

am 4f133894: Exclude KXmlParser from LayoutLib.
automerge: adb14af

* commit 'adb14afbfb4c37cfc684537d85123b36539fffed':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:38:24 +0000 (20:38 +0000)]

am 92cfa5d0: am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs automerge: ddb8c4e

* commit '92cfa5d0b20b52cd1e61c5fef36abe0d67525fa2':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:38:03 +0000 (20:38 +0000)]

am 5063cf9a: am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913

* commit '5063cf9abca48f6e07ef7efd27232e1759704119':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 20:37:59 +0000 (20:37 +0000)]

am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984

* commit '4f62925ecb2f049aec7392f84d494328f883cb92':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 20:37:55 +0000 (20:37 +0000)]

am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b

* commit '0646885ddfb5c04cd0c5276e66b51b1a14691c4c':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 20:37:46 +0000 (20:37 +0000)]

am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
automerge: 37ec657

* commit '37ec65701121374b0edf3cfc454463c90666399d':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:36:18 +0000 (20:36 +0000)]

am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge: dfb86b9

* commit '03f627c4b469d4a85bb3b747ef49d0a20b853f08':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:36:14 +0000 (20:36 +0000)]

am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2

* commit 'bea6b4d12106e2a918274ffccd6e370f48654979':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:36:09 +0000 (20:36 +0000)]

am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680

* commit 'e5eaf36c01e2b3e4d5072b2fa478bc9cc7336e51':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:36:05 +0000 (20:36 +0000)]

am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30

* commit 'd6007644353347f49090337b3683dcca7092ed3d':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 20:34:42 +0000 (20:34 +0000)]

am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
automerge: fcaf3e9 -s ours

* commit 'fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 20:33:08 +0000 (20:33 +0000)]

am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
automerge: 9779c90

* commit '9779c905eac26ab6ce7ce775587c75f1de081dd4':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:31:51 +0000 (20:31 +0000)]

am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
automerge: dfb86b9

* commit 'dfb86b994ff7d51ba1a1683c7123195cc9930c95':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:30:45 +0000 (20:30 +0000)]

am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
automerge: 9566bd2

* commit '9566bd23390b0f21582a59673ded22f47b50ffe0':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:30:09 +0000 (20:30 +0000)]

am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs automerge: ddb8c4e

* commit 'c9c186711d88d4869e4cbd53f83bc12806b6ffb5':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:30:05 +0000 (20:30 +0000)]

am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913

* commit 'd89021d7aaac209a354e02e72fac5c063e8f92fd':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 20:29:55 +0000 (20:29 +0000)]

am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984

* commit 'a34b1f15292d219b6e2c13fd6f685735c8dd8f8c':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 20:29:51 +0000 (20:29 +0000)]

am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b

* commit 'c64c937a18be1205170ad95b7f601a6e0192b9b9':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:29:24 +0000 (20:29 +0000)]

am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
automerge: 5f9d680

* commit '5f9d680dd73b437e1e311f11f255b659ad18135b':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:28:06 +0000 (20:28 +0000)]

am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
automerge: a6abe30

* commit 'a6abe30397cf1f67b871a3db7555aa7f0f9841d9':

commit | commitdiff | tree

Quddus Chong [Mon, 3 Nov 2014 20:23:39 +0000 (20:23 +0000)]

am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
automerge: ddb8c4e

* commit 'ddb8c4ee47e663ca984ff0291fae2cab2c5bc173':

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 20:22:28 +0000 (20:22 +0000)]

am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
automerge: 2166913

* commit '2166913933661f4f85fd649ad55997d59a5e3d31':

commit | commitdiff | tree

Rich Slogar [Mon, 3 Nov 2014 20:21:20 +0000 (20:21 +0000)]

am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
automerge: f07d984

* commit 'f07d984fed70be0718e7e9019bc933f58fbeca46':

commit | commitdiff | tree

smain@google.com [Mon, 3 Nov 2014 20:20:13 +0000 (20:20 +0000)]

am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
automerge: 90ab19b

* commit '90ab19bb8dec2e444e274ab4c8990545b481ca7b':

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 19:57:46 +0000 (19:57 +0000)]

am badfcbec: am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs

* commit 'badfcbec48e6904316bec731e22c52bb7cca25fb':
docs: Update Android Dashboard for November 2014

commit | commitdiff | tree

Jim Miller [Mon, 3 Nov 2014 19:51:52 +0000 (19:51 +0000)]

Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 19:51:42 +0000 (19:51 +0000)]

am 4f8399c7: am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs

* commit '4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9':
docs: Update Android Dashboard for November 2014

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 19:41:56 +0000 (19:41 +0000)]

am eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs

* commit 'eff5efac2170e05b2a5e197788bf455edee57cce':
docs: Update Android Dashboard for November 2014

commit | commitdiff | tree

Joe Fernandez [Mon, 3 Nov 2014 19:37:19 +0000 (19:37 +0000)]

Merge "docs: Update Android Dashboard for November 2014" into lmp-docs

commit | commitdiff | tree

Joe Fernandez [Thu, 30 Oct 2014 17:57:31 +0000 (10:57 -0700)]

docs: Update Android Dashboard for November 2014

Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39

commit | commitdiff | tree

Mike Lockwood [Mon, 3 Nov 2014 18:38:13 +0000 (18:38 +0000)]

Merge "Fix USB audio disconnect logic" into lmp-mr1-dev

commit | commitdiff | tree

John Reck [Mon, 3 Nov 2014 18:35:58 +0000 (18:35 +0000)]

Merge "Fix counting" into lmp-mr1-dev

commit | commitdiff | tree

Adrian Roos [Mon, 3 Nov 2014 18:33:52 +0000 (18:33 +0000)]

Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev

commit | commitdiff | tree

John Reck [Mon, 3 Nov 2014 18:32:24 +0000 (10:32 -0800)]

Fix counting

Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c

commit | commitdiff | tree

John Reck [Mon, 3 Nov 2014 18:27:40 +0000 (18:27 +0000)]

Merge "Fix cancel crash" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 3 Nov 2014 18:01:46 +0000 (18:01 +0000)]

am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Reck [Mon, 3 Nov 2014 18:00:33 +0000 (10:00 -0800)]

Fix cancel crash

Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3