OSDN Git Service
Jim Miller [Fri, 21 Nov 2014 18:55:36 +0000 (18:55 +0000)]
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge:
0284e5e
automerge:
eab3240
* commit '
eab3240c78423e791a7f36864f55f94c25a5aba5':
Add multi-sim support to keyguard
Jim Miller [Fri, 21 Nov 2014 18:53:10 +0000 (18:53 +0000)]
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
automerge:
0284e5e
* commit '
0284e5e49864a6e039d77210bbea0a013b0e23ec':
Add multi-sim support to keyguard
Jim Miller [Fri, 21 Nov 2014 18:37:59 +0000 (18:37 +0000)]
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
Andreas Gampe [Fri, 21 Nov 2014 18:36:14 +0000 (10:36 -0800)]
resolved conflicts for merge of
3fc5e3ca to lmp-mr1-dev-plus-aosp
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
Andreas Gampe [Fri, 21 Nov 2014 18:22:36 +0000 (18:22 +0000)]
am
2c596a53: Merge "Frameworks/base: Consistency in core/jni"
* commit '
2c596a533488320444e28bbe37b7032589a0c5dd':
Frameworks/base: Consistency in core/jni
Andreas Gampe [Fri, 21 Nov 2014 18:18:35 +0000 (18:18 +0000)]
Merge "Frameworks/base: Consistency in core/jni"
Andreas Gampe [Fri, 21 Nov 2014 06:02:20 +0000 (22:02 -0800)]
Frameworks/base: Consistency in core/jni
Make consistent use of core_jni_helpers for registration.
Translate some #ifdefs into const bools.
Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
Andreas Gampe [Fri, 21 Nov 2014 18:08:10 +0000 (18:08 +0000)]
Merge "resolved conflicts for merge of
09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Adrian Roos [Fri, 21 Nov 2014 18:04:23 +0000 (18:04 +0000)]
am
26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev
automerge:
0108d98
* commit '
0108d9836971d9f40bf7856d1858ecc4b153e511':
Explicitly specify user for public mode
Adrian Roos [Fri, 21 Nov 2014 18:02:26 +0000 (18:02 +0000)]
am
26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev
* commit '
26750711e12900aca6c7c35556b4548038cfb505':
Explicitly specify user for public mode
Rubin Xu [Fri, 21 Nov 2014 17:59:49 +0000 (17:59 +0000)]
am
55a05e4d: am
b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev
* commit '
55a05e4d35c0886733586db0d5aa1af5030d35a7':
String literals for CL ag/586597
Andreas Gampe [Fri, 21 Nov 2014 17:57:52 +0000 (09:57 -0800)]
resolved conflicts for merge of
09910723 to lmp-mr1-dev-plus-aosp
Change-Id: I4b47723a9314bf9bef08e68ce269038d0d50c5d9
Adrian Roos [Fri, 21 Nov 2014 17:56:59 +0000 (17:56 +0000)]
Merge "Explicitly specify user for public mode" into lmp-mr1-dev
Ruben Brunk [Fri, 21 Nov 2014 17:55:19 +0000 (17:55 +0000)]
am
a345b367: am
5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
* commit '
a345b3671a8e2d1a91ccb594f219303d3e1f135f':
Camera2: Doc updates for aeExposureCompensation.
Rubin Xu [Fri, 21 Nov 2014 17:54:26 +0000 (17:54 +0000)]
am
b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev
* commit '
b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
String literals for CL ag/586597
Rubin Xu [Fri, 21 Nov 2014 17:50:20 +0000 (17:50 +0000)]
Merge "String literals for CL ag/586597" into lmp-mr1-dev
Ruben Brunk [Fri, 21 Nov 2014 17:49:34 +0000 (17:49 +0000)]
am
5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
* commit '
5d3d53aa1361c094f05aa70129e49a04875ab5a6':
Camera2: Doc updates for aeExposureCompensation.
Andreas Gampe [Fri, 21 Nov 2014 17:47:57 +0000 (17:47 +0000)]
am
0da1cbaa: am
e042791e: Merge "Frameworks/base: Remove unused header"
* commit '
0da1cbaaabbe85e140dabf3fa2b289431c9d3910':
Frameworks/base: Remove unused header
Ruben Brunk [Fri, 21 Nov 2014 17:42:42 +0000 (17:42 +0000)]
Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
Andreas Gampe [Fri, 21 Nov 2014 17:41:31 +0000 (17:41 +0000)]
am
ed368be7: Merge "Frameworks/base: Wall Werror in media/tests"
* commit '
ed368be79248d8e0a71c383b2ed6eb93b451810e':
Frameworks/base: Wall Werror in media/tests
Andreas Gampe [Fri, 21 Nov 2014 17:41:25 +0000 (17:41 +0000)]
am
e042791e: Merge "Frameworks/base: Remove unused header"
* commit '
e042791e753d35d7fd60f0a9a2b5764dc8d9afac':
Frameworks/base: Remove unused header
Andreas Gampe [Fri, 21 Nov 2014 17:39:32 +0000 (17:39 +0000)]
Merge "Frameworks/base: Wall Werror in media/tests"
Andreas Gampe [Fri, 21 Nov 2014 17:38:06 +0000 (17:38 +0000)]
Merge "Frameworks/base: Remove unused header"
Rubin Xu [Thu, 20 Nov 2014 23:59:51 +0000 (23:59 +0000)]
String literals for CL ag/586597
Mini-CL to get the strings in for translations.
Bug:
17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:28:20 +0000 (15:28 +0000)]
am
b3d0580f: am
08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev
* commit '
b3d0580f0fa126c258c54e8007ea8d51ed12810f':
Shutdown backup manager service when device owner is set
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:26:51 +0000 (15:26 +0000)]
am
07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev
automerge:
b3e8ff0
* commit '
b3e8ff00c85f37686a45597636d546a5e2a32c26':
Adding method to query backup manager service activity status
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:24:39 +0000 (15:24 +0000)]
am
08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev
* commit '
08229e817ecb67b0c7ebbd6b5b9ce4aef1b38cc2':
Shutdown backup manager service when device owner is set
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:24:33 +0000 (15:24 +0000)]
am
07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev
* commit '
07334334aab3863408325653ceccee47f9e1788d':
Adding method to query backup manager service activity status
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:21:03 +0000 (15:21 +0000)]
Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:20:44 +0000 (15:20 +0000)]
Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev
Adrian Roos [Fri, 21 Nov 2014 12:55:09 +0000 (13:55 +0100)]
Explicitly specify user for public mode
Bug:
18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
Paul Jensen [Fri, 21 Nov 2014 12:50:35 +0000 (12:50 +0000)]
am
0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev
automerge:
934b73f
* commit '
934b73fb50afd4280a1b6a509376ca86424fa7b2':
Don't allow an uncreated Network to satsify requests.
Paul Jensen [Fri, 21 Nov 2014 12:47:23 +0000 (12:47 +0000)]
am
0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev
* commit '
0653f508b58eab994089ae2da783852a5c1b4a8a':
Don't allow an uncreated Network to satsify requests.
Paul Jensen [Fri, 21 Nov 2014 12:42:32 +0000 (12:42 +0000)]
Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev
Geoffrey Borggaard [Fri, 21 Nov 2014 10:31:03 +0000 (10:31 +0000)]
am
8a2ac41d: am
e548c3a3: am
c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge:
90ed95f
* commit '
8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
Fix null handling in proxies.
Ricardo Cervera [Fri, 21 Nov 2014 10:26:43 +0000 (10:26 +0000)]
am
d9e6f658: am
462b3201: am
e9b5dfc0: am
25bf00bc: docs: Fixes to the Data Layer Wear class. automerge:
8837ce2
* commit '
d9e6f658a5bf3e5356a433f275bf2a60921b5a6c':
docs: Fixes to the Data Layer Wear class.
Ricardo Cervera [Fri, 21 Nov 2014 10:26:37 +0000 (10:26 +0000)]
am
d4ea7b3c: am
9aede602: am
c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge:
161dce4
* commit '
d4ea7b3cb626dbd807fed9477c50726fb7dd38a2':
docs: Fixes to the Data Layer Wear class.
Filip Gruszczynski [Fri, 21 Nov 2014 10:26:31 +0000 (10:26 +0000)]
am
5ea0411f: am
a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge:
96c5d37
* commit '
5ea0411f3900064f1d65b93bbe306525398ee4d7':
SwipeDismissLayout makes activity opaque only after entry animation ends.
Geoffrey Borggaard [Fri, 21 Nov 2014 10:25:37 +0000 (10:25 +0000)]
am
e548c3a3: am
c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge:
90ed95f
* commit '
e548c3a3786a252d42b3c0ae0823f4718fcb9718':
Fix null handling in proxies.
Andrew Solovay [Fri, 21 Nov 2014 10:23:22 +0000 (10:23 +0000)]
am
d3e2fd99: am
c79173c7: am
05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge:
b5b9c9b
automerge:
5a75a66
* commit '
5a75a660c0db30fcf0ab748d9907ec2374603232':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
Elliott Hughes [Fri, 21 Nov 2014 10:22:21 +0000 (10:22 +0000)]
am
2d732006: am
03c80408: am
6c43e6b5: Fix and be more explicit about plurals best practices. automerge:
4db3fc1
automerge:
889a259
* commit '
889a259118754af51699e06208feb668af3e6220':
Fix and be more explicit about plurals best practices.
Ricardo Cervera [Fri, 21 Nov 2014 10:21:30 +0000 (10:21 +0000)]
am
462b3201: am
e9b5dfc0: am
25bf00bc: docs: Fixes to the Data Layer Wear class. automerge:
8837ce2
* commit '
462b32011a0b5309e97c4c0bf6bed976d070127f':
docs: Fixes to the Data Layer Wear class.
Ricardo Cervera [Fri, 21 Nov 2014 10:21:25 +0000 (10:21 +0000)]
am
9aede602: am
c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge:
161dce4
* commit '
9aede602ff1fa23d1f97ccb0adf0967eef947977':
docs: Fixes to the Data Layer Wear class.
Filip Gruszczynski [Fri, 21 Nov 2014 10:21:19 +0000 (10:21 +0000)]
am
a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge:
96c5d37
* commit '
a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
SwipeDismissLayout makes activity opaque only after entry animation ends.
Dirk Dougherty [Fri, 21 Nov 2014 10:21:02 +0000 (10:21 +0000)]
am
40343340: am
ef629f1f: am
a79acc03: Doc change: localized content. automerge:
4d82f8a
automerge:
1896e58
* commit '
1896e5890489842aad280402d6144d272bce6730':
Doc change: localized content.
smain@google.com [Fri, 21 Nov 2014 10:19:49 +0000 (10:19 +0000)]
am
74bafd41: am
555d6e70: am
2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge:
6e08d30
automerge:
39d6b21
* commit '
39d6b21ee5021d3efd1bb4e8f2041d9d8251c298':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
Geoffrey Borggaard [Fri, 21 Nov 2014 10:17:39 +0000 (10:17 +0000)]
am
c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
automerge:
90ed95f
* commit '
90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
Fix null handling in proxies.
Quddus Chong [Fri, 21 Nov 2014 10:17:06 +0000 (10:17 +0000)]
am
ecccf10b: am
5b944f4a: am
8428c114: am
9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge:
a1e1890
* commit '
ecccf10b42e0964bd5ee77f1f3fe3094b53d788c':
docs: Added link to CarExtender class from Auto Getting Started doc.
Deepanshu Gupta [Fri, 21 Nov 2014 10:17:00 +0000 (10:17 +0000)]
am
58238d90: am
9ab79551: am
4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge:
ddc83df
* commit '
58238d900b43f6b780890b7ea93c11a877936ed7':
Fix setTextAppearance for styles with dots.
Andrew Solovay [Fri, 21 Nov 2014 10:16:55 +0000 (10:16 +0000)]
am
d3e2fd99: am
c79173c7: am
05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs automerge:
b5b9c9b
* commit '
d3e2fd99e23ca579d22508e40e4f58282ea7279e':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
Deepanshu Gupta [Fri, 21 Nov 2014 10:16:55 +0000 (10:16 +0000)]
am
b4a23798: am
1150292d: am
455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge:
a0bc2e7 -s ours
* commit '
b4a237987602b4243e20eb2d6858685cb54cf0a9':
LayoutLib: Stub AM/PM keycodes in Time Picker.
Elliott Hughes [Fri, 21 Nov 2014 10:16:50 +0000 (10:16 +0000)]
am
2d732006: am
03c80408: am
6c43e6b5: Fix and be more explicit about plurals best practices. automerge:
4db3fc1
* commit '
2d7320066fd2622241cb388201d8b584081cc19c':
Fix and be more explicit about plurals best practices.
Dirk Dougherty [Fri, 21 Nov 2014 10:16:40 +0000 (10:16 +0000)]
am
40343340: am
ef629f1f: am
a79acc03: Doc change: localized content. automerge:
4d82f8a
* commit '
403433401bf5a86405d79b6e48ac972941425ed0':
Doc change: localized content.
Ricardo Cervera [Fri, 21 Nov 2014 10:16:35 +0000 (10:16 +0000)]
am
e9b5dfc0: am
25bf00bc: docs: Fixes to the Data Layer Wear class.
automerge:
8837ce2
* commit '
8837ce2ce3b8e10a5201a18b77a790d0df43d8e4':
docs: Fixes to the Data Layer Wear class.
smain@google.com [Fri, 21 Nov 2014 10:16:34 +0000 (10:16 +0000)]
am
74bafd41: am
555d6e70: am
2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge:
6e08d30
* commit '
74bafd41afd2291a9b28c9f2ae3baabca9f1d72d':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
Ricardo Cervera [Fri, 21 Nov 2014 10:15:17 +0000 (10:15 +0000)]
am
c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev
automerge:
161dce4
* commit '
161dce465ef528568eac119235e635b217322485':
docs: Fixes to the Data Layer Wear class.
Filip Gruszczynski [Fri, 21 Nov 2014 10:13:59 +0000 (10:13 +0000)]
Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
automerge:
96c5d37
* commit '
96c5d37fb5139465cdd3d882b5deba830497557a':
SwipeDismissLayout makes activity opaque only after entry animation ends.
Andrew Solovay [Fri, 21 Nov 2014 10:12:52 +0000 (10:12 +0000)]
am
c79173c7: am
05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs
automerge:
b5b9c9b
* commit '
b5b9c9b589c058d9e21ca23976d7574f9c604e38':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
Quddus Chong [Fri, 21 Nov 2014 10:11:49 +0000 (10:11 +0000)]
am
5b944f4a: am
8428c114: am
9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc. automerge:
a1e1890
* commit '
5b944f4a3e9d3fcca9cd54c08bc4a95c9cd87f80':
docs: Added link to CarExtender class from Auto Getting Started doc.
Deepanshu Gupta [Fri, 21 Nov 2014 10:11:44 +0000 (10:11 +0000)]
am
9ab79551: am
4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge:
ddc83df
* commit '
9ab79551ac9cee85e019d524dae6a5a6b4004cb5':
Fix setTextAppearance for styles with dots.
Deepanshu Gupta [Fri, 21 Nov 2014 10:11:39 +0000 (10:11 +0000)]
am
1150292d: am
455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge:
a0bc2e7 -s ours
* commit '
1150292dacc912316a73594788f85d678faef15d':
LayoutLib: Stub AM/PM keycodes in Time Picker.
Elliott Hughes [Fri, 21 Nov 2014 10:11:34 +0000 (10:11 +0000)]
am
03c80408: am
6c43e6b5: Fix and be more explicit about plurals best practices.
automerge:
4db3fc1
* commit '
4db3fc1c28d3894aed92c5aae40f25e713a69894':
Fix and be more explicit about plurals best practices.
Dirk Dougherty [Fri, 21 Nov 2014 10:10:32 +0000 (10:10 +0000)]
am
ef629f1f: am
a79acc03: Doc change: localized content.
automerge:
4d82f8a
* commit '
4d82f8ad32f9caa3aff237600c4693f8907009e9':
Doc change: localized content.
smain@google.com [Fri, 21 Nov 2014 10:09:15 +0000 (10:09 +0000)]
am
555d6e70: am
2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
automerge:
6e08d30
* commit '
6e08d30da4db5fc8a433b93f16ada2bcf6d1a5cd':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
Quddus Chong [Fri, 21 Nov 2014 10:08:07 +0000 (10:08 +0000)]
am
8428c114: am
9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc.
automerge:
a1e1890
* commit '
a1e18907975436803bc13a65ec25f30b6606379e':
docs: Added link to CarExtender class from Auto Getting Started doc.
Deepanshu Gupta [Fri, 21 Nov 2014 10:06:59 +0000 (10:06 +0000)]
am
4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev
automerge:
ddc83df
* commit '
ddc83dfa8f17db1a8a566c8b92b0fea56dedd00a':
Fix setTextAppearance for styles with dots.
Deepanshu Gupta [Fri, 21 Nov 2014 10:05:07 +0000 (10:05 +0000)]
am
455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
automerge:
a0bc2e7 -s ours
* commit '
a0bc2e7e3c2f075a23449df00659c96d0cddb417':
LayoutLib: Stub AM/PM keycodes in Time Picker.
John Spurlock [Fri, 21 Nov 2014 03:45:30 +0000 (03:45 +0000)]
am
ed06df13: am
1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev
* commit '
ed06df131467ce29017f20cfd25068dd3ba95759':
Doze: Make proximity check configurable.
John Spurlock [Fri, 21 Nov 2014 03:40:45 +0000 (03:40 +0000)]
am
1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev
* commit '
1bd81e31f31a6d8dc06af79985ca820effab970c':
Doze: Make proximity check configurable.
John Spurlock [Fri, 21 Nov 2014 03:36:38 +0000 (03:36 +0000)]
Merge "Doze: Make proximity check configurable." into lmp-mr1-dev
Christopher Tate [Fri, 21 Nov 2014 03:09:06 +0000 (03:09 +0000)]
am
b2b8dcba: am
ad064d48: Merge "Recents backup helper" into lmp-mr1-dev
* commit '
b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
Recents backup helper
Alan Viverette [Fri, 21 Nov 2014 03:03:46 +0000 (03:03 +0000)]
am
8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
automerge:
fa4eba9
* commit '
fa4eba96374b971c13ee6427c74a78503c958757':
Update scrollbars to match Material spec
Alan Viverette [Fri, 21 Nov 2014 03:02:39 +0000 (03:02 +0000)]
am
69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev
automerge:
69b802f
* commit '
69b802fdb6a5920bb0bd0270298450ede52dcaf1':
Update overflow menu alignment to match spec
Dianne Hackborn [Fri, 21 Nov 2014 03:01:09 +0000 (03:01 +0000)]
am
28096c49: Merge "Fix issue #
15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev
automerge:
c43613b
* commit '
c43613becf0146a0d54ff15f5ca024d759c43290':
Fix issue #
15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
Geoffrey Borggaard [Fri, 21 Nov 2014 02:59:52 +0000 (02:59 +0000)]
am
271ddfce: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge:
e4590cf automerge:
db1e7fa
automerge:
6a110c1
* commit '
6a110c1adfcb4e996d1e1ac187dbbceb3113b879':
Setting ADB_ENABLED may result in a SecurityException.
John Spurlock [Fri, 21 Nov 2014 02:48:09 +0000 (21:48 -0500)]
Doze: Make proximity check configurable.
Default to true, but make it available for overlay or setting
at runtime.
Bug:
18373928
Change-Id: I6abc1924ea0f03620f4683dc055f64ede5782809
Alan Viverette [Fri, 21 Nov 2014 02:58:24 +0000 (02:58 +0000)]
am
e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev
automerge:
9eb4ee24
* commit '
9eb4ee244beb124c0e81d73126376ec8350984c6':
Make DeviceDefault alert dialog themes public
Erik Kline [Fri, 21 Nov 2014 02:57:09 +0000 (02:57 +0000)]
am
4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev
automerge:
dedd42a
* commit '
dedd42a2bdfafd6195d793949766d1c53f80ae51':
Rename EXTRA_NETWORK ConnectivityManager constants.
John Reck [Fri, 21 Nov 2014 02:56:03 +0000 (02:56 +0000)]
am
83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev
automerge:
d3e5777
* commit '
d3e5777e790cc98bb65ee047c4444ca233883d3f':
If the surface is lost, release it
John Reck [Fri, 21 Nov 2014 02:55:00 +0000 (02:55 +0000)]
am
0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev
automerge:
9b5d427
* commit '
9b5d427fe0e557d572657252e7b5a3fd99a74550':
Rename callDrawGLFunction
ztenghui [Fri, 21 Nov 2014 02:53:38 +0000 (02:53 +0000)]
am
002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev
automerge:
e9dbfe5
* commit '
e9dbfe5afd5cd350f06f078775a40e8df4e69ce6':
ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
Jaewan Kim [Fri, 21 Nov 2014 02:52:28 +0000 (02:52 +0000)]
am
18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev
automerge:
52dcc7f
* commit '
52dcc7fb0a17a77c41eddd1517821134946120b1':
Add an API to check availability of Ethernet interface.
Eino-Ville Talvala [Fri, 21 Nov 2014 02:51:02 +0000 (02:51 +0000)]
am
df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev
automerge:
b22de13
* commit '
b22de13fdb195716006b8e9b03f52d3ab60aecd5':
Camera: Add one more requirement to BURST_CAPTURE
Jean-Michel Trivi [Fri, 21 Nov 2014 02:49:43 +0000 (02:49 +0000)]
am
09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev
automerge:
14b9092
* commit '
14b909241fe4f43ca481e9cd367dd641fe395ff1':
Convert record channel mask for dynamic mix
Chris Craik [Fri, 21 Nov 2014 02:48:35 +0000 (02:48 +0000)]
am
93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev
automerge:
5b41215
* commit '
5b41215b1647d9673b1231d046736c8e0590fa8a':
Improve ColorMatrix docs
Adrian Roos [Fri, 21 Nov 2014 02:47:16 +0000 (02:47 +0000)]
am
4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev
automerge:
62a7d53
* commit '
62a7d5334315b4153f1da1112f945d13f72e0381':
Add device locked API for TrustAgentService
Adrian Roos [Fri, 21 Nov 2014 02:46:16 +0000 (02:46 +0000)]
am
af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev
automerge:
866bae5
* commit '
866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
Update KeyguardManager.isDeviceLocked API
Craig Mautner [Fri, 21 Nov 2014 02:44:31 +0000 (02:44 +0000)]
am
25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev
automerge:
9bb16f5
* commit '
9bb16f55e80afaeb6700af9fc97a58a8b3309412':
Ensure arraylist index is montonically decreasing
Eric Rowe [Fri, 21 Nov 2014 02:43:06 +0000 (02:43 +0000)]
am
1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev
automerge:
3b442e2
* commit '
3b442e23d859e84fe0550242257294c0b1e37438':
Fix wifi reconnection tests.
Wink Saville [Fri, 21 Nov 2014 02:41:53 +0000 (02:41 +0000)]
am
816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
automerge:
1caab41
* commit '
1caab41f31b2fd1129dff58fc678361b691af9db':
Revert "Additional changes to SubscriptionManager API as per API council."
Wink Saville [Fri, 21 Nov 2014 02:39:23 +0000 (02:39 +0000)]
am
4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
automerge:
68c21d6
* commit '
68c21d6736a2ec54d36c8b33b815062c568e4707':
Additional changes to SubscriptionManager API as per API council.
Craig Mautner [Fri, 21 Nov 2014 02:38:20 +0000 (02:38 +0000)]
am
37983832: Merge "Use package name as custom resolver process name" into lmp-mr1-dev
automerge:
8d1ab6f
* commit '
8d1ab6f2002d65dd351b0affd86cdfdbc27fd0fa':
Use package name as custom resolver process name
Adam Lesinski [Fri, 21 Nov 2014 02:36:57 +0000 (02:36 +0000)]
am
825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev
automerge:
b7ce6d6
* commit '
b7ce6d6db1409ec785d2d7146cbcc897fd02d85b':
Fix race when cleaning up receivers/services in Context
Eric Rowe [Fri, 21 Nov 2014 02:35:36 +0000 (02:35 +0000)]
am
79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev
automerge:
d2fd1bd
* commit '
d2fd1bd9d631e822b03bfabd41853cc3075f61bf':
Fix wifi tethering tests.
Christopher Tate [Fri, 21 Nov 2014 02:30:11 +0000 (02:30 +0000)]
am
ad064d48: Merge "Recents backup helper" into lmp-mr1-dev
* commit '
ad064d48adcfac71bd04d9f3bb5ea9d607d132a7':
Recents backup helper
Christopher Tate [Fri, 21 Nov 2014 02:24:30 +0000 (02:24 +0000)]
Merge "Recents backup helper" into lmp-mr1-dev
Alan Viverette [Fri, 21 Nov 2014 02:16:17 +0000 (02:16 +0000)]
am
8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
* commit '
8ae8500365e71c59cbe96f600371391ac8d245b8':
Update scrollbars to match Material spec
Alan Viverette [Fri, 21 Nov 2014 02:12:09 +0000 (02:12 +0000)]
Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
Alan Viverette [Fri, 21 Nov 2014 01:55:19 +0000 (01:55 +0000)]
am
69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev
* commit '
69fe1e8e5fef5ceac9aa476995623fe80424019d':
Update overflow menu alignment to match spec
Alan Viverette [Fri, 21 Nov 2014 01:50:37 +0000 (01:50 +0000)]
Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev
OSDN Git Service
