OSDN Git Service
Adam Lesinski [Tue, 7 Jul 2015 01:02:32 +0000 (01:02 +0000)]
am
c6c21522: am
a5bd0e3a: am
fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
* commit '
c6c215227fd78f04c0959c12bebb1dd44730f0f2':
BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
Billy Lau [Tue, 7 Jul 2015 01:02:26 +0000 (01:02 +0000)]
am
e2835f9f: am
212c006e: am
c81ecb6d: Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '
e2835f9f5b1e84864d746bcb7e5bb01c3dd98486':
Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Aravind Akella [Tue, 7 Jul 2015 01:02:19 +0000 (01:02 +0000)]
am
61f398fc: am
8cc759a5: am
adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev
* commit '
61f398fc1c993ef89c65498f367510d6cd80a7ea':
Remove flag mDataInjectionMode.
Winson Chung [Tue, 7 Jul 2015 01:02:13 +0000 (01:02 +0000)]
am
45e1153d: am
ef024af4: am
2924dc34: Merge "Adding metrics to overview." into mnc-dev
* commit '
45e1153d1631051a81cc56ed6cb16228e0a92004':
Adding metrics to overview.
Jean-Michel Trivi [Tue, 7 Jul 2015 01:02:06 +0000 (01:02 +0000)]
am
fe1b7ad0: am
87d3d893: am
760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev
* commit '
fe1b7ad0c62fa0405c454c4cfbdaf6840ad3b07d':
Ringtone: add support for volume control and looping
Adam Lesinski [Tue, 7 Jul 2015 00:58:11 +0000 (00:58 +0000)]
am
a5bd0e3a: am
fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
* commit '
a5bd0e3a3a61483ee27e24095461418f7d8c86df':
BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
Billy Lau [Tue, 7 Jul 2015 00:47:50 +0000 (00:47 +0000)]
am
212c006e: am
c81ecb6d: Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '
212c006e2aa0b8c430b09c85b70a0df4ffa37713':
Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Aravind Akella [Tue, 7 Jul 2015 00:47:46 +0000 (00:47 +0000)]
am
8cc759a5: am
adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev
* commit '
8cc759a551d15a00721ebc0b672143d462b68cf0':
Remove flag mDataInjectionMode.
Winson Chung [Tue, 7 Jul 2015 00:47:42 +0000 (00:47 +0000)]
am
ef024af4: am
2924dc34: Merge "Adding metrics to overview." into mnc-dev
* commit '
ef024af4207c0cb3955bbb4bd4fd994144d772e9':
Adding metrics to overview.
Jean-Michel Trivi [Tue, 7 Jul 2015 00:47:38 +0000 (00:47 +0000)]
am
87d3d893: am
760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev
* commit '
87d3d8937f606e3d1aaa590f60ece99906c0aeda':
Ringtone: add support for volume control and looping
Adam Lesinski [Tue, 7 Jul 2015 00:46:35 +0000 (00:46 +0000)]
am
fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
* commit '
fe45b29a1cce45b47f648cbff2b7d65890f1d638':
BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
Adam Lesinski [Tue, 7 Jul 2015 00:32:13 +0000 (00:32 +0000)]
Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
Billy Lau [Tue, 7 Jul 2015 00:31:53 +0000 (00:31 +0000)]
am
c81ecb6d: Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '
c81ecb6d2c6badb5ddbf19f7c90e350cf24322ee':
Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Aravind Akella [Tue, 7 Jul 2015 00:31:47 +0000 (00:31 +0000)]
am
adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev
* commit '
adaa79d722dc1b410a3a8b083be5268cbb817ce4':
Remove flag mDataInjectionMode.
Winson Chung [Tue, 7 Jul 2015 00:31:42 +0000 (00:31 +0000)]
am
2924dc34: Merge "Adding metrics to overview." into mnc-dev
* commit '
2924dc346654a22f72575eb8ae3ce2e714818bd2':
Adding metrics to overview.
Jean-Michel Trivi [Tue, 7 Jul 2015 00:31:36 +0000 (00:31 +0000)]
am
760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev
* commit '
760b1409bc865df5c60f637b8c994eb20888acb8':
Ringtone: add support for volume control and looping
Billy Lau [Tue, 7 Jul 2015 00:27:23 +0000 (00:27 +0000)]
Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
Aravind Akella [Tue, 7 Jul 2015 00:24:03 +0000 (00:24 +0000)]
Merge "Remove flag mDataInjectionMode." into mnc-dev
Winson Chung [Tue, 7 Jul 2015 00:17:55 +0000 (00:17 +0000)]
Merge "Adding metrics to overview." into mnc-dev
Billy Lau [Mon, 6 Jul 2015 23:27:53 +0000 (00:27 +0100)]
Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag.
Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.
Change-Id: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
Jean-Michel Trivi [Mon, 6 Jul 2015 23:07:23 +0000 (23:07 +0000)]
Merge "Ringtone: add support for volume control and looping" into mnc-dev
Dianne Hackborn [Mon, 6 Jul 2015 23:00:20 +0000 (23:00 +0000)]
am
569984f2: am
d178b2da: am
5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
* commit '
569984f2747b66651fea92a7a23b06912c58cc98':
Add easy way to get device idle whitelist.
Don't prevent windows from drawing when they are just moving
Added support for mid-call enabled SRVCC conference call
MWI,phantom call,Suppl services, error codes
Rename VoLTE/WFC enable API to available - add VT available API.
Avoid IllegalStateException when generating/importing keys.
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
Unhide signal strength constants used by getLevel.
Winson Chung [Thu, 25 Jun 2015 23:16:46 +0000 (16:16 -0700)]
Adding metrics to overview.
Bug:
21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
Dianne Hackborn [Mon, 6 Jul 2015 22:43:03 +0000 (22:43 +0000)]
am
d178b2da: am
5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
* commit '
d178b2da6398483ba806b9d28506c822fe8738f4':
Add easy way to get device idle whitelist.
Don't prevent windows from drawing when they are just moving
Added support for mid-call enabled SRVCC conference call
MWI,phantom call,Suppl services, error codes
Rename VoLTE/WFC enable API to available - add VT available API.
Avoid IllegalStateException when generating/importing keys.
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
Unhide signal strength constants used by getLevel.
Adam Lesinski [Wed, 1 Jul 2015 22:05:07 +0000 (15:05 -0700)]
BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
Bug:
22225933
Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0
Dianne Hackborn [Mon, 6 Jul 2015 22:31:36 +0000 (22:31 +0000)]
am
5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
* commit '
5c8498db2111ea69566bc43a9e799d0447af789d':
Add easy way to get device idle whitelist.
David Friedman [Mon, 6 Jul 2015 22:31:34 +0000 (22:31 +0000)]
am
9b89b297: am
593904b1: am
f9fc53bb: am
77b6971b: am
c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
* commit '
9b89b2972c61b51a77db236b0fd19c88f9c1a502':
Docs: Clarification of language and typo fix for work merged from CL 716303.
Jorim Jaggi [Mon, 6 Jul 2015 22:31:31 +0000 (22:31 +0000)]
am
28b4fc76: Merge "Don\'t prevent windows from drawing when they are just moving" into mnc-dev
* commit '
28b4fc76e2da7b93d9ba7ba75a7d0a512d9ff140':
Don't prevent windows from drawing when they are just moving
Alex Klyubin [Mon, 6 Jul 2015 22:31:28 +0000 (22:31 +0000)]
am
b9e13a25: Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev
* commit '
b9e13a25f39c53002787a89abdb599b952d96e21':
Avoid IllegalStateException when generating/importing keys.
David Friedman [Mon, 6 Jul 2015 22:31:24 +0000 (22:31 +0000)]
am
18b763bb: am
076d4f40: am
7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
* commit '
18b763bb1ac6747754581e1c70b4f622e59cdfcc':
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
Casey Ho [Mon, 6 Jul 2015 22:31:16 +0000 (22:31 +0000)]
am
becddea6: Merge "Unhide signal strength constants used by getLevel." into mnc-dev
* commit '
becddea63e2c4b414e5eac2841d3516c4e89bb24':
Unhide signal strength constants used by getLevel.
Dianne Hackborn [Mon, 6 Jul 2015 22:24:50 +0000 (22:24 +0000)]
Merge "Add easy way to get device idle whitelist." into mnc-dev
Dianne Hackborn [Mon, 6 Jul 2015 22:13:37 +0000 (15:13 -0700)]
Add easy way to get device idle whitelist.
Change-Id: I28b0df69e7fb16b5d7542b1eae626bbfdd9a4c1c
Etan Cohen [Mon, 6 Jul 2015 22:09:51 +0000 (22:09 +0000)]
Merge changes from topic 'merge-dr1-063015' into mnc-dr-dev
* changes:
Added support for mid-call enabled SRVCC conference call
MWI,phantom call,Suppl services, error codes
Rename VoLTE/WFC enable API to available - add VT available API.
Jorim Jaggi [Mon, 6 Jul 2015 22:07:32 +0000 (22:07 +0000)]
Merge "Don't prevent windows from drawing when they are just moving" into mnc-dev
Aravind Akella [Mon, 6 Jul 2015 21:56:10 +0000 (14:56 -0700)]
Remove flag mDataInjectionMode.
Change-Id: Ia7cbe8942168ac57abbb92c1a1ed51c568be94fe
Alex Klyubin [Mon, 6 Jul 2015 21:50:42 +0000 (21:50 +0000)]
Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev
David Friedman [Mon, 6 Jul 2015 21:41:05 +0000 (21:41 +0000)]
am
076d4f40: am
7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
* commit '
076d4f40d849d1d1e628fa6b210e690020d04956':
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
Casey Ho [Mon, 6 Jul 2015 21:39:21 +0000 (21:39 +0000)]
Merge "Unhide signal strength constants used by getLevel." into mnc-dev
David Friedman [Mon, 6 Jul 2015 21:33:42 +0000 (21:33 +0000)]
am
593904b1: am
f9fc53bb: am
77b6971b: am
c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
* commit '
593904b1abf3fc31279692d9db97664f76887298':
Docs: Clarification of language and typo fix for work merged from CL 716303.
David Friedman [Mon, 6 Jul 2015 21:27:05 +0000 (21:27 +0000)]
am
7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
* commit '
7bd9b634c42b500466cf416566d27da229d6ca1c':
docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
David Friedman [Mon, 6 Jul 2015 21:26:38 +0000 (21:26 +0000)]
am
f9fc53bb: am
77b6971b: am
c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
* commit '
f9fc53bb6f46ab89fb058c41d162b43ee9799314':
Docs: Clarification of language and typo fix for work merged from CL 716303.
David Friedman [Mon, 6 Jul 2015 21:15:05 +0000 (21:15 +0000)]
Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
David Friedman [Mon, 6 Jul 2015 21:13:19 +0000 (21:13 +0000)]
am
77b6971b: am
c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
* commit '
77b6971b4699bd94c9a4b044108f264f1ddfe31f':
Docs: Clarification of language and typo fix for work merged from CL 716303.
Jorim Jaggi [Thu, 2 Jul 2015 00:16:27 +0000 (17:16 -0700)]
Don't prevent windows from drawing when they are just moving
Bug:
21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb
David Friedman [Mon, 6 Jul 2015 20:56:51 +0000 (20:56 +0000)]
am
c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
* commit '
c66c7622eadb04c1ca258725ae7125626824c324':
Docs: Clarification of language and typo fix for work merged from CL 716303.
Chris Craik [Mon, 6 Jul 2015 20:54:17 +0000 (20:54 +0000)]
am
e29b4b11: am
e8dab95b: am
74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
* commit '
e29b4b11e6b993f9290496e60c6b7bcd31aea63b':
Clearer message when failing to draw a SW layer
David Friedman [Mon, 6 Jul 2015 20:54:11 +0000 (20:54 +0000)]
am
1639af42: am
766b5b74: am
f3a910b8: am
5977c487: am
07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
* commit '
1639af4240d5006f6f17a2b0fb4b6a4a94f587dc':
docs: M Preview 2 - release notes
Chris Craik [Mon, 6 Jul 2015 20:51:25 +0000 (20:51 +0000)]
am
e8dab95b: am
74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
* commit '
e8dab95b1be1f51eae43a6b4dc0d1a600de2b3b6':
Clearer message when failing to draw a SW layer
David Friedman [Mon, 6 Jul 2015 20:40:01 +0000 (20:40 +0000)]
am
766b5b74: am
f3a910b8: am
5977c487: am
07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
* commit '
766b5b74c3d63c0fdb703fe87db98dbe46b722e5':
docs: M Preview 2 - release notes
Chris Craik [Mon, 6 Jul 2015 20:39:15 +0000 (20:39 +0000)]
am
74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev
* commit '
74fed612336fad30c8a93a346160ee36c87bd843':
Clearer message when failing to draw a SW layer
Chris Craik [Mon, 6 Jul 2015 20:29:54 +0000 (20:29 +0000)]
Merge "Clearer message when failing to draw a SW layer" into mnc-dev
David Friedman [Mon, 6 Jul 2015 20:23:45 +0000 (20:23 +0000)]
am
f3a910b8: am
5977c487: am
07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
* commit '
f3a910b88dbb5235552752d0f3492410bca0ef59':
docs: M Preview 2 - release notes
David Friedman [Mon, 6 Jul 2015 20:09:11 +0000 (20:09 +0000)]
am
5977c487: am
07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
* commit '
5977c4879b166eb1b5c0d6a7a361dde515e1d502':
docs: M Preview 2 - release notes
David Friedman [Mon, 6 Jul 2015 20:04:16 +0000 (13:04 -0700)]
Docs: Clarification of language and typo fix for work merged from CL 716303.
Change-Id: I04f062696926b00ccfbd45fef368061dd968efbb
Jim Miller [Mon, 6 Jul 2015 19:58:47 +0000 (19:58 +0000)]
am
f711aa38: am
6f27127b: am
79d9219c: Merge "Only allow fingerprint auth for the current user" into mnc-dev
* commit '
f711aa386c8c528d5b2db625f01317d179a9c0b1':
Only allow fingerprint auth for the current user
David Friedman [Mon, 6 Jul 2015 19:53:11 +0000 (19:53 +0000)]
am
07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
* commit '
07661e3b73cee9720d79d0d09f7a60104ce4cabc':
docs: M Preview 2 - release notes
Jim Miller [Mon, 6 Jul 2015 19:40:14 +0000 (19:40 +0000)]
am
6f27127b: am
79d9219c: Merge "Only allow fingerprint auth for the current user" into mnc-dev
* commit '
6f27127b7c63422c1a805afd1adc46c7120e4046':
Only allow fingerprint auth for the current user
David Friedman [Mon, 6 Jul 2015 19:38:07 +0000 (19:38 +0000)]
Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
Jim Miller [Mon, 6 Jul 2015 19:30:36 +0000 (19:30 +0000)]
am
79d9219c: Merge "Only allow fingerprint auth for the current user" into mnc-dev
* commit '
79d9219c9f9734025837a01a6f8e490d1e0ab57e':
Only allow fingerprint auth for the current user
David Friedman [Mon, 6 Jul 2015 19:25:04 +0000 (19:25 +0000)]
am
93be2e85: am
ba5404c9: am
13c25290: am
e7fb3318: am
b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug:
20503707" into mnc-preview-docs
* commit '
93be2e85629c11bb7c334f6356a88a1502109705':
Docs: Localized pages for Distribution on DAC. Bug:
20503707
Andrew Solovay [Mon, 6 Jul 2015 19:24:59 +0000 (19:24 +0000)]
am
c57bdfa5: am
d7e4e369: am
8f8ad8bb: am
b9e4e0d0: am
afea7a99: docs: Updating permissions preview for Preview 2.
* commit '
c57bdfa54711af7e184ae9d6d359b51275c66c98':
docs: Updating permissions preview for Preview 2.
Jim Miller [Mon, 6 Jul 2015 19:18:03 +0000 (19:18 +0000)]
Merge "Only allow fingerprint auth for the current user" into mnc-dev
David Friedman [Mon, 6 Jul 2015 19:13:33 +0000 (19:13 +0000)]
am
ba5404c9: am
13c25290: am
e7fb3318: am
b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug:
20503707" into mnc-preview-docs
* commit '
ba5404c9d3920c6ffebb6c3767ab2a167ac506d9':
Docs: Localized pages for Distribution on DAC. Bug:
20503707
Andrew Solovay [Mon, 6 Jul 2015 19:13:29 +0000 (19:13 +0000)]
am
d7e4e369: am
8f8ad8bb: am
b9e4e0d0: am
afea7a99: docs: Updating permissions preview for Preview 2.
* commit '
d7e4e3691482b2a1488ccc1c1518098b7669c111':
docs: Updating permissions preview for Preview 2.
Raph Levien [Mon, 6 Jul 2015 19:01:52 +0000 (19:01 +0000)]
am
dbc5dbbf: am
abbe3136: am
441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev
* commit '
dbc5dbbfcddb32d1d34eb3439ca3bc4697d362e3':
Fix problems with StaticLayout indentation
Adam Lesinski [Mon, 6 Jul 2015 19:01:47 +0000 (19:01 +0000)]
am
1fa6846b: am
948ac4fa: am
1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev
* commit '
1fa6846b66ea94c0f0beabdac1bf0e56955bb8b5':
BatteryStats: Fix issue with method parameter order...
Jeff Sharkey [Mon, 6 Jul 2015 19:01:41 +0000 (19:01 +0000)]
am
0cae3e9e: am
7dfe0f83: am
7fd3c296: Merge "Permission to view shared storage for all users." into mnc-dev
* commit '
0cae3e9ebfb5d1050e28f57542eaaaa56fb96a33':
Permission to view shared storage for all users.
Jeff Sharkey [Mon, 6 Jul 2015 19:01:33 +0000 (19:01 +0000)]
am
b61e53f5: am
e6130b6c: am
6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev
* commit '
b61e53f5f1bcbf3c9059a3ff58867990f5dde9a7':
Fix DocumentsUI animation regression.
Jeff Sharkey [Mon, 6 Jul 2015 19:01:26 +0000 (19:01 +0000)]
am
63ba1d9e: am
d58ddd82: am
246d6984: Merge "Handle missing migration source volume." into mnc-dev
* commit '
63ba1d9e0cc4cfcd64c595e2a5109bfdc934d63b':
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 19:01:18 +0000 (19:01 +0000)]
am
262c89dc: am
d19555d9: am
38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev
* commit '
262c89dcdc4fa4e86cc9eb2708cf21e4c1d74f14':
Reconcile private volumes when mounted.
Eino-Ville Talvala [Mon, 6 Jul 2015 19:01:12 +0000 (19:01 +0000)]
am
c883d823: am
3fc066f5: am
539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev
* commit '
c883d82392a733e57b41f2546d77678d06416d84':
Camera2: Remove FREEFORM cropping requirement from FULL
Dianne Hackborn [Mon, 6 Jul 2015 19:01:06 +0000 (19:01 +0000)]
am
d45c7633: am
1a053eaf: am
dcd96ead: Merge "Maybe fix issue #
22283836 -- package manager NPE." into mnc-dev
* commit '
d45c7633c5889650d419c0e1d8ba19b00e25a8c2':
Maybe fix issue #
22283836 -- package manager NPE.
Geoff Mendal [Mon, 6 Jul 2015 19:01:00 +0000 (19:01 +0000)]
am
c835888e: (-s ours) am
e02705af: (-s ours) am
e2222d12: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c835888e119c856f83fd824481b060834b56c10e':
Import translations. DO NOT MERGE
George Mount [Mon, 6 Jul 2015 19:00:54 +0000 (19:00 +0000)]
am
e64f2011: am
b3199092: am
20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev
* commit '
e64f201171a905afff3d1da44779fc513068d196':
Fix Fade out during Activity Transition.
Jason Monk [Mon, 6 Jul 2015 19:00:44 +0000 (19:00 +0000)]
am
b287b04a: am
e9b1e365: am
d369d074: Merge "Fix wifi crash" into mnc-dev
* commit '
b287b04af4b098fef8bfa4f8e4ccac927a584e32':
Fix wifi crash
Makoto Onuki [Mon, 6 Jul 2015 19:00:38 +0000 (19:00 +0000)]
am
650a193e: am
164d229a: am
dfd6301f: Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev
* commit '
650a193e8b1610938954851e6d855338b44e239d':
If user ejects a storage from details, take user to... ... the storage list view
Barnaby James [Mon, 6 Jul 2015 19:00:33 +0000 (19:00 +0000)]
am
413adbe2: am
2691d08c: am
c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
* commit '
413adbe2cb3eb2363c9c216e78f39696da7a34cb':
Minor doc fixes for VoiceInteractor.
Amith Yamasani [Mon, 6 Jul 2015 19:00:27 +0000 (19:00 +0000)]
am
013ec4c2: am
b41e36ba: am
a72eac60: Fix a typo causing NPE in restricted profiles
* commit '
013ec4c2bc2f034fec3cbf2a3d923b23d1e21b33':
Fix a typo causing NPE in restricted profiles
Raph Levien [Mon, 6 Jul 2015 19:00:21 +0000 (19:00 +0000)]
am
4da2f05b: am
3be9eb46: am
401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev
* commit '
4da2f05b4964d6fc4c55344176f3ad98df569700':
Clean up Hyphenator file reading
David Friedman [Mon, 6 Jul 2015 18:59:16 +0000 (18:59 +0000)]
am
13c25290: am
e7fb3318: am
b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug:
20503707" into mnc-preview-docs
* commit '
13c25290099a570fdd903511e7ec605119af3ce3':
Docs: Localized pages for Distribution on DAC. Bug:
20503707
Andrew Solovay [Mon, 6 Jul 2015 18:59:11 +0000 (18:59 +0000)]
am
8f8ad8bb: am
b9e4e0d0: am
afea7a99: docs: Updating permissions preview for Preview 2.
* commit '
8f8ad8bb570be173ac369b629e31ea283fe09cc5':
docs: Updating permissions preview for Preview 2.
Raph Levien [Mon, 6 Jul 2015 18:45:40 +0000 (18:45 +0000)]
am
abbe3136: am
441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev
* commit '
abbe3136a346894df1fdaf2ec1919b05242a12eb':
Fix problems with StaticLayout indentation
Adam Lesinski [Mon, 6 Jul 2015 18:44:59 +0000 (18:44 +0000)]
am
948ac4fa: am
1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev
* commit '
948ac4facb4d1b81a981af1836e044025bb607e9':
BatteryStats: Fix issue with method parameter order...
Jeff Sharkey [Mon, 6 Jul 2015 18:44:55 +0000 (18:44 +0000)]
am
7dfe0f83: am
7fd3c296: Merge "Permission to view shared storage for all users." into mnc-dev
* commit '
7dfe0f8317f4388d38f019982d3ec07f85a70266':
Permission to view shared storage for all users.
Jeff Sharkey [Mon, 6 Jul 2015 18:44:51 +0000 (18:44 +0000)]
am
e6130b6c: am
6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev
* commit '
e6130b6c50e370f4fb71523eac18dac4fdbb853f':
Fix DocumentsUI animation regression.
Jeff Sharkey [Mon, 6 Jul 2015 18:44:47 +0000 (18:44 +0000)]
am
d58ddd82: am
246d6984: Merge "Handle missing migration source volume." into mnc-dev
* commit '
d58ddd82f0ae46fad8c5ac131707c412ae90c431':
Handle missing migration source volume.
Jeff Sharkey [Mon, 6 Jul 2015 18:44:43 +0000 (18:44 +0000)]
am
d19555d9: am
38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev
* commit '
d19555d92cdcee366de6df49dc2de436c0539489':
Reconcile private volumes when mounted.
Eino-Ville Talvala [Mon, 6 Jul 2015 18:44:39 +0000 (18:44 +0000)]
am
3fc066f5: am
539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev
* commit '
3fc066f5617fac3d9da589b87d68653007dcd663':
Camera2: Remove FREEFORM cropping requirement from FULL
Dianne Hackborn [Mon, 6 Jul 2015 18:44:35 +0000 (18:44 +0000)]
am
1a053eaf: am
dcd96ead: Merge "Maybe fix issue #
22283836 -- package manager NPE." into mnc-dev
* commit '
1a053eaf14be82c5491dab85505639f6d3b95011':
Maybe fix issue #
22283836 -- package manager NPE.
Geoff Mendal [Mon, 6 Jul 2015 18:44:31 +0000 (18:44 +0000)]
am
e02705af: (-s ours) am
e2222d12: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e02705af0cea66df545b7a21822e8a62cb1faceb':
Import translations. DO NOT MERGE
George Mount [Mon, 6 Jul 2015 18:44:27 +0000 (18:44 +0000)]
am
b3199092: am
20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev
* commit '
b31990920aa964496194831e93ac701e5eb19e63':
Fix Fade out during Activity Transition.
Jason Monk [Mon, 6 Jul 2015 18:44:22 +0000 (18:44 +0000)]
am
e9b1e365: am
d369d074: Merge "Fix wifi crash" into mnc-dev
* commit '
e9b1e365594660758002e4739d0578665ed9ccbf':
Fix wifi crash
Makoto Onuki [Mon, 6 Jul 2015 18:44:18 +0000 (18:44 +0000)]
am
164d229a: am
dfd6301f: Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev
* commit '
164d229a1caad22a8509a86c52e6722d416bf760':
If user ejects a storage from details, take user to... ... the storage list view
Barnaby James [Mon, 6 Jul 2015 18:44:12 +0000 (18:44 +0000)]
am
2691d08c: am
c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
* commit '
2691d08c3ba5543aa3c685cb4621e09c715a7db6':
Minor doc fixes for VoiceInteractor.
Amith Yamasani [Mon, 6 Jul 2015 18:44:08 +0000 (18:44 +0000)]
am
b41e36ba: am
a72eac60: Fix a typo causing NPE in restricted profiles
* commit '
b41e36bac5efe40ae8bddbfb7f7eac25bcb30204':
Fix a typo causing NPE in restricted profiles
Raph Levien [Mon, 6 Jul 2015 18:44:04 +0000 (18:44 +0000)]
am
3be9eb46: am
401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev
* commit '
3be9eb461150349a8de0f47d18562ac74fb38046':
Clean up Hyphenator file reading
David Friedman [Mon, 6 Jul 2015 18:43:37 +0000 (18:43 +0000)]
am
e7fb3318: am
b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug:
20503707" into mnc-preview-docs
* commit '
e7fb33180d689bbdddae03ab0afe730e4d312f45':
Docs: Localized pages for Distribution on DAC. Bug:
20503707
Andrew Solovay [Mon, 6 Jul 2015 18:43:31 +0000 (18:43 +0000)]
am
b9e4e0d0: am
afea7a99: docs: Updating permissions preview for Preview 2.
* commit '
b9e4e0d0f13ba40e95590f42c351af9b1dba0c5b':
docs: Updating permissions preview for Preview 2.
Jim Miller [Tue, 16 Jun 2015 22:05:48 +0000 (15:05 -0700)]
Only allow fingerprint auth for the current user
This prevents fingerprint access from activities
for a user that isn't the current user.
Fixes bug
20223481
Change-Id: I360f90972fe63f5066f701a3efda355a7cb11338
OSDN Git Service
