OSDN Git Service
Robert Greenwalt [Thu, 17 Jul 2014 18:25:55 +0000 (18:25 +0000)]
am
3c5dacac: am
004a427e: Merge "Make a network the default when it connects if we have no default." into lmp-dev
* commit '
3c5dacace453a3b7d02b6198fd00c7d5871c6688':
Brian Colonna [Thu, 17 Jul 2014 18:25:51 +0000 (18:25 +0000)]
am
7f3fc114: am
6f6fcecb: Bug
16152902: Disabling FUL in keyguard and screen lock settings
* commit '
7f3fc11451e3787a0453d80703178477c7f55495':
Fabrice Di Meglio [Thu, 17 Jul 2014 18:25:46 +0000 (18:25 +0000)]
Ye Wen [Thu, 17 Jul 2014 18:25:42 +0000 (18:25 +0000)]
am
8598bda9: am
0353e451: Merge "Unhide new MMS API and SMS storage API (1/2)" into lmp-dev
* commit '
8598bda9002f16e23ac08eb54a98978dca7b844c':
Robert Shih [Thu, 17 Jul 2014 18:25:37 +0000 (18:25 +0000)]
am
3b63090d: am
5f48c625: MediaRecorder: added constants for WEBM output
* commit '
3b63090d5f1ea9201f4a5953ba1a0fc181994e4b':
Eric Laurent [Thu, 17 Jul 2014 18:25:32 +0000 (18:25 +0000)]
am
136bee9d: am
aaaa07c2: Merge "AudioService: Use device specific mode to open SCO audio" into lmp-dev
* commit '
136bee9ddd36cb9cc8d1b95ec5c45ebc688d65dd':
Fabrice Di Meglio [Thu, 17 Jul 2014 18:25:28 +0000 (18:25 +0000)]
am
f48206de: am
bfe21a64: Fix bug #
16353909 Preferences RTL support is sometimes broken
* commit '
f48206de3bd2251618f7ceb3a67f0c74c688e1c5':
Chelsea Derrick [Thu, 17 Jul 2014 18:25:24 +0000 (18:25 +0000)]
am
c581c3da: (-s ours) am
42a0114c: Merge "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]" into lmp-dev
* commit '
c581c3dac2f576dc0301826c04a1761b01bd26ac':
Fabrice Di Meglio [Thu, 17 Jul 2014 18:25:20 +0000 (18:25 +0000)]
am
92cfbbe0: am
b56e3cad: Fix #
16348486 [RTL] Checkboxes are improperly aligned
* commit '
92cfbbe0e003e1b988b453216206cbfcef00ee6f':
Alan Viverette [Thu, 17 Jul 2014 18:25:16 +0000 (18:25 +0000)]
am
eec997ca: am
8e97a200: Fix software dirty region, don\'t add insets to software windows
* commit '
eec997ca5c0acf59502cf1ded08e1d6432d9d82c':
Yigit Boyar [Thu, 17 Jul 2014 18:25:11 +0000 (18:25 +0000)]
am
d497e541: am
d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev
* commit '
d497e5419fcbd5a933a1c736ed939a2121039fb0':
John Reck [Thu, 17 Jul 2014 18:25:07 +0000 (18:25 +0000)]
am
645f72ad: am
c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev
* commit '
645f72ad0c0803973902d69bd7f8d58dcc1ebbc7':
Stuart Scott [Thu, 17 Jul 2014 18:25:03 +0000 (18:25 +0000)]
am
4b564e73: am
b8948923: Merge "MSIM: dump sub specific info" into lmp-dev
* commit '
4b564e733f8cf3ec01ce7a3634a4dd54fc2c9400':
kmccormick [Thu, 17 Jul 2014 18:24:58 +0000 (18:24 +0000)]
am
478b82f8: am
7a0ace2d: am
1f4e5686: am
289d3c25: am
fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
* commit '
478b82f895c902c0d668fe97bb3ebe7cbf5236b5':
David Friedman [Thu, 17 Jul 2014 18:24:55 +0000 (18:24 +0000)]
am
282d44b1: am
a4690c90: am
8b51d07f: am
a827c738: am
046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
282d44b1762f769ffa4253e8edb9c0ff1242c84f':
Sailesh Nepal [Thu, 17 Jul 2014 18:24:50 +0000 (18:24 +0000)]
Christopher Tate [Thu, 17 Jul 2014 18:24:46 +0000 (18:24 +0000)]
am
05502b3c: am
c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev
* commit '
05502b3c3967c06fc0548c284b3b70e4c0201308':
Jeff Sharkey [Thu, 17 Jul 2014 18:24:41 +0000 (18:24 +0000)]
am
dcf9bb82: am
2158503f: Merge "Install sessions only inherit APK files." into lmp-dev
* commit '
dcf9bb8222f73777b45e3f1c1aab1d7b3d1adbd2':
Shishir Agrawal [Thu, 17 Jul 2014 18:24:36 +0000 (18:24 +0000)]
am
f8e585e4: am
38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev
* commit '
f8e585e462f38d80a571e2def7bba24f9be4e52f':
Sharvil Nanavati [Thu, 17 Jul 2014 18:24:32 +0000 (18:24 +0000)]
am
ca0fd698: am
3afc825a: Launch processes running under the \'bluetooth\' uid with CAP_WAKE_ALARM.
* commit '
ca0fd698587d6cdb576557c7d53a3a8cc8cf5c82':
Alan Viverette [Thu, 17 Jul 2014 18:24:25 +0000 (18:24 +0000)]
am
e0bc6218: am
ca27046e: Merge "Fix state list drawable transitions" into lmp-dev
* commit '
e0bc6218f3f7d6eea6b7d57b8e21a4c02805787e':
Fabrice Di Meglio [Thu, 17 Jul 2014 18:24:21 +0000 (18:24 +0000)]
am
47519491: am
fd6eeda0: Fix bug #
16309454 Broken recent button after dismissing set time dialog
* commit '
475194913a01b9301015302f907bd17ebe974724':
Jeff Davidson [Thu, 17 Jul 2014 18:24:17 +0000 (18:24 +0000)]
am
01a5e054: am
8f406122: Remove obsolete remark from XXHDPI comment.
* commit '
01a5e054b8383078c753f163e143baac67c8b041':
David Friedman [Thu, 17 Jul 2014 18:24:12 +0000 (18:24 +0000)]
am
589eba27: am
6ec875ea: am
c6474d97: am
fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit '
589eba27f69b7481a27ef0bb168013c4016e09b0':
Deepanshu Gupta [Thu, 17 Jul 2014 18:24:07 +0000 (18:24 +0000)]
am
71f28601: (-s ours) am
f9c7a0ab: Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
* commit '
71f28601c4d1d4a4fc88372438aaa7b281a44329':
Deepanshu Gupta [Thu, 17 Jul 2014 18:24:00 +0000 (18:24 +0000)]
am
bc48b92f: (-s ours) am
08f4aef0: Optimize Blend composites. [DO NOT MERGE]
* commit '
bc48b92f941c168bc08d4edf79aad696a1e3aaee':
Deepanshu Gupta [Thu, 17 Jul 2014 18:23:55 +0000 (18:23 +0000)]
John Spurlock [Thu, 17 Jul 2014 18:23:45 +0000 (18:23 +0000)]
am
58ac4ba9: am
f0580c6e: Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev
* commit '
58ac4ba9ef2eb5e0a5f5f7d28e35bdb0d822def1':
Shade: Hide the status icons from the collapsed header.
Przemyslaw Szczepaniak [Thu, 17 Jul 2014 18:23:39 +0000 (18:23 +0000)]
am
90d78fa4: am
95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev
* commit '
90d78fa4ec5326d0cacfa5221c6675bc28b8c9d3':
Add AudioAttributes support in the TTS.
John Spurlock [Thu, 17 Jul 2014 18:23:34 +0000 (18:23 +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 18:23:27 +0000 (18:23 +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 18:22:50 +0000 (18:22 +0000)]
am
a2a8501e: (-s ours) am
9a4cf569: DO NOT MERGE
* commit '
a2a8501ed552ec2c7679f079b2118a6eed2827ac':
DO NOT MERGE
Filip Gruszczynski [Thu, 17 Jul 2014 18:22:45 +0000 (18:22 +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 18:22:41 +0000 (18:22 +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 18:22:36 +0000 (18:22 +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 18:22:31 +0000 (18:22 +0000)]
am
2a96a389: am
cf3580b0: Merge "Fix build." into lmp-dev
* commit '
2a96a3890975a991cbd91e9444325b0ee879caae':
Fix build.
Chulwoo Lee [Thu, 17 Jul 2014 18:22:26 +0000 (18:22 +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 18:22:22 +0000 (18:22 +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 18:22:17 +0000 (18:22 +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 18:22:12 +0000 (18:22 +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 18:22:07 +0000 (18:22 +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 18:21:59 +0000 (18:21 +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 18:21:54 +0000 (18:21 +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 18:21:49 +0000 (18:21 +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 18:21:44 +0000 (18:21 +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 18:21:40 +0000 (18:21 +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 18:21:36 +0000 (18:21 +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 18:21:31 +0000 (18:21 +0000)]
am
84641420: am
1098531c: Disable logging in NetlinkTracker.
* commit '
84641420220d2d11e7baa7ae6061d78f31d97c98':
Disable logging in NetlinkTracker.
Chris Craik [Thu, 17 Jul 2014 18:21:26 +0000 (18:21 +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 18:21:21 +0000 (18:21 +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 18:21:17 +0000 (18:21 +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 18:21:12 +0000 (18:21 +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 18:21:07 +0000 (18:21 +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 18:21:03 +0000 (18:21 +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 18:20:58 +0000 (18:20 +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 18:20:54 +0000 (18:20 +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 18:20:48 +0000 (18:20 +0000)]
am
ff5ceb0d: am
0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit '
ff5ceb0d89c549682b498522f052d61c776bff03':
Introduce RTT Manager
Chelsea Derrick [Thu, 17 Jul 2014 18:20:43 +0000 (18:20 +0000)]
am
4e9ef0aa: (-s ours) 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 18:20:38 +0000 (18:20 +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 18:20:33 +0000 (18:20 +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 18:20:28 +0000 (18:20 +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 18:20:22 +0000 (18:20 +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 18:20:18 +0000 (18:20 +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 18:18:00 +0000 (18:18 +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 18:17:55 +0000 (18:17 +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 18:15:08 +0000 (18:15 +0000)]
am
6bbea8cf: Fix LocalePicker background
* commit '
6bbea8cf4252839d0c6f2a3152f506a7b2b2d753':
Fix LocalePicker background
Ye Wen [Thu, 17 Jul 2014 18:15:02 +0000 (18:15 +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 18:14:57 +0000 (18:14 +0000)]
am
5f48c625: MediaRecorder: added constants for WEBM output
* commit '
5f48c6258ffc537454e4df9b49a3ebee652cfaee':
MediaRecorder: added constants for WEBM output
Eric Laurent [Thu, 17 Jul 2014 18:14:50 +0000 (18:14 +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 18:14:45 +0000 (18:14 +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 18:14:40 +0000 (18:14 +0000)]
am
42a0114c: (-s ours) 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 18:14:33 +0000 (18:14 +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 18:14:28 +0000 (18:14 +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 18:14:23 +0000 (18:14 +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 18:14:18 +0000 (18:14 +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 18:14:13 +0000 (18:14 +0000)]
am
b8948923: Merge "MSIM: dump sub specific info" into lmp-dev
* commit '
b8948923b3f5eaf2eac96788294bc8c82cf0cfa9':
MSIM: dump sub specific info
kmccormick [Thu, 17 Jul 2014 18:14:09 +0000 (18:14 +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 18:14:05 +0000 (18:14 +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 18:05:42 +0000 (11:05 -0700)]
resolved conflicts for merge of
03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
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
OSDN Git Service
