OSDN Git Service
Jeff Sharkey [Thu, 8 Jan 2015 22:00:13 +0000 (14:00 -0800)]
Guard against MountService throwing NPE.
Fall through to below logic and return null instead of crashing the
entire app. We already tell developers the value may be null.
Bug:
17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
Ben Murdoch [Wed, 7 Jan 2015 15:50:50 +0000 (15:50 +0000)]
Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 15:24:21 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I41b418841fd7a2c436257ec29312411b1277b867
Auto-generated-cl: translation import
Ben Murdoch [Wed, 7 Jan 2015 14:20:45 +0000 (14:20 +0000)]
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
Bug:
18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
Robin Lee [Wed, 7 Jan 2015 12:30:54 +0000 (12:30 +0000)]
Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
Deepanshu Gupta [Wed, 7 Jan 2015 09:23:17 +0000 (09:23 +0000)]
am
7f9582ce: am
48603a39: Fix tests on jenkins
* commit '
7f9582ce616a81b70794d7942b39f8442f5ef9d5':
Fix tests on jenkins
Quddus Chong [Wed, 7 Jan 2015 09:23:10 +0000 (09:23 +0000)]
am
96f11258: am
dc649c8d: am
8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727" into lmp-docs
* commit '
96f11258ab19962c93b615c00b387bdc05c0d75b':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727
Quddus Chong [Wed, 7 Jan 2015 09:23:07 +0000 (09:23 +0000)]
am
decac431: am
14694d6e: am
3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181" into lmp-docs
* commit '
decac4319172c5f1c618de93dcb2a15678c3e214':
docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181
Quddus Chong [Wed, 7 Jan 2015 09:23:02 +0000 (09:23 +0000)]
am
4d39cfa4: am
a63d2b83: am
b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug:
18142680" into lmp-docs
* commit '
4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
docs: Updated the description of the enhanced camera APIs in L. bug:
18142680
Joe Fernandez [Wed, 7 Jan 2015 09:22:58 +0000 (09:22 +0000)]
am
ca14e6c8: am
f50be1fc: am
91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '
ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
docs: studio index typo
Joe Fernandez [Wed, 7 Jan 2015 09:22:53 +0000 (09:22 +0000)]
am
c6fe54ed: am
62c3abe7: am
acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit '
c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
docs: studio bundle checksum update
Joe Fernandez [Wed, 7 Jan 2015 09:14:16 +0000 (09:14 +0000)]
Merge "resolved conflicts for merge of
ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
Sungsoo Lim [Wed, 7 Jan 2015 07:58:15 +0000 (07:58 +0000)]
Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev
Wonsik Kim [Wed, 7 Jan 2015 07:30:49 +0000 (07:30 +0000)]
Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev
Scott Rowe [Wed, 7 Jan 2015 03:30:11 +0000 (19:30 -0800)]
resolved conflicts for merge of
ea0137ef to lmp-mr1-dev
Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214
Deepanshu Gupta [Wed, 7 Jan 2015 01:43:39 +0000 (01:43 +0000)]
am
48603a39: Fix tests on jenkins
* commit '
48603a39d4dd721d231c99e10908f4f00c4ec6b9':
Fix tests on jenkins
Deepanshu Gupta [Wed, 7 Jan 2015 01:32:26 +0000 (17:32 -0800)]
Fix tests on jenkins
When the tests are run on the build server, they are run from the jar,
as opposed to the extracted build, which is default when run from an
IDE. Thus, when class.getResourceAsStream() is called with ".." in the
path, it is not resolved properly. This change explicitly resolves the
relative path, so that the test is run properly on the server.
Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff
Paul Miller [Wed, 7 Jan 2015 01:08:33 +0000 (01:08 +0000)]
Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
Shishir Agrawal [Wed, 7 Jan 2015 00:12:15 +0000 (00:12 +0000)]
Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev
Yin-Chia Yeh [Tue, 6 Jan 2015 23:58:59 +0000 (23:58 +0000)]
Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
Ye Wen [Tue, 6 Jan 2015 23:49:15 +0000 (23:49 +0000)]
Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev
Ricardo Cervera [Tue, 6 Jan 2015 22:41:03 +0000 (22:41 +0000)]
am
a9a51433: am
f211b625: am
fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '
a9a514331ce33dde91fbcc791fdc523b74a4ffb4':
docs: Minor fixes to Watch Faces design guidelines.
Shishir Agrawal [Tue, 6 Jan 2015 22:35:31 +0000 (14:35 -0800)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug:
18814559
Change-Id: I1488bd763d95d5ad087bc4ceb5f4c3767c05b62f
Deepanshu Gupta [Tue, 6 Jan 2015 22:23:01 +0000 (22:23 +0000)]
am
a6671b70: am
6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit '
a6671b707446963f402a71219725f317a57b42af':
Add image comparison to LayoutLib tests.
Deepanshu Gupta [Tue, 6 Jan 2015 22:22:56 +0000 (22:22 +0000)]
am
0db2524c: am
b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev
* commit '
0db2524caa01022629075a113d3370a1b7c3da30':
Remove Time from CreateInfo
Deepanshu Gupta [Tue, 6 Jan 2015 22:22:53 +0000 (22:22 +0000)]
am
937db7a3: am
53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '
937db7a39ef6f5e88a936f78a729f9578123e60b':
Add DatePicker, CalendarView to LayoutLib tests
Deepanshu Gupta [Tue, 6 Jan 2015 22:22:49 +0000 (22:22 +0000)]
am
e69e4f8b: am
f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit '
e69e4f8b4db142f024e170cf6faabb36095799b7':
Fix DatePicker rendering.
Deepanshu Gupta [Tue, 6 Jan 2015 22:22:44 +0000 (22:22 +0000)]
am
8c686ddd: am
d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit '
8c686ddd540f3a15cdba4893f104c0e8e9af5716':
Make Preference-cookie map non static.
Deepanshu Gupta [Tue, 6 Jan 2015 22:22:40 +0000 (22:22 +0000)]
am
cec8e5a1: am
f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit '
cec8e5a10de413c733223b8b1cc11b70c6254647':
Fix default initial value for preferences
Deepanshu Gupta [Tue, 6 Jan 2015 22:22:36 +0000 (22:22 +0000)]
am
7ed14549: am
7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '
7ed145493d3f5bea32c567980f77cc42f613197e':
Add preferences rendering.
Ricardo Cervera [Tue, 6 Jan 2015 22:22:27 +0000 (22:22 +0000)]
am
e7d1db56: am
d69238ef: am
4bb503cf: docs: Minor fixes in Android Studio pages.
* commit '
e7d1db56324e406a074bf0c44e778060b07d2322':
docs: Minor fixes in Android Studio pages.
Baligh Uddin [Tue, 6 Jan 2015 22:22:13 +0000 (22:22 +0000)]
am
15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
155521586c71b8fd2ed61e3cd860a3a75c55a4e9':
Import translations. DO NOT MERGE
Sarah Maddox [Tue, 6 Jan 2015 22:22:08 +0000 (22:22 +0000)]
am
7d9309b6: am
029acc8e: am
ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
* commit '
7d9309b6e9e6974608b2d355c9eb1a66550801b2':
docs: Fixes typo on Play services page for Maps.
Joe Fernandez [Tue, 6 Jan 2015 22:21:58 +0000 (22:21 +0000)]
am
69434df3: am
180bd6be: am
76db15a8: docs: fix problem with TOC after Japanese pages merge
* commit '
69434df395798a725072424782f79daaa23aae14':
docs: fix problem with TOC after Japanese pages merge
David Friedman [Tue, 6 Jan 2015 22:21:54 +0000 (22:21 +0000)]
am
2d179c89: am
919ecb22: am
58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
* commit '
2d179c899a59a2001a665ca6c3725832aced648c':
Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
Joe Fernandez [Tue, 6 Jan 2015 22:21:47 +0000 (22:21 +0000)]
am
214e6867: am
c27d5fd6: am
7cec35ef: Merge "docs: b/
18122848 [DAC] Android TV - Recommendation card" into lmp-docs
* commit '
214e6867c5339468a960e8b8a20c535c99eb9e57':
docs: b/
18122848 [DAC] Android TV - Recommendation card
Joe Fernandez [Tue, 6 Jan 2015 22:21:43 +0000 (22:21 +0000)]
am
001f6f54: am
66fefd0c: am
a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '
001f6f5451a71da328c3e05b4da1ad3bf24ad613':
docs: plugin link name update
Scott Rowe [Tue, 6 Jan 2015 22:21:38 +0000 (22:21 +0000)]
am
13d31b0a: am
d7d1411a: am
e2b44f86: docs: Making TV Apps Searchable - new training
* commit '
13d31b0a40dd58d61e8a6ad82c1de165792b95e4':
docs: Making TV Apps Searchable - new training
Ye Wen [Tue, 6 Jan 2015 22:07:55 +0000 (14:07 -0800)]
Add new mms error for no data network (airplane mode or no mobile data)
b/
18872094
Change-Id: Ia2e939fe91b6f80c192d601c80de551f173e5e6f
Paul Miller [Sat, 20 Dec 2014 01:51:18 +0000 (17:51 -0800)]
Fix crash on pasting text in a WebView
WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.
Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.
BUG:
18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
Yin-Chia Yeh [Tue, 6 Jan 2015 18:32:47 +0000 (10:32 -0800)]
Camera: doc update for color aberration modes
Code-gened document update for camera2 spec.
Bug:
18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
Quddus Chong [Tue, 6 Jan 2015 18:23:08 +0000 (18:23 +0000)]
am
dc649c8d: am
8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727" into lmp-docs
* commit '
dc649c8da46dc1cc2ac7df41ddde0f28c64db687':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727
Quddus Chong [Tue, 6 Jan 2015 18:23:04 +0000 (18:23 +0000)]
am
14694d6e: am
3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181" into lmp-docs
* commit '
14694d6e6d8852bbf0591787e0f84627921996c9':
docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181
Quddus Chong [Tue, 6 Jan 2015 18:23:00 +0000 (18:23 +0000)]
am
a63d2b83: am
b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug:
18142680" into lmp-docs
* commit '
a63d2b838396be0d9da7c8d8263f207beaf8d6f7':
docs: Updated the description of the enhanced camera APIs in L. bug:
18142680
Quddus Chong [Tue, 6 Jan 2015 18:15:54 +0000 (18:15 +0000)]
am
8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727" into lmp-docs
* commit '
8a195822e264754f08f43322348ebce273f72c40':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727
Quddus Chong [Tue, 6 Jan 2015 18:15:51 +0000 (18:15 +0000)]
am
3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181" into lmp-docs
* commit '
3bdc68edcf98a1ccdfea9539fe5e3a4d4416f8a8':
docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181
Quddus Chong [Tue, 6 Jan 2015 18:15:47 +0000 (18:15 +0000)]
am
b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug:
18142680" into lmp-docs
* commit '
b55e2bf0e0ab3150f99a6c50af56e99cc660e094':
docs: Updated the description of the enhanced camera APIs in L. bug:
18142680
Quddus Chong [Tue, 6 Jan 2015 18:10:35 +0000 (18:10 +0000)]
Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727" into lmp-docs
Quddus Chong [Tue, 6 Jan 2015 18:10:15 +0000 (18:10 +0000)]
Merge "docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181" into lmp-docs
Quddus Chong [Tue, 6 Jan 2015 18:09:42 +0000 (18:09 +0000)]
Merge "docs: Updated the description of the enhanced camera APIs in L. bug:
18142680" into lmp-docs
Christopher Tate [Tue, 6 Jan 2015 18:09:40 +0000 (18:09 +0000)]
Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev
Joe Fernandez [Tue, 6 Jan 2015 18:03:58 +0000 (18:03 +0000)]
am
f50be1fc: am
91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '
f50be1fcce8df7c8ddb3553d3bc36007a0745af7':
docs: studio index typo
Dianne Hackborn [Tue, 6 Jan 2015 17:59:58 +0000 (17:59 +0000)]
Merge "Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev
Joe Fernandez [Tue, 6 Jan 2015 17:57:35 +0000 (17:57 +0000)]
am
62c3abe7: am
acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit '
62c3abe73086301e7125d6dc88954e16e436bd9d':
docs: studio bundle checksum update
Joe Fernandez [Tue, 6 Jan 2015 17:56:31 +0000 (17:56 +0000)]
am
91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '
91c35ce153aa89f76ce60c6a77e21a4abc7614b5':
docs: studio index typo
Joe Fernandez [Tue, 6 Jan 2015 17:51:19 +0000 (17:51 +0000)]
am
acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit '
acb35e19d12d775bee761bef25c6d1581f015c11':
docs: studio bundle checksum update
Joe Fernandez [Tue, 6 Jan 2015 17:50:56 +0000 (17:50 +0000)]
Merge "docs: studio index typo" into lmp-docs
Joe Fernandez [Tue, 6 Jan 2015 17:46:03 +0000 (17:46 +0000)]
Merge "docs: studio bundle checksum update" into lmp-docs
Paul Jensen [Wed, 17 Dec 2014 15:39:34 +0000 (10:39 -0500)]
Clear process DNS NetID binding when expiring or releaseing legacy requests.
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.
bug:
18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
Joe Fernandez [Tue, 6 Jan 2015 04:57:25 +0000 (04:57 +0000)]
am
37425662: am
26994aa7: Merge "docs: Checklist for TV Apps" into lmp-docs
* commit '
37425662d3b2a17a8d2cb495d650f1e115dccabe':
docs: Checklist for TV Apps
Joe Fernandez [Tue, 6 Jan 2015 04:42:17 +0000 (04:42 +0000)]
am
26994aa7: Merge "docs: Checklist for TV Apps" into lmp-docs
* commit '
26994aa7d41038127a6df6557e74fc833e540bcb':
docs: Checklist for TV Apps
Joe Fernandez [Tue, 6 Jan 2015 04:35:31 +0000 (04:35 +0000)]
Merge "docs: Checklist for TV Apps" into lmp-docs
Jinsuk Kim [Tue, 6 Jan 2015 04:03:19 +0000 (04:03 +0000)]
Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev
Jinsuk Kim [Tue, 6 Jan 2015 02:30:56 +0000 (11:30 +0900)]
CEC: Make deviceSelect work for MHL device
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.
Bug:
18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
Andrew Solovay [Tue, 6 Jan 2015 02:02:02 +0000 (02:02 +0000)]
am
4c7390d3: am
b663f2fc: am
713cd74e: docs: New "app compatibility with managed profiles" doc
* commit '
4c7390d392dfe4a5df626ce28d415e01cab7d132':
docs: New "app compatibility with managed profiles" doc
Joe Fernandez [Tue, 6 Jan 2015 02:01:14 +0000 (02:01 +0000)]
am
546a0e8c: am
60925265: am
afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
* commit '
546a0e8c695808c987be3fbac1b3e632b6c6aa8d':
docs: studio build output dir name update
Joe Fernandez [Tue, 6 Jan 2015 02:01:09 +0000 (02:01 +0000)]
am
21b92f34: am
43f4e8fa: am
27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
* commit '
21b92f34525e12ede8f842f6c426d33093df3b24':
docs: gradle version update in plugin file
Joe Fernandez [Tue, 6 Jan 2015 02:01:05 +0000 (02:01 +0000)]
am
447ea509: am
f110d357: am
8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
* commit '
447ea5097ba99ca25ddd613e72e10b57f3405291':
docs: gradle wrapper security note
Joe Fernandez [Tue, 6 Jan 2015 02:01:01 +0000 (02:01 +0000)]
am
eed87a57: am
09b41c02: am
e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
* commit '
eed87a573a2e67c85f5a8e79ad538cce278932d2':
docs: project file and toc updates
Joe Fernandez [Tue, 6 Jan 2015 02:00:57 +0000 (02:00 +0000)]
am
c811b88a: am
d3d09d87: am
66e851fa: Merge "docs: studio workflow links" into lmp-docs
* commit '
c811b88ab1bc891fffdef461ead0f6dc7331d04e':
docs: studio workflow links
Joe Fernandez [Tue, 6 Jan 2015 02:00:53 +0000 (02:00 +0000)]
am
411c779b: am
c919f7cf: am
1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
* commit '
411c779bb746d81278b7646ffd96fa6e4f8336b9':
docs: studio tips and ticks grammmar typo
Ricardo Cervera [Tue, 6 Jan 2015 02:00:48 +0000 (02:00 +0000)]
am
c5fae959: am
48a066db: am
60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
* commit '
c5fae9593553a89db2ad49306b46b8f9a3631489':
docs: Update wearable lists docs
Joe Fernandez [Tue, 6 Jan 2015 02:00:42 +0000 (02:00 +0000)]
am
c3fb32ab: am
4603c122: am
18a75595: Merge "docs: studio device emulator updates" into lmp-docs
* commit '
c3fb32ab3989806f49cdd21ca58a044daf74f060':
docs: studio device emulator updates
Sarah Maddox [Tue, 6 Jan 2015 02:00:32 +0000 (02:00 +0000)]
am
4811f9b8: am
ecf0ac29: am
ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
* commit '
4811f9b84766adc17efb730160e15785d74875a3':
docs: Updates the request-location-updates lesson in the location APIs training course.
Ricardo Cervera [Tue, 6 Jan 2015 02:00:24 +0000 (02:00 +0000)]
am
9719336b: am
4ef7873d: am
8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
* commit '
9719336b3a9a059c31200137a93f74445d3c7185':
docs: Adding vector drawables video
Joe Fernandez [Tue, 6 Jan 2015 02:00:14 +0000 (02:00 +0000)]
am
adaef486: am
e78489b4: am
e22b42b3: Merge "docs: plugin reference update" into lmp-docs
* commit '
adaef486464af836cd3408657634c972419e4c80':
docs: plugin reference update
Scott Rowe [Tue, 9 Dec 2014 23:51:39 +0000 (15:51 -0800)]
docs: Checklist for TV Apps
Change-Id: I93b57161b3e519164dab551068411f686d772596
Christopher Tate [Tue, 6 Jan 2015 01:07:57 +0000 (17:07 -0800)]
Remove the "backup_data_changed" event log
Nowadays it's just spammy and uninformative, so away it goes.
Bug
18833115
Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e
Alan Viverette [Tue, 6 Jan 2015 00:49:07 +0000 (00:49 +0000)]
Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev
Shishir Agrawal [Tue, 6 Jan 2015 00:37:05 +0000 (00:37 +0000)]
Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
Rich Slogar [Tue, 6 Jan 2015 00:23:55 +0000 (16:23 -0800)]
docs: studio bundle checksum update
Change-Id: I3307009db1be1c4d6f01d158d577a6c373b316bf
Sungsoo Lim [Tue, 6 Jan 2015 00:13:12 +0000 (00:13 +0000)]
Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev
Alan Viverette [Tue, 6 Jan 2015 00:06:26 +0000 (16:06 -0800)]
Scroll handle was half as opaque as it was supposed to be
BUG:
18903443
Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a
Dianne Hackborn [Tue, 6 Jan 2015 00:05:05 +0000 (16:05 -0800)]
Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit
No longer modify the base constants when computing oom adj values.
Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
Quddus Chong [Mon, 5 Jan 2015 22:32:23 +0000 (14:32 -0800)]
docs: Updated GMS version numbering to be consistent with blog post.
bug:
18718181
Change-Id: I185157d84ebfe4ecc7b166b44d3d4735d8a106e3
Ricardo Cervera [Mon, 5 Jan 2015 23:38:03 +0000 (23:38 +0000)]
am
f211b625: am
fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '
f211b6257d3915054e7d92e9cfcb5eeaf3019b1a':
docs: Minor fixes to Watch Faces design guidelines.
Deepanshu Gupta [Mon, 5 Jan 2015 23:33:18 +0000 (23:33 +0000)]
am
6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit '
6461e05420c6f42b0e70134a4e0d2a626161ab74':
Add image comparison to LayoutLib tests.
Deepanshu Gupta [Mon, 5 Jan 2015 23:33:14 +0000 (23:33 +0000)]
am
b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev
* commit '
b2ebb9683fb5b21543b50772a0d4c646ced7764b':
Remove Time from CreateInfo
Deepanshu Gupta [Mon, 5 Jan 2015 23:33:10 +0000 (23:33 +0000)]
am
53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '
53f73a97542c277a519b973060dfa217849b66de':
Add DatePicker, CalendarView to LayoutLib tests
Deepanshu Gupta [Mon, 5 Jan 2015 23:33:06 +0000 (23:33 +0000)]
am
f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit '
f9bb0b5e133b0c364c3f87623f0fdff0fedc5226':
Fix DatePicker rendering.
Deepanshu Gupta [Mon, 5 Jan 2015 23:33:02 +0000 (23:33 +0000)]
am
d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit '
d20a518c82e5e33d33e3dc5d74bf3c17d807f7d7':
Make Preference-cookie map non static.
Deepanshu Gupta [Mon, 5 Jan 2015 23:32:58 +0000 (23:32 +0000)]
am
f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit '
f861c0ce3ff42550f3d5ede837e7bfb3855f5964':
Fix default initial value for preferences
Deepanshu Gupta [Mon, 5 Jan 2015 23:32:53 +0000 (23:32 +0000)]
am
7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '
7081a114d4ee190c746f337057b0f84928c162dd':
Add preferences rendering.
Ricardo Cervera [Mon, 5 Jan 2015 23:28:24 +0000 (23:28 +0000)]
am
fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '
fa6fb0daa5e6f9d3b0c17c8831c7525e403bd785':
docs: Minor fixes to Watch Faces design guidelines.
Deepanshu Gupta [Mon, 5 Jan 2015 23:26:02 +0000 (23:26 +0000)]
Merge "resolved conflicts for
a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
Deepanshu Gupta [Mon, 5 Jan 2015 23:24:58 +0000 (23:24 +0000)]
Merge "Add image comparison to LayoutLib tests." into lmp-dev
Deepanshu Gupta [Mon, 5 Jan 2015 23:24:24 +0000 (23:24 +0000)]
Merge "Remove Time from CreateInfo" into lmp-dev
Deepanshu Gupta [Mon, 5 Jan 2015 23:23:40 +0000 (23:23 +0000)]
Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
Deepanshu Gupta [Mon, 5 Jan 2015 23:23:31 +0000 (23:23 +0000)]
Merge "Fix DatePicker rendering." into lmp-dev
Deepanshu Gupta [Mon, 5 Jan 2015 23:22:57 +0000 (23:22 +0000)]
Merge "Make Preference-cookie map non static." into lmp-dev
OSDN Git Service
