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

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Tom Taylor [Wed, 5 Nov 2014 04:26:09 +0000 (04:26 +0000)]

am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'f2f59e7ab916e37d510db151904c95c42006ae08':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Tom Taylor [Wed, 5 Nov 2014 04:20:11 +0000 (04:20 +0000)]

am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Eric Gilmore [Wed, 5 Nov 2014 00:20:18 +0000 (00:20 +0000)]

am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

* commit '4f82acd810601c4d055906cb2b671cafd15d3fc8':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

commit | commitdiff | tree

Eric Gilmore [Wed, 5 Nov 2014 00:12:16 +0000 (00:12 +0000)]

am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

* commit 'bf78adb25e80b9107fcd682d30e7157093681547':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

commit | commitdiff | tree

Eric Gilmore [Tue, 28 Oct 2014 20:33:30 +0000 (13:33 -0700)]

Adding 5.0 emulator image and removing older image.
2nd patch set includes low/high res. images.

Bug: 18026943

Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c

commit | commitdiff | tree

Scott Kennedy [Tue, 4 Nov 2014 18:12:05 +0000 (18:12 +0000)]

am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs

* commit 'cf57296da6a22bff03eefda7b704787769ad4d37':
Fix a small typo in a variable name

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Nov 2014 18:07:11 +0000 (18:07 +0000)]

am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs

* commit 'af002b352ade0d7f9eeff15221f487c3912ebb34':
docs: Fix the circularReveal example.

commit | commitdiff | tree

Scott Kennedy [Tue, 4 Nov 2014 18:06:32 +0000 (18:06 +0000)]

am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs

* commit 'd78ce50372ec473b6a895d053f9ffc2956e933ef':
Fix a small typo in a variable name

commit | commitdiff | tree

Scott Kennedy [Tue, 4 Nov 2014 18:01:27 +0000 (18:01 +0000)]

Merge "Fix a small typo in a variable name" into lmp-docs

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Nov 2014 18:00:56 +0000 (18:00 +0000)]

am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs

* commit '61f91724a9375732cd95333921388a3e5a64ac33':
docs: Fix the circularReveal example.

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Nov 2014 17:56:21 +0000 (17:56 +0000)]

Merge "docs: Fix the circularReveal example." into lmp-docs

commit | commitdiff | tree

Tom Taylor [Tue, 4 Nov 2014 17:49:26 +0000 (17:49 +0000)]

am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '5244937248b7283b5cf586b5637a108579217d4e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Tom Taylor [Tue, 4 Nov 2014 17:42:20 +0000 (17:42 +0000)]

am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'bc57a1f81317f765865e3e0c00d3421a3084955e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

commit | commitdiff | tree

Mark Renouf [Tue, 4 Nov 2014 07:18:31 +0000 (07:18 +0000)]

am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours

* commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':

commit | commitdiff | tree

Mark Renouf [Tue, 4 Nov 2014 07:18:28 +0000 (07:18 +0000)]

am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours

* commit '066f97e79bce5ac6722f44dcb411f9642c40026c':

commit | commitdiff | tree

kmccormick [Tue, 4 Nov 2014 07:18:24 +0000 (07:18 +0000)]

am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190

* commit 'b2dfaf0ee621642190598b32b5ead861402b32ec':

commit | commitdiff | tree

Mark Renouf [Tue, 4 Nov 2014 07:15:18 +0000 (07:15 +0000)]

If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours
automerge: 01afc37 -s ours

* commit '01afc37403a244e75fbfa385b197d76e476213e8':

commit | commitdiff | tree

Mark Renouf [Tue, 4 Nov 2014 07:14:17 +0000 (07:14 +0000)]

Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours
automerge: ff2e718 -s ours

* commit 'ff2e71830cafe063e876e5a56db0d33a8a5ba679':

commit | commitdiff | tree

kmccormick [Tue, 4 Nov 2014 07:13:11 +0000 (07:13 +0000)]

am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a
automerge: 5298190

* commit '5298190a30288d29cb9107d89b00411def3e469b':

commit | commitdiff | tree

