OSDN Git Service
John Spurlock [Thu, 17 Jul 2014 17:06:39 +0000 (17:06 +0000)]
am
649eea00: am
791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev
* commit '
649eea00d38cbbfdb9b2e6411124bf1d8764941b':
Zen: Return of the alarm warning.
Kenny Guy [Thu, 17 Jul 2014 17:06:34 +0000 (17:06 +0000)]
am
bad2ccf9: am
6ec1e21d: Merge "Check for exported and category before starting activity." into lmp-dev
* commit '
bad2ccf92776fd19c042ef76d0415fdee2f06bef':
Check for exported and category before starting activity.
Nicolas Prevot [Thu, 17 Jul 2014 17:05:55 +0000 (17:05 +0000)]
Filip Gruszczynski [Thu, 17 Jul 2014 17:05:50 +0000 (17:05 +0000)]
am
6dc90f73: am
e26a2536: am
95198b91: am
39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '
6dc90f7365c26eabbc4565018ff4d2433b6d1472':
Using outset bottom from theme as bottom inset on circular screens.
Adrian Roos [Thu, 17 Jul 2014 17:05:46 +0000 (17:05 +0000)]
am
f693c9c3: am
3e7b4279: Merge "Update QS user switcher colors to spec" into lmp-dev
* commit '
f693c9c3e595d5a5e19b5234a4999b7fe84bb976':
Update QS user switcher colors to spec
Adrian Roos [Thu, 17 Jul 2014 17:05:43 +0000 (17:05 +0000)]
am
b00b4be5: am
221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev
* commit '
b00b4be5d978ea63aa0428772dbe5e593659a48f':
Partially fix the keyguard scrim
Dianne Hackborn [Thu, 17 Jul 2014 17:05:39 +0000 (17:05 +0000)]
am
2a96a389: am
cf3580b0: Merge "Fix build." into lmp-dev
* commit '
2a96a3890975a991cbd91e9444325b0ee879caae':
Fix build.
Chulwoo Lee [Thu, 17 Jul 2014 17:05:34 +0000 (17:05 +0000)]
am
44cafdc7: am
62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev
* commit '
44cafdc73e916aa0bf6c187c2fc986947fdaa2c1':
Pass input ID to the setup/settings activity
Chulwoo Lee [Thu, 17 Jul 2014 17:05:30 +0000 (17:05 +0000)]
am
3493ee3c: am
02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev
* commit '
3493ee3cc87d35a02ba1b35c3f11572c8511fb66':
Introduce "input_id" column to the channels table
Dianne Hackborn [Thu, 17 Jul 2014 17:05:26 +0000 (17:05 +0000)]
am
68f35ec2: am
dbec91c0: Implement issue #
16330060: Inform ActivityManager about WebView...
* commit '
68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
Implement issue #
16330060: Inform ActivityManager about WebView...
Sandeep Siddhartha [Thu, 17 Jul 2014 17:05:22 +0000 (17:05 +0000)]
am
e08cd87e: am
47ecf354: Plumb the database code to read/update sound models
* commit '
e08cd87e7d1c009f5deef2ef3832d074c57bea81':
Plumb the database code to read/update sound models
Sandeep Siddhartha [Thu, 17 Jul 2014 17:05:18 +0000 (17:05 +0000)]
am
bb80d295: am
aecd5383: Add recognition modes to the enrollment metadata
* commit '
bb80d295092220d204a74cca1d7d1c0fde93757b':
Add recognition modes to the enrollment metadata
Alan Viverette [Thu, 17 Jul 2014 17:05:13 +0000 (17:05 +0000)]
am
4366255e: am
bbbbb3b2: Add public attributes for TimePicker styling
* commit '
4366255e3764c7e2db2221b58c9b438ac8fdc84d':
Add public attributes for TimePicker styling
Dan Sandler [Thu, 17 Jul 2014 17:05:09 +0000 (17:05 +0000)]
am
24b3cab7: am
ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev
* commit '
24b3cab7bf8d265d0807d77c4fe34b4b10e20555':
Album artwork returns triumphantly to the lockscreen.
John Spurlock [Thu, 17 Jul 2014 17:05:05 +0000 (17:05 +0000)]
am
11d850c1: am
efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit '
11d850c11157aab9804d28169f9c72cca431fc1e':
Update data limit notification icon + strings.
Sandeep Siddhartha [Thu, 17 Jul 2014 17:05:01 +0000 (17:05 +0000)]
am
a2440a17: am
43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
* commit '
a2440a17e796d04ceb3470783d28f6080ee9c7dc':
Add code for isKeyphraseActive and some logging to help debug issues
John Spurlock [Thu, 17 Jul 2014 17:04:57 +0000 (17:04 +0000)]
am
7aeea625: am
45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
* commit '
7aeea625a5cd90de691c9037310553f14eb73560':
Add a zen-specific event sink, include in dumpstate.
Amith Yamasani [Thu, 17 Jul 2014 17:04:53 +0000 (17:04 +0000)]
am
d63203df: am
b31b07c8: Merge "Allow content provider access across users" into lmp-dev
* commit '
d63203dfa38bf1b40ba976bfad1e9fcfeb761ddf':
Allow content provider access across users
Lorenzo Colitti [Thu, 17 Jul 2014 17:04:49 +0000 (17:04 +0000)]
am
84641420: am
1098531c: Disable logging in NetlinkTracker.
* commit '
84641420220d2d11e7baa7ae6061d78f31d97c98':
Disable logging in NetlinkTracker.
Chris Craik [Thu, 17 Jul 2014 17:04:46 +0000 (17:04 +0000)]
am
3e95764e: am
b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
* commit '
3e95764e68ea93918d455b8b2c08d9ff02dc36f8':
Add accessibility text contrast setting
Santos Cordon [Thu, 17 Jul 2014 17:04:42 +0000 (17:04 +0000)]
am
f6eaf614: am
ec82a805: Add toString & equals helper methods to PhoneAccount.java
* commit '
f6eaf61480eb9f26fba8a2af9b4a409d00a53cc6':
Add toString & equals helper methods to PhoneAccount.java
Baligh Uddin [Thu, 17 Jul 2014 17:04:38 +0000 (17:04 +0000)]
am
0781731f: (-s ours) am
54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
0781731fea63b9373dce076ad42c90bd95f8445f':
Import translations. DO NOT MERGE
John Spurlock [Thu, 17 Jul 2014 17:04:35 +0000 (17:04 +0000)]
am
02d9aa3f: am
fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit '
02d9aa3f961de03827c1e5ce8c4cc7ece402acd3':
QS: Deal with null uuids in BT controller.
Baligh Uddin [Thu, 17 Jul 2014 17:04:31 +0000 (17:04 +0000)]
am
afdeebdd: (-s ours) am
9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
afdeebdd4946c41f8cbcfd64a60592aa9286bd42':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 17:04:27 +0000 (17:04 +0000)]
am
95b45b1f: (-s ours) am
da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
95b45b1f6deccd914e774420b5571fc6f2853b1d':
Import translations. DO NOT MERGE
Jungshik Jang [Thu, 17 Jul 2014 17:04:23 +0000 (17:04 +0000)]
am
d26e2a0c: am
6d98d91f: Merge "Hook up system audio mode" into lmp-dev
* commit '
d26e2a0cc786608f4cb88213202f8424e29e7e9e':
Hook up system audio mode
Dianne Hackborn [Thu, 17 Jul 2014 17:04:19 +0000 (17:04 +0000)]
am
d8f0526c: am
8b353ef1: Merge "Maybe fix issue #
16167054: Wakelock is acquired and released in..." into lmp-dev
* commit '
d8f0526c252b142faffddf035b3d32d35f39e7bf':
Maybe fix issue #
16167054: Wakelock is acquired and released in...
Vinit Deshpande [Thu, 17 Jul 2014 17:04:15 +0000 (17:04 +0000)]
am
ff5ceb0d: am
0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit '
ff5ceb0d89c549682b498522f052d61c776bff03':
Introduce RTT Manager
Chelsea Derrick [Thu, 17 Jul 2014 17:04:11 +0000 (17:04 +0000)]
am
4e9ef0aa: am
52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
* commit '
4e9ef0aa90ec073f4d9066cbfecdf502c6f0a6e4':
Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
Baligh Uddin [Thu, 17 Jul 2014 17:04:07 +0000 (17:04 +0000)]
am
e2a2b37a: (-s ours) am
6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e2a2b37a31c202c63f2fb97e2025c1542bb76ee7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 17:03:58 +0000 (17:03 +0000)]
am
6719bbd1: (-s ours) am
ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6719bbd1188bd5be2ce5603891e3d820ceb8cb80':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 17:03:54 +0000 (17:03 +0000)]
am
15ae6bc7: (-s ours) am
2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
15ae6bc7838b6575910e2cbd4f3d008e254ac873':
Import translations. DO NOT MERGE
Jeff Davidson [Thu, 17 Jul 2014 17:03:45 +0000 (17:03 +0000)]
am
62152268: Merge "Expose network scoring APIs to /system apps." into lmp-dev
* commit '
62152268d51b8b7726a806e48750a810e23eab40':
Expose network scoring APIs to /system apps.
Jungshik Jang [Thu, 17 Jul 2014 17:03:41 +0000 (17:03 +0000)]
am
3ac63bd8: Revisit HDMI-CEC system audio mode in AudioService.
* commit '
3ac63bd86b5887c69053eb79319cbc5df7ed5de9':
Revisit HDMI-CEC system audio mode in AudioService.
Robert Greenwalt [Thu, 17 Jul 2014 17:01:54 +0000 (17:01 +0000)]
am
004a427e: Merge "Make a network the default when it connects if we have no default." into lmp-dev
* commit '
004a427e630e1db09df00e8f826627f919183c89':
Make a network the default when it connects if we have no default.
Brian Colonna [Thu, 17 Jul 2014 17:01:50 +0000 (17:01 +0000)]
am
6f6fcecb: Bug
16152902: Disabling FUL in keyguard and screen lock settings
* commit '
6f6fcecb4e13e5cbfb836b66e49001e34bd0c10c':
Bug
16152902: Disabling FUL in keyguard and screen lock settings
Fabrice Di Meglio [Thu, 17 Jul 2014 16:59:35 +0000 (16:59 +0000)]
am
6bbea8cf: Fix LocalePicker background
* commit '
6bbea8cf4252839d0c6f2a3152f506a7b2b2d753':
Fix LocalePicker background
Ye Wen [Thu, 17 Jul 2014 16:59:31 +0000 (16:59 +0000)]
am
0353e451: Merge "Unhide new MMS API and SMS storage API (1/2)" into lmp-dev
* commit '
0353e451c6ccbbce461e911162543a7c96fc5523':
Unhide new MMS API and SMS storage API (1/2)
Robert Shih [Thu, 17 Jul 2014 16:59:27 +0000 (16:59 +0000)]
am
5f48c625: MediaRecorder: added constants for WEBM output
* commit '
5f48c6258ffc537454e4df9b49a3ebee652cfaee':
MediaRecorder: added constants for WEBM output
Eric Laurent [Thu, 17 Jul 2014 16:59:23 +0000 (16:59 +0000)]
am
aaaa07c2: Merge "AudioService: Use device specific mode to open SCO audio" into lmp-dev
* commit '
aaaa07c28bf9ad4083ab9e64953e1970d66c217b':
AudioService: Use device specific mode to open SCO audio
Fabrice Di Meglio [Thu, 17 Jul 2014 16:59:19 +0000 (16:59 +0000)]
am
bfe21a64: Fix bug #
16353909 Preferences RTL support is sometimes broken
* commit '
bfe21a6401656f056a0ee74b97981591fb8e266e':
Fix bug #
16353909 Preferences RTL support is sometimes broken
Chelsea Derrick [Thu, 17 Jul 2014 16:59:15 +0000 (16:59 +0000)]
am
42a0114c: Merge "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]" into lmp-dev
* commit '
42a0114c36ee9c0b1d6285c7704da38aa69e817e':
Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]
Fabrice Di Meglio [Thu, 17 Jul 2014 16:59:10 +0000 (16:59 +0000)]
am
b56e3cad: Fix #
16348486 [RTL] Checkboxes are improperly aligned
* commit '
b56e3caddf6f9b6ca59975981caa25bf3d56b9e7':
Fix #
16348486 [RTL] Checkboxes are improperly aligned
Alan Viverette [Thu, 17 Jul 2014 16:59:07 +0000 (16:59 +0000)]
am
8e97a200: Fix software dirty region, don\'t add insets to software windows
* commit '
8e97a200ecf1985dcf2fd3a004b53e59640b3374':
Fix software dirty region, don't add insets to software windows
Yigit Boyar [Thu, 17 Jul 2014 16:59:03 +0000 (16:59 +0000)]
am
d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev
* commit '
d8607b40b57332619f3be66ffa5250394acbc5f7':
Change Animators to reset values when restarted if their target changes
John Reck [Thu, 17 Jul 2014 16:58:59 +0000 (16:58 +0000)]
am
c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
* commit '
c1d32f0c5c5832a3bbf923a92d62b2e434dfe70b':
Fix root RenderNode damage calculation
Stuart Scott [Thu, 17 Jul 2014 16:58:55 +0000 (16:58 +0000)]
am
b8948923: Merge "MSIM: dump sub specific info" into lmp-dev
* commit '
b8948923b3f5eaf2eac96788294bc8c82cf0cfa9':
MSIM: dump sub specific info
kmccormick [Thu, 17 Jul 2014 16:58:51 +0000 (16:58 +0000)]
am
7a0ace2d: am
1f4e5686: am
289d3c25: am
fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '
7a0ace2dd99b43f1a9f22d184893216e28dc0494':
Doc Update: new Smack sample.
David Friedman [Thu, 17 Jul 2014 16:58:47 +0000 (16:58 +0000)]
am
a4690c90: am
8b51d07f: am
a827c738: am
046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
a4690c90675ad821e0aafdd44e697552cd8fccea':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Sailesh Nepal [Thu, 17 Jul 2014 16:58:39 +0000 (16:58 +0000)]
am
03e88771: TTY: frameworks/base changes
* commit '
03e88771769c376017af281d3c23ac0e030fee52':
TTY: frameworks/base changes
Christopher Tate [Thu, 17 Jul 2014 16:58:34 +0000 (16:58 +0000)]
am
c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
* commit '
c92b1dd5f3e06a7e43f4086b2db418a8334aa7d2':
Always call finishBackup() if performFullBackup() succeeded
Jeff Sharkey [Thu, 17 Jul 2014 16:58:30 +0000 (16:58 +0000)]
am
2158503f: Merge "Install sessions only inherit APK files." into lmp-dev
* commit '
2158503ff835f60d1a39f5bac724dd90e0900403':
Install sessions only inherit APK files.
Shishir Agrawal [Thu, 17 Jul 2014 16:58:25 +0000 (16:58 +0000)]
am
38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev
* commit '
38c365d037e40385f2b25cd0fe0214c24f2f08ed':
Unhiding the SMS/MMS APIs for injection/transport.
Sharvil Nanavati [Thu, 17 Jul 2014 16:58:22 +0000 (16:58 +0000)]
am
3afc825a: Launch processes running under the \'bluetooth\' uid with CAP_WAKE_ALARM.
* commit '
3afc825ae1dcbff19fa1eec345c3a0a685216fa0':
Launch processes running under the 'bluetooth' uid with CAP_WAKE_ALARM.
Alan Viverette [Thu, 17 Jul 2014 16:58:17 +0000 (16:58 +0000)]
am
ca27046e: Merge "Fix state list drawable transitions" into lmp-dev
* commit '
ca27046ee1fd2e23512af943177d4eb35757865b':
Fix state list drawable transitions
Fabrice Di Meglio [Thu, 17 Jul 2014 16:58:13 +0000 (16:58 +0000)]
am
fd6eeda0: Fix bug #
16309454 Broken recent button after dismissing set time dialog
* commit '
fd6eeda0f7f578735a9b2b6a36fb1f130993f488':
Fix bug #
16309454 Broken recent button after dismissing set time dialog
Jeff Davidson [Thu, 17 Jul 2014 16:58:09 +0000 (16:58 +0000)]
am
8f406122: Remove obsolete remark from XXHDPI comment.
* commit '
8f4061221469cde3d92b6f7dede5c8b10df1edc0':
Remove obsolete remark from XXHDPI comment.
David Friedman [Thu, 17 Jul 2014 16:57:57 +0000 (16:57 +0000)]
am
6ec875ea: am
c6474d97: am
fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
6ec875ea49e4f3e3621a1844df3968881d5cac40':
A linebreak had somehow wrongly replaced a blank space. Blank space restored.
Deepanshu Gupta [Thu, 17 Jul 2014 16:57:53 +0000 (16:57 +0000)]
am
f9c7a0ab: Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
* commit '
f9c7a0ab4ea11932b0710df5933b1db63f36ba81':
Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
Deepanshu Gupta [Thu, 17 Jul 2014 16:57:49 +0000 (16:57 +0000)]
am
08f4aef0: Optimize Blend composites. [DO NOT MERGE]
* commit '
08f4aef0f198d52b9c67def64626ff42593ad278':
Optimize Blend composites. [DO NOT MERGE]
John Spurlock [Thu, 17 Jul 2014 15:51:21 +0000 (15:51 +0000)]
am
791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev
* commit '
791c827c22c8d0179500f0df201a58bce62ad68e':
Zen: Return of the alarm warning.
Kenny Guy [Thu, 17 Jul 2014 15:20:21 +0000 (15:20 +0000)]
am
6ec1e21d: Merge "Check for exported and category before starting activity." into lmp-dev
* commit '
6ec1e21d4f9a5e76ff23b791c350890ae4b784a1':
Check for exported and category before starting activity.
Deepanshu Gupta [Thu, 17 Jul 2014 14:23:48 +0000 (07:23 -0700)]
merge -s ours
21b0919f to lmp-dev-plus-aosp
The change was already merged in aosp.
Nicolas Prevot [Thu, 17 Jul 2014 14:19:28 +0000 (14:19 +0000)]
Filip Gruszczynski [Thu, 17 Jul 2014 14:19:25 +0000 (14:19 +0000)]
am
e26a2536: am
95198b91: am
39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '
e26a25361d9ae649f0855f69afc1cce1b7d3116a':
Using outset bottom from theme as bottom inset on circular screens.
Adrian Roos [Thu, 17 Jul 2014 14:19:21 +0000 (14:19 +0000)]
am
3e7b4279: Merge "Update QS user switcher colors to spec" into lmp-dev
* commit '
3e7b4279abee870d5094f505a9bbdcd42c9a7256':
Update QS user switcher colors to spec
Adrian Roos [Thu, 17 Jul 2014 14:19:17 +0000 (14:19 +0000)]
am
221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev
* commit '
221433ab83c1d6719b563f07314c474743ea7416':
Partially fix the keyguard scrim
Dianne Hackborn [Thu, 17 Jul 2014 14:19:09 +0000 (14:19 +0000)]
am
cf3580b0: Merge "Fix build." into lmp-dev
* commit '
cf3580b0c64a69173bfe1423a023d1dbd56b0ef5':
Fix build.
Chulwoo Lee [Thu, 17 Jul 2014 14:19:04 +0000 (14:19 +0000)]
am
62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev
* commit '
62572cabc4083b716d15f85a36eaf4225415b9d8':
Pass input ID to the setup/settings activity
Chulwoo Lee [Thu, 17 Jul 2014 14:19:01 +0000 (14:19 +0000)]
am
02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev
* commit '
02023167740b862c0df7541a23f825eb5463c3f8':
Introduce "input_id" column to the channels table
Dianne Hackborn [Thu, 17 Jul 2014 14:18:56 +0000 (14:18 +0000)]
am
dbec91c0: Implement issue #
16330060: Inform ActivityManager about WebView...
* commit '
dbec91c09bd8c184e897d36b8150307ad4713c6c':
Implement issue #
16330060: Inform ActivityManager about WebView...
Sandeep Siddhartha [Thu, 17 Jul 2014 14:18:49 +0000 (14:18 +0000)]
am
47ecf354: Plumb the database code to read/update sound models
* commit '
47ecf354c7d43bd6f6df5f6a6de78fb9201b3805':
Plumb the database code to read/update sound models
Sandeep Siddhartha [Thu, 17 Jul 2014 14:18:43 +0000 (14:18 +0000)]
am
aecd5383: Add recognition modes to the enrollment metadata
* commit '
aecd5383e3647d9428dc3c83c894830ab2efc421':
Add recognition modes to the enrollment metadata
Alan Viverette [Thu, 17 Jul 2014 14:18:38 +0000 (14:18 +0000)]
am
bbbbb3b2: Add public attributes for TimePicker styling
* commit '
bbbbb3b25050e624c6e4c75a9c76c043695b92d5':
Add public attributes for TimePicker styling
Dan Sandler [Thu, 17 Jul 2014 14:17:16 +0000 (14:17 +0000)]
am
ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev
* commit '
ce4dc71cfc0ecbfe1bd504b5d906fbd81b2164b1':
Album artwork returns triumphantly to the lockscreen.
John Spurlock [Thu, 17 Jul 2014 14:17:12 +0000 (14:17 +0000)]
am
efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit '
efe8514f89c8f8ecd256f8fc1ef577cbcec05421':
Update data limit notification icon + strings.
Sandeep Siddhartha [Thu, 17 Jul 2014 14:17:08 +0000 (14:17 +0000)]
am
43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
* commit '
43bc655b3c5ddd70af813280d9125797d076d00e':
Add code for isKeyphraseActive and some logging to help debug issues
John Spurlock [Thu, 17 Jul 2014 14:17:05 +0000 (14:17 +0000)]
am
45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
* commit '
45aebdf2d2b552914abf9656a69bc92bd6540b54':
Add a zen-specific event sink, include in dumpstate.
Amith Yamasani [Thu, 17 Jul 2014 14:17:01 +0000 (14:17 +0000)]
am
b31b07c8: Merge "Allow content provider access across users" into lmp-dev
* commit '
b31b07c8b10937f3071300068da64158d3686513':
Allow content provider access across users
Lorenzo Colitti [Thu, 17 Jul 2014 14:16:57 +0000 (14:16 +0000)]
am
1098531c: Disable logging in NetlinkTracker.
* commit '
1098531c19d337b4544c51e446e859d86e7fdab9':
Disable logging in NetlinkTracker.
Chris Craik [Thu, 17 Jul 2014 14:16:53 +0000 (14:16 +0000)]
am
b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
* commit '
b63869a6fb76ede4492f2184ae005687ac70c916':
Add accessibility text contrast setting
Santos Cordon [Thu, 17 Jul 2014 14:16:50 +0000 (14:16 +0000)]
am
ec82a805: Add toString & equals helper methods to PhoneAccount.java
* commit '
ec82a805b55ce61e2049d66d74fbab5610577013':
Add toString & equals helper methods to PhoneAccount.java
Baligh Uddin [Thu, 17 Jul 2014 14:16:47 +0000 (14:16 +0000)]
am
54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
54639300d0ec7424fe6b18ba82f0293c2543c62f':
Import translations. DO NOT MERGE
John Spurlock [Thu, 17 Jul 2014 14:16:43 +0000 (14:16 +0000)]
am
fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit '
fddad8871e41cedc2b0bb31edd7f3a509ac7c403':
QS: Deal with null uuids in BT controller.
Baligh Uddin [Thu, 17 Jul 2014 14:16:40 +0000 (14:16 +0000)]
am
9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9988df2980dbe0529eca8ba4379b061197166a55':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:36 +0000 (14:16 +0000)]
am
da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
da616efd015e372c3e02c1b9368fe66badb0341d':
Import translations. DO NOT MERGE
Jungshik Jang [Thu, 17 Jul 2014 14:16:33 +0000 (14:16 +0000)]
am
6d98d91f: Merge "Hook up system audio mode" into lmp-dev
* commit '
6d98d91f01dc77af031bf9d8537d101110ba43e5':
Hook up system audio mode
Dianne Hackborn [Thu, 17 Jul 2014 14:16:30 +0000 (14:16 +0000)]
am
8b353ef1: Merge "Maybe fix issue #
16167054: Wakelock is acquired and released in..." into lmp-dev
* commit '
8b353ef1ac284d2ad306de7d6609ebc1b1053ede':
Maybe fix issue #
16167054: Wakelock is acquired and released in...
Vinit Deshpande [Thu, 17 Jul 2014 14:16:26 +0000 (14:16 +0000)]
am
0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit '
0b4d73dd5885a2ef86e14f77ff1963c42d6c59b9':
Introduce RTT Manager
Chelsea Derrick [Thu, 17 Jul 2014 14:16:23 +0000 (14:16 +0000)]
am
52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
* commit '
52c8bd50f87388f6c32b3664d46723490e7e3502':
Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
Baligh Uddin [Thu, 17 Jul 2014 14:16:19 +0000 (14:16 +0000)]
am
6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6b7e527ae3433a7be5234578d923a6ed149e3e48':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:16 +0000 (14:16 +0000)]
am
ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ca0db50aaa768353686fdcf76de6dfb701bf67e0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:16:13 +0000 (14:16 +0000)]
am
2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
2b8858a901e45119c78e239c2c34b3e2486ee692':
Import translations. DO NOT MERGE
Robert Ly [Thu, 17 Jul 2014 14:02:58 +0000 (14:02 +0000)]
am
d2d27a5f: am
f3c3edfe: am
bafdb900: am
82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit '
d2d27a5f8d7f641cda4a04c2fe285d17ca924226':
docs: add EU legal notice
Winson Chung [Thu, 17 Jul 2014 14:02:55 +0000 (14:02 +0000)]
am
24d04eeb: Merge "Don\'t clobber intent flags when starting recent activities anew. (Bug
16327074)" into lmp-dev
* commit '
24d04eebfe00e0d8346c2864d84f04b4d046b9e1':
Don't clobber intent flags when starting recent activities anew. (Bug
16327074)
RoboErik [Thu, 17 Jul 2014 14:02:50 +0000 (14:02 +0000)]
am
b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '
b21fab77c0758da3dcb2fa0029fef92df4d5902a':
Change adjustVolumeBy to adjustVolume
ztenghui [Thu, 17 Jul 2014 14:02:46 +0000 (14:02 +0000)]
am
6f5df881: Merge "Add more reverse support to AnimatedVD" into lmp-dev
* commit '
6f5df88108b7fb6b9a59ac36f448bd23b5397ef1':
Add more reverse support to AnimatedVD
RoboErik [Thu, 17 Jul 2014 14:02:42 +0000 (14:02 +0000)]
am
9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '
9b039cf80a0c0c388ccbd8b6ece9aa5c7b970f26':
Make MediaSession and MediaController constructors public
Nicolas Prevot [Tue, 8 Jul 2014 14:47:17 +0000 (15:47 +0100)]
DO NOT MERGE
Remove cross-profile intent filters when removing a user.
When a user is being removed: removing cross-profile intent filters that have
this user as their source.
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.
Change-Id: Ie3a2aa0cbbe6c9eb9e945e650fd907e5cc012409
(cherry picked from commit
d44e2d7340c70406d8b5eb8b3d6c6c0daaa8705f)
Filip Gruszczynski [Thu, 17 Jul 2014 13:37:25 +0000 (13:37 +0000)]
am
95198b91: am
39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '
95198b91665bb93473ea1ec68c69bdbfd0002d49':
Using outset bottom from theme as bottom inset on circular screens.
OSDN Git Service
