OSDN Git Service
Chris Wren [Tue, 12 May 2015 23:07:57 +0000 (23:07 +0000)]
am
df2e2809: Merge "log more settings actions" into mnc-dev
* commit '
df2e2809bf8fd2b4d617196c50fa486aa21583e8':
log more settings actions
Narayan Kamath [Tue, 12 May 2015 23:07:42 +0000 (23:07 +0000)]
am
d7b2a2e4: Merge "Be more accepting of dex2oat errors." into mnc-dev
* commit '
d7b2a2e4562a9f5a085257b0da5a95b1b46d3d55':
Be more accepting of dex2oat errors.
Geoff Mendal [Tue, 12 May 2015 23:07:22 +0000 (23:07 +0000)]
am
aaefe373: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
aaefe3733b4f1ba58dbbbbcde977eafe56fe725e':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 12 May 2015 23:07:12 +0000 (23:07 +0000)]
am
cac1cad7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
cac1cad78fdc188d7b57b4a948bd461785a9b8f5':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 12 May 2015 23:07:00 +0000 (23:07 +0000)]
am
ebb3a45a: (-s ours) Import translations. DO NOT MERGE
* commit '
ebb3a45a67c253db9444319db35e0878d35f1185':
Import translations. DO NOT MERGE
Nick Kralevich [Tue, 12 May 2015 23:06:21 +0000 (23:06 +0000)]
am
d9c7f245: UsbManager / UsbService / UsbDeviceManager: delete unused code
* commit '
d9c7f2456957a5610cbbca1b2e31aa7b3574c50d':
UsbManager / UsbService / UsbDeviceManager: delete unused code
Jinsuk Kim [Tue, 12 May 2015 23:05:41 +0000 (23:05 +0000)]
am
1c861591: Merge "CEC: Update ARC feature flag on hotplug" into mnc-dev
* commit '
1c86159142aa8b5d582cd53e1d16b874c99d3bc4':
CEC: Update ARC feature flag on hotplug
Jeff Sharkey [Tue, 12 May 2015 23:05:35 +0000 (23:05 +0000)]
am
fced534d: Fix devices with primary physical storage.
* commit '
fced534dec1088bdd7da1495d76b73996dc8a1a1':
Fix devices with primary physical storage.
Dirk Dougherty [Tue, 12 May 2015 22:31:47 +0000 (22:31 +0000)]
am
a2e26b49: am
d3b2d050: am
674b1fcb: Doc change: Update cards and landing contents.
* commit '
a2e26b49539af04ea9d13eb3178f710b496e88bc':
Doc change: Update cards and landing contents.
Guang Zhu [Tue, 12 May 2015 22:31:22 +0000 (22:31 +0000)]
am
08cba16a: Merge "allow top sleeping state in app process verification" into mnc-dev
* commit '
08cba16a59c442619ec952e7ce251e4038eb8322':
allow top sleeping state in app process verification
Alan Viverette [Tue, 12 May 2015 22:15:26 +0000 (22:15 +0000)]
am
f659a56c: Merge "Replace usages of deprecated version of TextView.setTextAppearance()" into mnc-dev
* commit '
f659a56c3062392d6b6020d148553ce49797eb5a':
Replace usages of deprecated version of TextView.setTextAppearance()
Fyodor Kupolov [Tue, 12 May 2015 22:15:22 +0000 (22:15 +0000)]
am
220eef4a: Merge "Disable multi-user background recording" into mnc-dev
* commit '
220eef4a4abc15d42b8693667e2450bb7a1552a7':
Disable multi-user background recording
Wei Jia [Tue, 12 May 2015 22:15:09 +0000 (22:15 +0000)]
am
ea4eb326: Merge "MediaSync: address API review." into mnc-dev
* commit '
ea4eb326cfc4a8221be5fdab9639d468c632aee2':
MediaSync: address API review.
Fyodor Kupolov [Tue, 12 May 2015 22:14:54 +0000 (22:14 +0000)]
am
4f434a04: Merge "Remove restrictions PIN functionality" into mnc-dev
* commit '
4f434a04708e7a254afe2e0d362f715229dc15d1':
Remove restrictions PIN functionality
Alex Klyubin [Tue, 12 May 2015 22:14:48 +0000 (22:14 +0000)]
am
58237563: Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev
* commit '
5823756335ec3ecbe024369e24a6b291471cea9a':
Document when encrypted AndroidKeyStore keys are wiped.
Ronghua Wu [Tue, 12 May 2015 22:14:29 +0000 (22:14 +0000)]
am
69e927c3: Merge "media: merge CodecException\'s getErrorCode and getReason." into mnc-dev
* commit '
69e927c3cd8398e484849f7639fd781e106c1045':
media: merge CodecException's getErrorCode and getReason.
Mark Salyzyn [Tue, 12 May 2015 22:14:22 +0000 (22:14 +0000)]
am
61df07e1: BootReceiver: scrub APANIC
* commit '
61df07e1504bd1731d211f47ed9d40df7522d924':
BootReceiver: scrub APANIC
Christopher Tate [Tue, 12 May 2015 22:14:03 +0000 (22:14 +0000)]
am
f2f37781: am
e8334254: am
4f35e169: am
4475e7df: am
ea2c4033: Mark persistent apps as such when the ProcessRecord is created
* commit '
f2f37781701407acfc64098370b6db1ee70613a2':
Mark persistent apps as such when the ProcessRecord is created
Wale Ogunwale [Tue, 12 May 2015 22:13:54 +0000 (22:13 +0000)]
am
b2fa5f31: Merge "Clean-up component states in AMS when component is disabled" into mnc-dev
* commit '
b2fa5f3160cfc9b1703c6970649a926370971ea9':
Clean-up component states in AMS when component is disabled
John Spurlock [Tue, 12 May 2015 22:13:37 +0000 (22:13 +0000)]
am
ce06c940: Merge "Zen QS: Tweak segmented button + introduction styling." into mnc-dev
* commit '
ce06c940ed04d804574bd0afa3cb7ee6123af39a':
Zen QS: Tweak segmented button + introduction styling.
John Spurlock [Tue, 12 May 2015 22:13:28 +0000 (22:13 +0000)]
am
4755cb3e: Merge "Zen: Tweak default automatic rules." into mnc-dev
* commit '
4755cb3e5d8012b5554369d0df25ba8634267aa2':
Zen: Tweak default automatic rules.
John Spurlock [Tue, 12 May 2015 22:13:17 +0000 (22:13 +0000)]
am
d89a6b2a: Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev
* commit '
d89a6b2abc38907a532da7dec073663da5a74e7c':
Zen: Simplify notification policy api, add zenmode api.
Mike Lockwood [Tue, 12 May 2015 22:13:01 +0000 (22:13 +0000)]
am
5759a8a9: Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc-dev
* commit '
5759a8a9cfef08b7f9485c67b07be9ae268dea0a':
BluetoothMidiDevice: Cleanup and error handling improvements
Craig Lafayette [Tue, 12 May 2015 22:12:30 +0000 (22:12 +0000)]
am
ed1ef7d4: Merge "DeviceInitializerStatus API review changes" into mnc-dev
* commit '
ed1ef7d4eb8934f6940a2e828ebd0e6878e1af89':
DeviceInitializerStatus API review changes
Alex Klyubin [Tue, 12 May 2015 22:12:23 +0000 (22:12 +0000)]
am
e239f782: Merge "More Javadocs for AndroidKeyStore public classes." into mnc-dev
* commit '
e239f782509583b14c95b1c88bf2b085d1e1b6e1':
More Javadocs for AndroidKeyStore public classes.
Chad Brubaker [Tue, 12 May 2015 22:12:04 +0000 (22:12 +0000)]
am
f8a96d16: Merge "Cleanup keystore password changing and unlocking" into mnc-dev
* commit '
f8a96d16290dbca1b1bdad153ceadad9c7d55111':
Cleanup keystore password changing and unlocking
Mady Mellor [Tue, 12 May 2015 22:11:56 +0000 (22:11 +0000)]
am
db9629ee: Merge "Fix: Hard to modify multi-line selection." into mnc-dev
* commit '
db9629eec46a3259a9973c2d597fc0813028694c':
Fix: Hard to modify multi-line selection.
Dmitriy Ivanov [Tue, 12 May 2015 22:11:27 +0000 (22:11 +0000)]
am
52dfc9d4: Merge "Switch libjnigraphics.so to hash-style=both" into mnc-dev
* commit '
52dfc9d4fd0b518fd101819202a8dfb3ef469190':
Switch libjnigraphics.so to hash-style=both
John Reck [Tue, 12 May 2015 22:11:19 +0000 (22:11 +0000)]
am
9aa7b45e: Merge "Fix kSkippedFrame setting" into mnc-dev
* commit '
9aa7b45e796fea9e308fb2fc1fe5363390f1e7ba':
Fix kSkippedFrame setting
Eric Laurent [Tue, 12 May 2015 22:10:53 +0000 (22:10 +0000)]
am
e48f44f5: Merge "AudioManager: add previous AudioPort list" into mnc-dev
* commit '
e48f44f55b5cdb9c4c3fa6ae6eae56768c6b12af':
AudioManager: add previous AudioPort list
John Reck [Tue, 12 May 2015 22:10:44 +0000 (22:10 +0000)]
am
75766518: Merge "Compatibility hack" into mnc-dev
* commit '
7576651801f639a682b38cc0697dd079c8df8fa5':
Compatibility hack
Richard Uhler [Tue, 12 May 2015 22:10:37 +0000 (22:10 +0000)]
am
26211059: Merge "Add \'App Summary\' section to meminfo." into mnc-dev
* commit '
262110591ec62e3921eb2ee27e12991f960d5799':
Add 'App Summary' section to meminfo.
Glenn Kasten [Tue, 12 May 2015 22:10:31 +0000 (22:10 +0000)]
am
d7b69c2e: Merge "Add feature for pro audio" into mnc-dev
* commit '
d7b69c2eca8a43eb069749071a15a635b5dc30d6':
Add feature for pro audio
Alan Viverette [Tue, 12 May 2015 22:10:26 +0000 (22:10 +0000)]
am
f93bba5b: Merge "Allow ContextImpl.setTheme(int) to be called after getTheme()" into mnc-dev
* commit '
f93bba5b793a73f98fdaf62ffbccb3ee1769194c':
Allow ContextImpl.setTheme(int) to be called after getTheme()
Dianne Hackborn [Tue, 12 May 2015 21:56:23 +0000 (21:56 +0000)]
am
ed9af066: Merge "Fix issue #
20655182: API Review: ViewAssistStructure" into mnc-dev
* commit '
ed9af066b2407a36699fae2e475c4d1b53d2ca1d':
Fix issue #
20655182: API Review: ViewAssistStructure
George Mount [Tue, 12 May 2015 21:56:01 +0000 (21:56 +0000)]
am
180fd278: Merge "Don\'t call updateDisplayListIfDirty outside draw." into mnc-dev
* commit '
180fd27832b429aaca0a35e8b93c88195b6451be':
Don't call updateDisplayListIfDirty outside draw.
Tyler Gunn [Tue, 12 May 2015 21:55:50 +0000 (21:55 +0000)]
am
6624015e: Merge "Un-@hiding some missed VT APIs." into mnc-dev
* commit '
6624015e4f11e1072583423e193751f4a90ce45f':
Un-@hiding some missed VT APIs.
Craig Lafayette [Tue, 12 May 2015 21:55:42 +0000 (21:55 +0000)]
am
4ca9955d: Merge "DevicePolicyManager API review changes" into mnc-dev
* commit '
4ca9955d39009bffdbae0a630478c06315cfe714':
DevicePolicyManager API review changes
Alan Viverette [Tue, 12 May 2015 21:55:15 +0000 (21:55 +0000)]
am
f4cf03dc: Merge "Use correct array index for Theme.getTheme()" into mnc-dev
* commit '
f4cf03dcca8408dbcffb5737a84792bd2dc6a5e0':
Use correct array index for Theme.getTheme()
John Reck [Tue, 12 May 2015 21:55:00 +0000 (21:55 +0000)]
am
a8dca228: Merge "Add eglSwapBuffersWithDamageKHR support" into mnc-dev
* commit '
a8dca228b254fd1553824d2c5de3aaedc2fe4400':
Add eglSwapBuffersWithDamageKHR support
Alex Klyubin [Tue, 12 May 2015 21:54:53 +0000 (21:54 +0000)]
am
b954ecda: Merge "Switch to KeyguardManager.isDeviceSecure." into mnc-dev
* commit '
b954ecda0922a894835f224bead0f06ec7a8ef17':
Switch to KeyguardManager.isDeviceSecure.
Adam Powell [Tue, 12 May 2015 21:54:42 +0000 (21:54 +0000)]
am
5b56159b: Merge "Add Build.VERSION.PREVIEW_SDK_INT" into mnc-dev
* commit '
5b56159b8e2e1c494b4d8fb9d2b0aeef59aaddd4':
Add Build.VERSION.PREVIEW_SDK_INT
Dirk Dougherty [Tue, 12 May 2015 21:54:23 +0000 (21:54 +0000)]
am
e1a1d2e8: am
4e19b9a0: am
27e82e7b: Merge "Doc change: remove design content that has moved to material spec." into mnc-preview-docs
* commit '
e1a1d2e85a3f0626ae13322998fd45a1eb4a49d7':
Doc change: remove design content that has moved to material spec.
Joe Fernandez [Tue, 12 May 2015 21:54:07 +0000 (21:54 +0000)]
am
8605d635: am
259a73b5: am
b2152a43: am
1dc26b8c: docs: remove obsolete renderscript reference framer page
* commit '
8605d635ffa739a835a742f02bd39957eb8defb7':
docs: remove obsolete renderscript reference framer page
Yohei Yukawa [Tue, 12 May 2015 21:53:53 +0000 (21:53 +0000)]
am
93b6dae9: Merge "Fix IMMS#mInputShown state inconsistency." into mnc-dev
* commit '
93b6dae9e5e3875c4944ed211af3daf6530507e2':
Fix IMMS#mInputShown state inconsistency.
Alex Klyubin [Tue, 12 May 2015 21:53:37 +0000 (21:53 +0000)]
am
3974fb23: Merge "Replace "TEE" with "secure hardware"." into mnc-dev
* commit '
3974fb239392099608f969254c4d86e7d13ab32d':
Replace "TEE" with "secure hardware".
Xiaohui Chen [Tue, 12 May 2015 21:53:28 +0000 (21:53 +0000)]
am
0dc01933: Merge "multiuser: postpone user cleanup to systemready" into mnc-dev
* commit '
0dc0193307b9bb97aac1cfb79e56444578ba006e':
multiuser: postpone user cleanup to systemready
Michael Wright [Tue, 12 May 2015 21:53:14 +0000 (21:53 +0000)]
am
1336c2c6: Merge "Always destroy virtual display on Binder death." into mnc-dev
* commit '
1336c2c68df5761af174d93f42a478ea752e2a5c':
Always destroy virtual display on Binder death.
Erik Kline [Tue, 12 May 2015 21:52:40 +0000 (21:52 +0000)]
am
a0698b61: Merge "Optionally add a default MOBILE request." into mnc-dev
* commit '
a0698b617f1efc71d5301f98aead822e266ec5d6':
Optionally add a default MOBILE request.
Selim Cinek [Tue, 12 May 2015 21:51:47 +0000 (21:51 +0000)]
am
03fdca1b: Merge "Fixed a bug where the heads-up would not show when full screen" into mnc-dev
* commit '
03fdca1b29aff07583b7764b7b359cbbfc58e577':
Fixed a bug where the heads-up would not show when full screen
Siva Velusamy [Tue, 12 May 2015 21:51:32 +0000 (21:51 +0000)]
am
1f861997: Merge "Use new hierarchy viewer protocol in all View subclasses" into mnc-dev
* commit '
1f8619974806d1c461b57ab232c50f1845d4d433':
Use new hierarchy viewer protocol in all View subclasses
Siva Velusamy [Tue, 12 May 2015 21:51:22 +0000 (21:51 +0000)]
am
52156a32: Merge "Improve hierarchy viewer dump hierarchy latency" into mnc-dev
* commit '
52156a325e1d5c764b6ba54a7098d6f4b6068e61':
Improve hierarchy viewer dump hierarchy latency
Selim Cinek [Tue, 12 May 2015 21:51:08 +0000 (21:51 +0000)]
am
03872c07: Fixed a bug with svelte and voice assist
* commit '
03872c075e756b37a80de708cbd8d3d65d50a3a8':
Fixed a bug with svelte and voice assist
Paul Jensen [Tue, 12 May 2015 21:50:57 +0000 (21:50 +0000)]
am
31999808: Merge "Add URL bar to captive portal login app." into mnc-dev
* commit '
3199980812473f8008b83e24c87fdeab28a68042':
Add URL bar to captive portal login app.
Wei Wang [Tue, 12 May 2015 21:50:25 +0000 (21:50 +0000)]
am
0a008049: Merge "Allow obtaining BLE capabilities in BLE scan only mode." into mnc-dev
* commit '
0a008049a21c5fbe36eac8047c5411c2e3aff41b':
Allow obtaining BLE capabilities in BLE scan only mode.
Alan Viverette [Tue, 12 May 2015 21:49:55 +0000 (21:49 +0000)]
am
78f12e43: Update LayoutLib for theme key changes to fix build
* commit '
78f12e43f08a1b2acda7b565a310c48e507f5e47':
Update LayoutLib for theme key changes to fix build
Chong Zhang [Tue, 12 May 2015 21:49:38 +0000 (21:49 +0000)]
am
1e6be728: MediaPlayer: pause media time when buffering
* commit '
1e6be7285d4dc8b494c70aef8d2ed8b8c1d8e0de':
MediaPlayer: pause media time when buffering
Chet Haase [Tue, 12 May 2015 21:48:50 +0000 (21:48 +0000)]
am
c1125ded: Merge "Disable ActionBar animations pending more involved fix" into mnc-dev
* commit '
c1125dedfcb52644aabc175d749c89b3008e4337':
Disable ActionBar animations pending more involved fix
Mady Mellor [Tue, 12 May 2015 21:48:41 +0000 (21:48 +0000)]
am
a18df8d6: Merge "Consider punctuation treatment when selecting text." into mnc-dev
* commit '
a18df8d6c7f7eb7c2cd6cff3dfe8decd177752fa':
Consider punctuation treatment when selecting text.
Keisuke Kuroyanagi [Tue, 12 May 2015 21:48:31 +0000 (21:48 +0000)]
am
636a0da8: Merge "Fix: A part of grapheme cluster can be selected." into mnc-dev
* commit '
636a0da80533eff7fa8b67afb07277b0ba065d7c':
Fix: A part of grapheme cluster can be selected.
Fabrice Di Meglio [Tue, 12 May 2015 21:48:23 +0000 (21:48 +0000)]
am
aef02104: Merge "Add IntentFilter auto verification - part 8" into mnc-dev
* commit '
aef021042e1bc6851a9d66f40f00cea021d357c7':
Add IntentFilter auto verification - part 8
Mike Lockwood [Tue, 12 May 2015 21:47:57 +0000 (21:47 +0000)]
am
3203f9a6: Merge "MidiManager: Improve output of "dumpsys midi"" into mnc-dev
* commit '
3203f9a6a0669f270acce579b1cb30fac5e2af08':
MidiManager: Improve output of "dumpsys midi"
Alan Viverette [Tue, 12 May 2015 21:47:51 +0000 (21:47 +0000)]
am
6a8c79bb: Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev
* commit '
6a8c79bb2b4b0c749e76dc3628ec5200efec4f40':
Improve keying for theme caches, rebase system theme on config change
Mady Mellor [Tue, 12 May 2015 21:47:41 +0000 (21:47 +0000)]
am
6fc03e65: Merge "Revert "Text selection - Don\'t select vertical white space"" into mnc-dev
* commit '
6fc03e6523ee566ed278c3b64aa344ae95c8d824':
Revert "Text selection - Don't select vertical white space"
Alan Viverette [Tue, 12 May 2015 21:47:34 +0000 (21:47 +0000)]
am
0cb41858: Merge "Replace Material text cursor with XML shape" into mnc-dev
* commit '
0cb418588aee5072bb29bc158e4446130dd74921':
Replace Material text cursor with XML shape
John Reck [Tue, 12 May 2015 21:47:17 +0000 (21:47 +0000)]
Chih-Hung Hsieh [Tue, 12 May 2015 21:46:48 +0000 (21:46 +0000)]
am
ff357a9c: Merge "Fix clang warnings on unused variable, mismatched tag, print format." into mnc-dev
* commit '
ff357a9cd4b6faffcad428973fef3ddd1d27b22d':
Fix clang warnings on unused variable, mismatched tag, print format.
John Reck [Tue, 12 May 2015 21:46:41 +0000 (21:46 +0000)]
am
d530a5e5: Merge "Remove SkBitmap from ResourceCache" into mnc-dev
* commit '
d530a5e5ae26794556488ea09fc44219481c936b':
Remove SkBitmap from ResourceCache
Chien-Yu Chen [Tue, 12 May 2015 21:46:29 +0000 (21:46 +0000)]
am
0dfb7ba4: Merge "camera2: allow mixing regular/reprocess requests" into mnc-dev
* commit '
0dfb7ba4a81e3af2e93732942d314a55c02f6ac1':
camera2: allow mixing regular/reprocess requests
George Mount [Tue, 12 May 2015 21:46:22 +0000 (21:46 +0000)]
am
b4035fd8: Merge "Properly cancel animators when View doesn\'t exist in starting state." into mnc-dev
* commit '
b4035fd886ba11869f9b1fd969e01a91e95df6e8':
Properly cancel animators when View doesn't exist in starting state.
Svet Ganov [Tue, 12 May 2015 21:46:06 +0000 (21:46 +0000)]
am
2d9ef99a: Merge "Fix broke NDK sensor manager API" into mnc-dev
* commit '
2d9ef99a4ed49a1e43441b86db51cf8533b02a0e':
Fix broke NDK sensor manager API
Alan Viverette [Tue, 12 May 2015 21:45:54 +0000 (21:45 +0000)]
am
34dd5824: Merge "Only resize list popup if it\'s still attached to a window" into mnc-dev
* commit '
34dd5824f5c6ffe64ddc347cbd0eb65cd9321a7d':
Only resize list popup if it's still attached to a window
Christopher Ferris [Tue, 12 May 2015 21:45:44 +0000 (21:45 +0000)]
am
411feedf: am
a7f27a76: (-s ours) am
504bb9e7: Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
411feedf68dd52cd6e9777bb163f63eee73bfe32':
Temporarily increase saved tombstone size. DO NOT MERGE
Derek Sollenberger [Tue, 12 May 2015 21:45:37 +0000 (21:45 +0000)]
am
7b753cf1: Merge "Update the rowBytes when reconfiguring to match the new imageInfo." into mnc-dev
* commit '
7b753cf12e471e15a4b1c1b710393b40502a8bb7':
Update the rowBytes when reconfiguring to match the new imageInfo.
Chris Wren [Tue, 12 May 2015 21:45:32 +0000 (21:45 +0000)]
am
d11ad51d: Merge "add logging to quick settings tiles" into mnc-dev
* commit '
d11ad51d119aaa826d988fbc7f6c626afff00983':
add logging to quick settings tiles
Guang Zhu [Tue, 12 May 2015 21:45:22 +0000 (21:45 +0000)]
am
39fce1d2: Merge "improve app crash detection in compatibility test" into mnc-dev
* commit '
39fce1d226c96e49cf8466a347dabe9dba702151':
improve app crash detection in compatibility test
John Reck [Tue, 12 May 2015 21:45:09 +0000 (21:45 +0000)]
am
dc9b2dfa: Merge "Delete a bunch of dead code" into mnc-dev
* commit '
dc9b2dfae2d2c0ef6d7e8d769a78abc17add537a':
Delete a bunch of dead code
Doris Liu [Tue, 12 May 2015 21:44:59 +0000 (21:44 +0000)]
am
c7e56e9d: Merge "Take into account scroll offset for transition animation" into mnc-dev
* commit '
c7e56e9df155b678e604ad6402150397d2665f95':
Take into account scroll offset for transition animation
Alex Klyubin [Tue, 12 May 2015 21:44:52 +0000 (21:44 +0000)]
am
a4ead5b0: Merge "Document that new APIs for asymmetric crypto have no effect." into mnc-dev
* commit '
a4ead5b0d55840be675eee3f11a9dd08bbedaa0d':
Document that new APIs for asymmetric crypto have no effect.
Alex Klyubin [Tue, 12 May 2015 21:44:45 +0000 (21:44 +0000)]
am
e91768d4: Merge "Check parameters in KeyGenerator.init." into mnc-dev
* commit '
e91768d4b5c5e185b884a25bcf60457fb2ba8a5c':
Check parameters in KeyGenerator.init.
Alan Viverette [Tue, 12 May 2015 21:44:37 +0000 (21:44 +0000)]
am
43ea92b8: Merge "Remove dead code from EpicenterTranslateClipReveal" into mnc-dev
* commit '
43ea92b8efb7a07e687e20d1fb0b1a9327a70949':
Remove dead code from EpicenterTranslateClipReveal
Alex Klyubin [Tue, 12 May 2015 21:44:29 +0000 (21:44 +0000)]
am
14bc1c58: Merge "Use ProviderException in AndroidKeyStore." into mnc-dev
* commit '
14bc1c58d4b194ac201b0ed7d04d6f30890ff4a2':
Use ProviderException in AndroidKeyStore.
Alex Klyubin [Tue, 12 May 2015 21:44:08 +0000 (21:44 +0000)]
am
38dc1542: Merge "Always mix in additional entropy into key" into mnc-dev
* commit '
38dc15421eaa61d20939d00695d7b7515302c7e8':
Always mix in additional entropy into keymaster.
Yorke Lee [Tue, 12 May 2015 21:43:57 +0000 (21:43 +0000)]
am
e0895660: Merge "Filter list of possible default dialers" into mnc-dev
* commit '
e0895660dac3fc87665d2cf7b0ca6906ab89cec1':
Filter list of possible default dialers
Alex Klyubin [Tue, 12 May 2015 21:43:49 +0000 (21:43 +0000)]
am
f5558872: Merge "Adjust the Javadoc for user authentication timeout." into mnc-dev
* commit '
f555887237665fd2cd16182e63dd7ff5f4b7e708':
Adjust the Javadoc for user authentication timeout.
Alex Klyubin [Tue, 12 May 2015 21:43:41 +0000 (21:43 +0000)]
am
8d7455fb: Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev
* commit '
8d7455fbe406555034e1e6ecc8f99c7949467074':
Define String constants for AndroidKeyStore crypto.
Alan Viverette [Tue, 12 May 2015 21:43:31 +0000 (21:43 +0000)]
am
83ce3b26: Merge "Make popup window enter animation more like app transition enter" into mnc-dev
* commit '
83ce3b26b612d729cb4ec195b88bc070094cda39':
Make popup window enter animation more like app transition enter
Chris Elliott [Tue, 12 May 2015 21:43:15 +0000 (21:43 +0000)]
am
80f232de: am
b65b66cc: am
2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev
* commit '
80f232deaee9fe4f69eaa5b8d355aac9bad7a291':
bootanimation: fix garbage line issue when screen height is odd.
Alan Viverette [Tue, 12 May 2015 21:43:03 +0000 (21:43 +0000)]
am
b4b44378: Merge "Remove tools attributes from framework XML" into mnc-dev
* commit '
b4b44378011b9935ddb6f3f18bf1b7d5f57e948b':
Remove tools attributes from framework XML
Chet Haase [Tue, 12 May 2015 21:42:36 +0000 (21:42 +0000)]
am
1bc3c849: Merge "Fix leak in LayoutTransition" into mnc-dev
* commit '
1bc3c849ba5e9f23dd7e93012c4b5800b78c221b':
Fix leak in LayoutTransition
Niels Egberts [Tue, 12 May 2015 21:41:48 +0000 (21:41 +0000)]
am
dd441795: Merge "Don\'t strip country and variant from locale." into mnc-dev
* commit '
dd441795409f26f45de3ce40a1bab4121cfcefe5':
Don't strip country and variant from locale.
John Reck [Tue, 12 May 2015 21:41:40 +0000 (21:41 +0000)]
am
b59642bf: Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-dev
* commit '
b59642bf49e8703ebd88532f06628ef5a7d8b006':
Add warning if an in-use Bitmap is reconfigured
Paul Jensen [Tue, 12 May 2015 21:40:32 +0000 (21:40 +0000)]
am
ffe2dda1: Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev
* commit '
ffe2dda135880c25ed7882de7bf74ea7ce0d5564':
Avoid NPE when sendMessage is called after disconnect.
George Mount [Tue, 12 May 2015 21:39:52 +0000 (21:39 +0000)]
am
fa216411: Merge "Add CallbackRegistry." into mnc-dev
* commit '
fa21641122170777818ff838c1c19505313e83c3':
Add CallbackRegistry.
George Mount [Tue, 12 May 2015 21:39:43 +0000 (21:39 +0000)]
am
b3ba2138: Merge "Fix crash during Activity Transition with TextureView." into mnc-dev
* commit '
b3ba21389553c79109a3d1415d78e8a582c6dcaa':
Fix crash during Activity Transition with TextureView.
Neil Fuller [Tue, 12 May 2015 21:39:29 +0000 (21:39 +0000)]
am
d6a21352: Remove FloatMath methods from the API
* commit '
d6a213526251896b7f9928334a17ae0dd97669ba':
Remove FloatMath methods from the API
Jeff Brown [Tue, 12 May 2015 21:39:16 +0000 (21:39 +0000)]
am
dbf62ace: Merge "Remove incomplete media router API." into mnc-dev
* commit '
dbf62ace0dcb671f5eaa97c0dfa75e39bc9c88be':
Remove incomplete media router API.
Jinsuk Kim [Tue, 12 May 2015 21:39:07 +0000 (21:39 +0000)]
am
dd0f3964: Merge "CEC: Make wakeup on hotplug optional" into mnc-dev
* commit '
dd0f3964ef0bb6c04eb295119a2c7355125332d0':
CEC: Make wakeup on hotplug optional
Joe Fernandez [Tue, 12 May 2015 21:38:58 +0000 (21:38 +0000)]
am
38de061b: am
b53420d0: am
e7866887: docs: M Preview landing page
* commit '
38de061b8b3953f7c211e75b4f7a5e22bd41711a':
docs: M Preview landing page
Yohei Yukawa [Tue, 12 May 2015 21:38:47 +0000 (21:38 +0000)]
am
f2cac4d4: Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
* commit '
f2cac4d495a6365758a99f4eba531579ab73fee5':
Retry "Always show auxiliary subtypes from NavBar keyboard icon."