David Friedman [Tue, 4 Nov 2014 01:06:41 +0000 (01:06 +0000)]

am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs

* commit '5a416a4905ba2f347a9837c1f578327c239f5910':
Fixed ADB documentation to work properly on Windows Bug: 17192985

commit | commitdiff | tree

David Friedman [Tue, 4 Nov 2014 00:59:31 +0000 (00:59 +0000)]

am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs

* commit 'a827de4e8bcd8d90987387b1acf8d8856104e21c':
Fixed ADB documentation to work properly on Windows Bug: 17192985

commit | commitdiff | tree

Deepanshu Gupta [Tue, 4 Nov 2014 00:51:51 +0000 (00:51 +0000)]

Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
Fix BridgeContext.get*ResourceValue()

commit | commitdiff | tree

Deepanshu Gupta [Tue, 4 Nov 2014 00:50:48 +0000 (00:50 +0000)]

Merge "Support framework menus in ActionBar" into lmp-dev
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
Support framework menus in ActionBar

commit | commitdiff | tree

Deepanshu Gupta [Tue, 4 Nov 2014 00:49:43 +0000 (00:49 +0000)]

Merge "Use the right layout for inflating Action Bar." into lmp-dev
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
Use the right layout for inflating Action Bar.

commit | commitdiff | tree

Baligh Uddin [Tue, 4 Nov 2014 00:48:44 +0000 (00:48 +0000)]

Import translations. DO NOT MERGE
automerge: 07dd521 -s ours

* commit '07dd52188ccafac3cec01122b132666f2bd8e32e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

David Friedman [Tue, 4 Nov 2014 00:05:51 +0000 (00:05 +0000)]

Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 23:15:01 +0000 (23:15 +0000)]

Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 23:14:44 +0000 (23:14 +0000)]

Merge "Support framework menus in ActionBar" into lmp-dev

commit | commitdiff | tree

Deepanshu Gupta [Mon, 3 Nov 2014 23:13:13 +0000 (23:13 +0000)]

Merge "Use the right layout for inflating Action Bar." into lmp-dev

commit | commitdiff | tree

Scott Kennedy [Mon, 3 Nov 2014 21:56:18 +0000 (13:56 -0800)]

Fix a small typo in a variable name

Change-Id: If431236bf6885b3b0ef2c967869320538222ee33

commit | commitdiff | tree

Bryce Lee [Mon, 3 Nov 2014 21:59:26 +0000 (21:59 +0000)]

Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 3 Nov 2014 21:56:10 +0000 (13:56 -0800)]

Import translations. DO NOT MERGE

Bug: 18218486
Change-Id: I929129a2c443e4db78e0ad4e78e653a7cd603855
Auto-generated-cl: translation import

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Nov 2014 21:21:11 +0000 (21:21 +0000)]

am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.

* commit '550465ba444a860eddfbf673ad09c07519d262d2':
Doc change: Tv doc updates for publishing in Google Play.

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

Dirk Dougherty [Mon, 3 Nov 2014 21:13:25 +0000 (21:13 +0000)]

am e1970f12: Doc change: Tv doc updates for publishing in Google Play.

* commit 'e1970f12583120613bc94e15841f6a7cc7919f68':
Doc change: Tv doc updates for publishing in Google Play.

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

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

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

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

Dirk Dougherty [Sun, 2 Nov 2014 04:40:32 +0000 (21:40 -0700)]

Doc change: Tv doc updates for publishing in Google Play.

cherry-picked from Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888

Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888

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

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

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: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

Geoff Mendal [Mon, 3 Nov 2014 17:53:11 +0000 (17:53 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 17:36:56 +0000 (17:36 +0000)]

am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs

* commit 'fa37321f05ad96a1de6863bc08fe1e496cceea9e':
docs: Add links to Wear UI training from Design pages.

commit | commitdiff | tree

Ricardo Cervera [Mon, 3 Nov 2014 17:31:32 +0000 (17:31 +0000)]

am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs

* commit '3e621914cacf692700dce007ec7d7893fcc12a8c':
docs: Add links to Wear UI training from Design pages.

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.