OSDN Git Service
Yin-Chia Yeh [Wed, 7 Jan 2015 00:57:59 +0000 (00:57 +0000)]
am
641178f9: am
c2112a75: am
8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
* commit '
641178f94fa5561cb5fe2f893f689b7cd568eaa1':
Camera: doc update for color aberration modes
Ye Wen [Wed, 7 Jan 2015 00:57:52 +0000 (00:57 +0000)]
am
4ae347a4: am
ded6ccdc: am
55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev
* commit '
4ae347a4f11d34f3bc6f4fc8f7f6ca0f6588a710':
Add new mms error for no data network (airplane mode or no mobile data)
Paul Lawrence [Wed, 7 Jan 2015 00:57:39 +0000 (00:57 +0000)]
am
91bf111a: am
53d1022e: am
a15d6402: Merge "Fix crash caused by toHex returning exception"
* commit '
91bf111aef4a0fe1cd11f08d09d0e53c8278e51e':
Fix crash caused by toHex returning exception
Deepanshu Gupta [Wed, 7 Jan 2015 00:57:22 +0000 (00:57 +0000)]
am
27ce2763: Merge "resolve conflict for
8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp
* commit '
27ce2763325bcb7940232a11892e12fb86053cf7':
resolve conflict for
8c831b2f -> lmp-mr1-dev-plus-aosp again
Ricardo Cervera [Wed, 7 Jan 2015 00:57:14 +0000 (00:57 +0000)]
am
641353b6: am
85e0e70d: am
58872406: am
a9a51433: am
f211b625: am
fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '
641353b6c28708ec8a5e1eb4143138e5b3e4674b':
docs: Minor fixes to Watch Faces design guidelines.
Deepanshu Gupta [Wed, 7 Jan 2015 00:45:41 +0000 (00:45 +0000)]
am
d5455fed: am
aebd7fdb: am
565f2245: am
a6671b70: am
6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit '
d5455fedaf0a55dfe25cf94d6bbb9ecf6f305725':
Add image comparison to LayoutLib tests.
Deepanshu Gupta [Wed, 7 Jan 2015 00:45:37 +0000 (00:45 +0000)]
am
a2a5ce49: resolved conflicts for merge of
8c831b2f to lmp-mr1-dev-plus-aosp
* commit '
a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2':
Remove Time from CreateInfo
Deepanshu Gupta [Wed, 7 Jan 2015 00:45:31 +0000 (00:45 +0000)]
am
5760f153: am
c2e9875d: am
229ce665: am
937db7a3: am
53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '
5760f1535b0bb619c72e8d4478fc65283bd89eb7':
Add DatePicker, CalendarView to LayoutLib tests
Deepanshu Gupta [Wed, 7 Jan 2015 00:45:27 +0000 (00:45 +0000)]
am
67cf0bf4: am
84097e39: am
b187106c: am
e69e4f8b: am
f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit '
67cf0bf421370c756d93ca52697fbce03e34c09c':
Fix DatePicker rendering.
Deepanshu Gupta [Wed, 7 Jan 2015 00:45:23 +0000 (00:45 +0000)]
am
adcd2241: am
c7fe9793: am
48ab6bec: am
8c686ddd: am
d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit '
adcd224135e3c12f483547ffa8bb2cb0250ba923':
Make Preference-cookie map non static.
Deepanshu Gupta [Wed, 7 Jan 2015 00:45:18 +0000 (00:45 +0000)]
am
d050df72: am
addaeff9: am
b88a65df: am
cec8e5a1: am
f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit '
d050df7275137f9c57ce79a7b46d51e2d1fb9290':
Fix default initial value for preferences
Deepanshu Gupta [Wed, 7 Jan 2015 00:41:58 +0000 (16:41 -0800)]
resolved conflicts for merge of
20db8770 to master
Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc
Ricardo Cervera [Wed, 7 Jan 2015 00:36:12 +0000 (00:36 +0000)]
Merge "resolved conflicts for merge of
6302a72a to master"
Alan Viverette [Wed, 7 Jan 2015 00:36:07 +0000 (00:36 +0000)]
Merge "Add getDither, getFilterBitmap to Drawable for CTS testing"
Ricardo Cervera [Wed, 7 Jan 2015 00:31:37 +0000 (16:31 -0800)]
resolved conflicts for merge of
6302a72a to master
Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd
Yin-Chia Yeh [Wed, 7 Jan 2015 00:10:51 +0000 (00:10 +0000)]
am
c2112a75: am
8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
* commit '
c2112a75983cce62ed493ec0feafbb2c27ad76b4':
Camera: doc update for color aberration modes
Yin-Chia Yeh [Wed, 7 Jan 2015 00:04:13 +0000 (00:04 +0000)]
am
8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
* commit '
8d46f934ca56e057182882034d796cc03e960c4d':
Camera: doc update for color aberration modes
Ye Wen [Wed, 7 Jan 2015 00:01:40 +0000 (00:01 +0000)]
am
ded6ccdc: am
55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev
* commit '
ded6ccdc7691a520e3bfe6374fd23ecec395b078':
Add new mms error for no data network (airplane mode or no mobile data)
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:54:50 +0000 (23:54 +0000)]
am
55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev
* commit '
55fb7576c34e859a9dbd6f3825ca8cf6f3d3f88e':
Add new mms error for no data network (airplane mode or no mobile data)
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
Paul Lawrence [Tue, 6 Jan 2015 23:45:48 +0000 (23:45 +0000)]
am
53d1022e: am
a15d6402: Merge "Fix crash caused by toHex returning exception"
* commit '
53d1022e835f0556095dee168f5bb491a29fd0ac':
Fix crash caused by toHex returning exception
Paul Lawrence [Tue, 6 Jan 2015 23:39:44 +0000 (23:39 +0000)]
am
a15d6402: Merge "Fix crash caused by toHex returning exception"
* commit '
a15d6402cf4f99e448c7aaa69553483cdb18e0d4':
Fix crash caused by toHex returning exception
Paul Lawrence [Tue, 6 Jan 2015 23:34:06 +0000 (23:34 +0000)]
Merge "Fix crash caused by toHex returning exception"
Paul Lawrence [Tue, 6 Jan 2015 21:11:23 +0000 (13:11 -0800)]
Fix crash caused by toHex returning exception
toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.
Bug:
18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167
Deepanshu Gupta [Tue, 6 Jan 2015 23:00:37 +0000 (23:00 +0000)]
Merge "resolve conflict for
8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp
Deepanshu Gupta [Tue, 6 Jan 2015 22:58:37 +0000 (14:58 -0800)]
resolve conflict for
8c831b2f -> lmp-mr1-dev-plus-aosp again
The earlier resolution (
a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2)
wasn't the right one. This fixes it.
Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
Ricardo Cervera [Tue, 6 Jan 2015 22:57:10 +0000 (22:57 +0000)]
am
85e0e70d: am
58872406: am
a9a51433: am
f211b625: am
fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '
85e0e70dfa0deeda303a17da2d6d3981028af06f':
docs: Minor fixes to Watch Faces design guidelines.
Deepanshu Gupta [Tue, 6 Jan 2015 22:50:18 +0000 (22:50 +0000)]
am
aebd7fdb: am
565f2245: am
a6671b70: am
6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit '
aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199':
Add image comparison to LayoutLib tests.
Baligh Uddin [Tue, 6 Jan 2015 22:50:17 +0000 (22:50 +0000)]
am
efc0bbec: (-s ours) am
94c4b4b2: (-s ours) am
15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
automerge:
5e1b4a0 -s ours
* commit '
5e1b4a0c8301716bd20fa172db523013e7b698bd':
Import translations. DO NOT MERGE
Ricardo Cervera [Tue, 6 Jan 2015 22:48:36 +0000 (22:48 +0000)]
am
58872406: am
a9a51433: am
f211b625: am
fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
* commit '
58872406a7f51f572fc272c12ab26024a358df07':
docs: Minor fixes to Watch Faces design guidelines.
Sarah Maddox [Tue, 6 Jan 2015 22:47:29 +0000 (22:47 +0000)]
am
efd72a48: am
f22bca34: am
7d9309b6: am
029acc8e: am
ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
automerge:
7aa9d75
* commit '
7aa9d752c8cb5cfb9eeeeec23f53d1ad8ea271c2':
docs: Fixes typo on Play services page for Maps.
Deepanshu Gupta [Tue, 6 Jan 2015 22:46:27 +0000 (14:46 -0800)]
resolved conflicts for merge of
8c831b2f to lmp-mr1-dev-plus-aosp
Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb
Joe Fernandez [Tue, 6 Jan 2015 22:45:54 +0000 (22:45 +0000)]
am
952ebe3f: am
64d74fbf: am
69434df3: am
180bd6be: am
76db15a8: docs: fix problem with TOC after Japanese pages merge
automerge:
88f10a8f
* commit '
88f10a8f8ef616676dbf7f0ef68df32a8b75eea8':
docs: fix problem with TOC after Japanese pages merge
David Friedman [Tue, 6 Jan 2015 22:44:32 +0000 (22:44 +0000)]
am
859e176b: am
aed8152d: 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
automerge:
b64dea3
* commit '
b64dea3607ee12b3fd0e164b5c5fc90791bcdccd':
Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
Joe Fernandez [Tue, 6 Jan 2015 22:41:51 +0000 (22:41 +0000)]
am
9ebb780c: am
750c0385: am
214e6867: am
c27d5fd6: am
7cec35ef: Merge "docs: b/
18122848 [DAC] Android TV - Recommendation card" into lmp-docs
automerge:
698f155
* commit '
698f1557ff32c38b76891787050c64c2e01fd794':
docs: b/
18122848 [DAC] Android TV - Recommendation card
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.
Joe Fernandez [Tue, 6 Jan 2015 22:39:58 +0000 (22:39 +0000)]
am
633db0ee: am
c4429f1f: am
001f6f54: am
66fefd0c: am
a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
automerge:
60906b5
* commit '
60906b55ba63f24f94c2df0f6c856aad977d3213':
docs: plugin link name update
Scott Rowe [Tue, 6 Jan 2015 22:38:43 +0000 (22:38 +0000)]
am
dfc950b4: am
aa7c1f68: am
13d31b0a: am
d7d1411a: am
e2b44f86: docs: Making TV Apps Searchable - new training
automerge:
d35c1d3
* commit '
d35c1d3f47102a836d97121cb5c7f921f5022edf':
docs: Making TV Apps Searchable - new training
Deepanshu Gupta [Tue, 6 Jan 2015 22:36:45 +0000 (22:36 +0000)]
am
c2e9875d: am
229ce665: am
937db7a3: am
53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '
c2e9875dcb173a4965b5c0e6022fc2e81f0a37ef':
Add DatePicker, CalendarView to LayoutLib tests
Deepanshu Gupta [Tue, 6 Jan 2015 22:36:39 +0000 (22:36 +0000)]
am
84097e39: am
b187106c: am
e69e4f8b: am
f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit '
84097e3977c82554aafc2e461cd51d6f5eb03866':
Fix DatePicker rendering.
Deepanshu Gupta [Tue, 6 Jan 2015 22:36:33 +0000 (22:36 +0000)]
am
c7fe9793: am
48ab6bec: am
8c686ddd: am
d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit '
c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2':
Make Preference-cookie map non static.
Deepanshu Gupta [Tue, 6 Jan 2015 22:36:27 +0000 (22:36 +0000)]
am
addaeff9: am
b88a65df: am
cec8e5a1: am
f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit '
addaeff9b28d833616376f802b7a38e32397edd1':
Fix default initial value for preferences
Deepanshu Gupta [Tue, 6 Jan 2015 22:36:21 +0000 (22:36 +0000)]
am
e15f580b: am
2bd01ebf: am
7ed14549: am
7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '
e15f580b9d7a555bff96efd3cec195b39637e679':
Add preferences rendering.
Ricardo Cervera [Tue, 6 Jan 2015 22:36:16 +0000 (22:36 +0000)]
am
934c8ddc: am
ebc28729: am
e7d1db56: am
d69238ef: am
4bb503cf: docs: Minor fixes in Android Studio pages.
* commit '
934c8ddc207133cc26eea9ce10d2079f2d6ff3ea':
docs: Minor fixes in Android Studio pages.
Baligh Uddin [Tue, 6 Jan 2015 22:36:10 +0000 (22:36 +0000)]
am
efc0bbec: (-s ours) am
94c4b4b2: (-s ours) am
15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
efc0bbecc5dad6e1ac78b39b4f6f0c7f943d2b25':
Import translations. DO NOT MERGE
Sarah Maddox [Tue, 6 Jan 2015 22:36:05 +0000 (22:36 +0000)]
am
efd72a48: am
f22bca34: am
7d9309b6: am
029acc8e: am
ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
* commit '
efd72a4845a976aac5f9a8a464a1ee6fdbcec28a':
docs: Fixes typo on Play services page for Maps.
Joe Fernandez [Tue, 6 Jan 2015 22:35:59 +0000 (22:35 +0000)]
am
952ebe3f: am
64d74fbf: am
69434df3: am
180bd6be: am
76db15a8: docs: fix problem with TOC after Japanese pages merge
* commit '
952ebe3fac284d4602aba3e36db80c407f6bc476':
docs: fix problem with TOC after Japanese pages merge
David Friedman [Tue, 6 Jan 2015 22:35:54 +0000 (22:35 +0000)]
am
859e176b: am
aed8152d: 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 '
859e176bfeb36cfafc1d8ed0a8748aefa2cf1982':
Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
Joe Fernandez [Tue, 6 Jan 2015 22:35:47 +0000 (22:35 +0000)]
am
9ebb780c: am
750c0385: am
214e6867: am
c27d5fd6: am
7cec35ef: Merge "docs: b/
18122848 [DAC] Android TV - Recommendation card" into lmp-docs
* commit '
9ebb780ccb600b7528b88a4d7929243fb1205cca':
docs: b/
18122848 [DAC] Android TV - Recommendation card
Joe Fernandez [Tue, 6 Jan 2015 22:35:41 +0000 (22:35 +0000)]
am
633db0ee: am
c4429f1f: am
001f6f54: am
66fefd0c: am
a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '
633db0ee6644d3bb1f59ea274bb05cfa305daa5c':
docs: plugin link name update
Scott Rowe [Tue, 6 Jan 2015 22:35:34 +0000 (22:35 +0000)]
am
dfc950b4: am
aa7c1f68: am
13d31b0a: am
d7d1411a: am
e2b44f86: docs: Making TV Apps Searchable - new training
* commit '
dfc950b40d7d24c08dc56ffec5327f8da11960e7':
docs: Making TV Apps Searchable - new training
Deepanshu Gupta [Tue, 6 Jan 2015 22:29:52 +0000 (22:29 +0000)]
am
565f2245: am
a6671b70: am
6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit '
565f2245402f4fe6038942b03b9a35cfc0d48d86':
Add image comparison to LayoutLib tests.
Deepanshu Gupta [Tue, 6 Jan 2015 22:29:46 +0000 (22:29 +0000)]
am
86f96d07: am
0db2524c: am
b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev
* commit '
86f96d07c7d531d69bab3d402d33eb8f15038eee':
Remove Time from CreateInfo
Deepanshu Gupta [Tue, 6 Jan 2015 22:29:39 +0000 (22:29 +0000)]
am
229ce665: am
937db7a3: am
53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '
229ce66583a51baabf83fec4d0c42af0d3ecba38':
Add DatePicker, CalendarView to LayoutLib tests
Deepanshu Gupta [Tue, 6 Jan 2015 22:29:34 +0000 (22:29 +0000)]
am
b187106c: am
e69e4f8b: am
f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit '
b187106c5397072b6ae26061cec847ec9343caee':
Fix DatePicker rendering.
Deepanshu Gupta [Tue, 6 Jan 2015 22:29:29 +0000 (22:29 +0000)]
am
48ab6bec: am
8c686ddd: am
d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit '
48ab6becea828c0bcaaf79fe930aac31881f59db':
Make Preference-cookie map non static.
Deepanshu Gupta [Tue, 6 Jan 2015 22:29:24 +0000 (22:29 +0000)]
am
b88a65df: am
cec8e5a1: am
f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit '
b88a65df73798becc57004b3fc55fdf8c0a83a13':
Fix default initial value for preferences
Deepanshu Gupta [Tue, 6 Jan 2015 22:29:17 +0000 (22:29 +0000)]
am
2bd01ebf: am
7ed14549: am
7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '
2bd01ebfa99815d4fb6b4e77754146a22cf66d03':
Add preferences rendering.
Ricardo Cervera [Tue, 6 Jan 2015 22:29:12 +0000 (22:29 +0000)]
am
ebc28729: am
e7d1db56: am
d69238ef: am
4bb503cf: docs: Minor fixes in Android Studio pages.
* commit '
ebc2872929177c4780c68a0371a44c25f89a4f1f':
docs: Minor fixes in Android Studio pages.
Baligh Uddin [Tue, 6 Jan 2015 22:29:07 +0000 (22:29 +0000)]
am
94c4b4b2: (-s ours) am
15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
94c4b4b2a5c368a4894bbd8a42301f7ce443129b':
Import translations. DO NOT MERGE
Sarah Maddox [Tue, 6 Jan 2015 22:28:54 +0000 (22:28 +0000)]
am
f22bca34: am
7d9309b6: am
029acc8e: am
ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
* commit '
f22bca34a08c4e24981f169d20135835a189cbf4':
docs: Fixes typo on Play services page for Maps.
Joe Fernandez [Tue, 6 Jan 2015 22:28:49 +0000 (22:28 +0000)]
am
64d74fbf: am
69434df3: am
180bd6be: am
76db15a8: docs: fix problem with TOC after Japanese pages merge
* commit '
64d74fbf8739d6992ccb9b42c53705ad9fce9e91':
docs: fix problem with TOC after Japanese pages merge
David Friedman [Tue, 6 Jan 2015 22:28:43 +0000 (22:28 +0000)]
am
aed8152d: 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 '
aed8152d864b90363569c3a2de09de35048cfeb2':
Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
Joe Fernandez [Tue, 6 Jan 2015 22:28:38 +0000 (22:28 +0000)]
am
750c0385: am
214e6867: am
c27d5fd6: am
7cec35ef: Merge "docs: b/
18122848 [DAC] Android TV - Recommendation card" into lmp-docs
* commit '
750c0385601964ae0bf16b75fe94eb1da22ffa29':
docs: b/
18122848 [DAC] Android TV - Recommendation card
Joe Fernandez [Tue, 6 Jan 2015 22:28:33 +0000 (22:28 +0000)]
am
c4429f1f: am
001f6f54: am
66fefd0c: am
a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '
c4429f1fac0a7be38adaed24eec87e3d3d1e077c':
docs: plugin link name update
Scott Rowe [Tue, 6 Jan 2015 22:28:25 +0000 (22:28 +0000)]
am
aa7c1f68: am
13d31b0a: am
d7d1411a: am
e2b44f86: docs: Making TV Apps Searchable - new training
* commit '
aa7c1f6845dcac1ade80196280ead40958bd1acd':
docs: Making TV Apps Searchable - new training
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 Lawrence [Tue, 6 Jan 2015 22:06:49 +0000 (22:06 +0000)]
Merge "Fix crash caused by toHex returning exception"
Paul Lawrence [Tue, 6 Jan 2015 21:11:23 +0000 (13:11 -0800)]
Fix crash caused by toHex returning exception
toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.
Bug:
18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167
Christopher Tate [Tue, 6 Jan 2015 20:09:41 +0000 (20:09 +0000)]
am
ad02e38b: am
0a511d33: am
1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev
* commit '
ad02e38b631ff4e7a9fa26c7ed5240052fb29960':
Remove the "backup_data_changed" event log
Dianne Hackborn [Tue, 6 Jan 2015 20:09:36 +0000 (20:09 +0000)]
am
3d44382a: am
6f36bd3a: am
5fe8197f: Merge "Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev
* commit '
3d44382aca0528a163be0bc7619208ce4b1e5798':
Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit
Olawale Ogunwale [Tue, 6 Jan 2015 20:09:30 +0000 (20:09 +0000)]
am
59820738: am
d8aa4660: am
da90a9c2: Merge "Do not allow the navigation bar to move if width == height"
* commit '
59820738fd75d1c1311d30280f82f51d251c8d66':
Do not allow the navigation bar to move if width == height
Paul Jensen [Tue, 6 Jan 2015 20:09:28 +0000 (20:09 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Paul Jensen [Tue, 6 Jan 2015 20:09:18 +0000 (20:09 +0000)]
am
932bfab9: am
6c93739f: am
9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
* commit '
932bfab9aaa58f116935eb0a1f22de49301724c4':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
Narayan Kamath [Tue, 6 Jan 2015 20:09:12 +0000 (20:09 +0000)]
am
031acc4b: am
3787decd: am
5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
* commit '
031acc4b3920336e58c56abb99322cbeb9be9e5c':
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
Narayan Kamath [Tue, 6 Jan 2015 20:09:06 +0000 (20:09 +0000)]
am
721d0994: am
f60b2d40: am
024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."
* commit '
721d0994dc6ed370e359a33a6798f87389a428c8':
Fix comment. It should be 'or' not 'of'.
Jinsuk Kim [Tue, 6 Jan 2015 20:09:01 +0000 (20:09 +0000)]
am
30a061ed: am
e96f9dd1: am
b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev
* commit '
30a061ed4ffb7360d55b610566ce47b57c058543':
CEC: Make deviceSelect work for MHL device
Jinsuk Kim [Tue, 6 Jan 2015 20:06:57 +0000 (20:06 +0000)]
am
e96f9dd1: am
b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev
automerge:
30a061e
* commit '
30a061ed4ffb7360d55b610566ce47b57c058543':
CEC: Make deviceSelect work for MHL device
Andrew Solovay [Tue, 6 Jan 2015 20:04:03 +0000 (20:04 +0000)]
am
eeaf280d: am
ff62a5ee: am
4c7390d3: am
b663f2fc: am
713cd74e: docs: New "app compatibility with managed profiles" doc
automerge:
7dd1f66
* commit '
7dd1f66bb66ac9a6f6dbf2bcc2c4548b9d123491':
docs: New "app compatibility with managed profiles" doc
Joe Fernandez [Tue, 6 Jan 2015 20:01:43 +0000 (20:01 +0000)]
am
c632031a: am
27195338: am
546a0e8c: am
60925265: am
afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
automerge:
7cf74ee
* commit '
7cf74ee6e2c51afaf07e29f8597475ec289a20ed':
docs: studio build output dir name update
Joe Fernandez [Tue, 6 Jan 2015 19:58:32 +0000 (19:58 +0000)]
am
06cdc2fd: am
851931f0: am
21b92f34: am
43f4e8fa: am
27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
automerge:
629612a
* commit '
629612a9d2d1a52809cd0549a1b6d2cbcf1a3d09':
docs: gradle version update in plugin file
Joe Fernandez [Tue, 6 Jan 2015 19:56:46 +0000 (19:56 +0000)]
am
4dc7c158: am
3dcc1289: am
447ea509: am
f110d357: am
8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
automerge:
148a578
* commit '
148a57877ec5272a6768f427bd280a4d9c18acb1':
docs: gradle wrapper security note
Nick Kralevich [Tue, 6 Jan 2015 19:50:08 +0000 (11:50 -0800)]
resolved conflicts for merge of
175ef812 to master
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
Joe Fernandez [Tue, 6 Jan 2015 19:36:41 +0000 (19:36 +0000)]
am
e7558b44: am
596868b6: am
c811b88a: am
d3d09d87: am
66e851fa: Merge "docs: studio workflow links" into lmp-docs
automerge:
8109599b
* commit '
8109599b1c6306d1f2239a88f0cf9ba3ea584f2b':
docs: studio workflow links
OSDN Git Service
