OSDN Git Service
John Spurlock [Wed, 5 Nov 2014 21:40:46 +0000 (21:40 +0000)]
am
66c46c4a: am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
66c46c4a9289a8e21c8f36fe06679be5f6534841':
Docs: Fix typo in Preference android:order attribute.
John Spurlock [Wed, 5 Nov 2014 21:36:13 +0000 (21:36 +0000)]
am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
Docs: Fix typo in Preference android:order attribute.
John Spurlock [Wed, 5 Nov 2014 21:17:50 +0000 (16:17 -0500)]
Docs: Fix typo in Preference android:order attribute.
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
Rich Slogar [Wed, 5 Nov 2014 20:17:55 +0000 (20:17 +0000)]
am
848d9125: am
1afa82dc: docs:remove sdk/ndk note
* commit '
848d912505079cc3cbd362a4333f0eabfac3c1c5':
docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:13:35 +0000 (20:13 +0000)]
am
1afa82dc: docs:remove sdk/ndk note
* commit '
1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
docs:remove sdk/ndk note
Andrew Solovay [Wed, 5 Nov 2014 18:52:27 +0000 (18:52 +0000)]
am
56576838: am
d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
* commit '
56576838a8e8c4f44f8df13cc40295a918540b86':
docs: Removed broken link to non-existent method.
Ricardo Cervera [Wed, 5 Nov 2014 18:52:23 +0000 (18:52 +0000)]
am
b4125d1e: am
58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
* commit '
b4125d1e0bbf1ce90d0bfb03e5e068180bbb6b20':
docs: Add instructions to attach debugger to a running process.
Andrew Solovay [Wed, 5 Nov 2014 18:47:17 +0000 (18:47 +0000)]
am
d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
* commit '
d9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
docs: Removed broken link to non-existent method.
Ricardo Cervera [Wed, 5 Nov 2014 18:47:13 +0000 (18:47 +0000)]
am
58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
* commit '
58f1200c333deea72ed6e095587f0bcb1fb65ce3':
docs: Add instructions to attach debugger to a running process.
Rich Slogar [Wed, 5 Nov 2014 18:14:56 +0000 (10:14 -0800)]
docs:remove sdk/ndk note
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
Andrew Solovay [Wed, 5 Nov 2014 18:14:04 +0000 (18:14 +0000)]
Merge "docs: Removed broken link to non-existent method." into lmp-docs
Ricardo Cervera [Wed, 5 Nov 2014 17:08:37 +0000 (17:08 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
automerge:
25a4e21
* commit '
25a4e21e13217708e9ff99beb21f88151ea2cbd4':
docs: Add instructions to attach debugger to a running process.
Ricardo Cervera [Wed, 5 Nov 2014 17:00:09 +0000 (17:00 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
Ricardo Cervera [Wed, 5 Nov 2014 16:58:22 +0000 (16:58 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
Bryce Lee [Wed, 5 Nov 2014 16:41:39 +0000 (16:41 +0000)]
Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev
Tom Taylor [Wed, 5 Nov 2014 04:26:13 +0000 (04:26 +0000)]
am
4e985118: am
6209d4e4: am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana
* commit '
4e9851183daf26d602d641917378d55a9516f128':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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
Tom Taylor [Wed, 5 Nov 2014 04:21:07 +0000 (04:21 +0000)]
am
6209d4e4: am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
6209d4e4d8a8662628c53cd5e1944abf30293d87':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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
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.
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.
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
Bryce Lee [Tue, 4 Nov 2014 20:43:44 +0000 (12:43 -0800)]
Add config to control going to sleep when entering theater mode.
Bug:
18241209
Change-Id: I7fa29d92391b1c8ab74585008d6599fd7174cc61
Tom Taylor [Tue, 4 Nov 2014 19:18:50 +0000 (19:18 +0000)]
am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:14:26 +0000 (19:14 +0000)]
am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
47419a443591ea3c641da8720514e1384dd75440':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:08:16 +0000 (19:08 +0000)]
am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
192a39044290be84a1086a876a9d4ab0571ab97b':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:00:42 +0000 (19:00 +0000)]
am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
23fb29723c47b2aeb6aecc382a503630a8d8e983':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:50:31 +0000 (18:50 +0000)]
am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
d7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:39:38 +0000 (18:39 +0000)]
am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
b2e54c1b46c275d017fb5bef17add3eb4c465508':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:30:23 +0000 (18:30 +0000)]
am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
75e7fbaa83448753a1db9647e58693f1a281900c':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:23:51 +0000 (18:23 +0000)]
am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
37906e6ebc1985ad4b7151116b7cf4fef8322b19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:18:16 +0000 (18:18 +0000)]
am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
44f6d0d5810ce507394cc514481d977315d2496f':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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
Tom Taylor [Tue, 4 Nov 2014 18:11:02 +0000 (18:11 +0000)]
am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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.
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
Tom Taylor [Tue, 4 Nov 2014 18:03:07 +0000 (18:03 +0000)]
am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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
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.
Ricardo Cervera [Tue, 4 Nov 2014 17:56:21 +0000 (17:56 +0000)]
Merge "docs: Fix the circularReveal example." into lmp-docs
Tom Taylor [Tue, 4 Nov 2014 17:53:14 +0000 (17:53 +0000)]
am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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
Tom Taylor [Tue, 4 Nov 2014 17:43:41 +0000 (17:43 +0000)]
am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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
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':
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':
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':
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':
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':
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':
Andrew Solovay [Tue, 4 Nov 2014 01:10:53 +0000 (17:10 -0800)]
docs: Removed broken link to non-existent method.
Doc had included link to method MediaBrowserService.onLoadIcon().
Per bug http://b/
17205016 that method was removed before release.
Revised doc is staged to:
http://asolovay.mtv.corp.google.com:9650/reference/android/service/media/MediaBrowserService.Result.html
(Note that the other "See Also" link, which I didn't remove, is badly
formatted because Javadoc seems to choke on links to methods that are
passed generic types. JoeFernandez@, if you can suggest a better way
to format that link I'll make that change too.)
bug:
18229650
Change-Id: Ic55ae8b9edc6dd314cf5acc306abd8a9d5f71134
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
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
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()
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
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.
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
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
Deepanshu Gupta [Mon, 3 Nov 2014 23:15:01 +0000 (23:15 +0000)]
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:14:44 +0000 (23:14 +0000)]
Merge "Support framework menus in ActionBar" into lmp-dev
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
Scott Kennedy [Mon, 3 Nov 2014 21:56:18 +0000 (13:56 -0800)]
Fix a small typo in a variable name
Change-Id: If431236bf6885b3b0ef2c967869320538222ee33
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
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
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.
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':
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':
Natalie Masse [Mon, 3 Nov 2014 21:15:51 +0000 (21:15 +0000)]
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':
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.
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':
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':
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':
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':
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':
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':
Natalie Masse [Mon, 3 Nov 2014 21:07:41 +0000 (21:07 +0000)]
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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':
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
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':
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':