OSDN Git Service
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."
Nitin Arora [Tue, 12 May 2015 21:38:39 +0000 (21:38 +0000)]
am
bdfaa7f5: Bluetooth: Ensure Bluetooth interface handle is valid
* commit '
bdfaa7f566a0fbe59dfc6bc14cd9d4d92b9259fa':
Bluetooth: Ensure Bluetooth interface handle is valid
Bart Sears [Tue, 12 May 2015 21:37:34 +0000 (21:37 +0000)]
am
9132c5ab: Merge "Revert "Remove incomplete media router API."" into mnc-dev
* commit '
9132c5ab0746f56909ed5630a6e93c9fadefabd0':
Revert "Remove incomplete media router API."
Diego Perez [Tue, 12 May 2015 21:37:27 +0000 (21:37 +0000)]
am
70280a20: am
0fe14486: am
2021c877: am
33e54563: am
4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '
70280a20f379e416d9cff20b7c6764844e7c2ff4':
Added function to render a drawable in all available states
Jeff Brown [Tue, 12 May 2015 21:37:20 +0000 (21:37 +0000)]
am
1290748d: Merge "Remove incomplete media router API." into mnc-dev
* commit '
1290748db311fb8cf9e5491e988c82b0757ec57e':
Remove incomplete media router API.
Bart Sears [Tue, 12 May 2015 21:37:10 +0000 (21:37 +0000)]
am
1b0888fe: Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev
* commit '
1b0888fe8e70ddb92090edbaea545f2766ee404e':
Revert "Always show auxiliary subtypes from NavBar keyboard icon."
Jeff Brown [Tue, 12 May 2015 21:36:59 +0000 (21:36 +0000)]
am
ee2e8fbe: Merge changes from topic \'mr\' into mnc-dev
* commit '
ee2e8fbe71444baac010d363cca9a113e12abdb6':
Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Revert "Initial draft of new MediaRouter APIs."
Diego Perez [Tue, 12 May 2015 21:36:45 +0000 (21:36 +0000)]
am
f7f6fd2c: am
c2ba7391: am
613aef87: am
86bff0bb: am
0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '
f7f6fd2c0c1a185b658915e7e12fbd93560c7391':
Add new parameter to the render method to allow forcing a measure pass.
Avoid caching mImage on the main render loop and use clipping.
Diego Perez [Tue, 12 May 2015 21:36:27 +0000 (21:36 +0000)]
am
c000db78: am
9af506fb: am
143eaa81: am
2ea82244: am
263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '
c000db78d7dabc244e9bda42d33977fc4d259b20':
Make status and navigation bars widgets and usable from layouts
Diego Perez [Tue, 12 May 2015 21:36:20 +0000 (21:36 +0000)]
am
9207b856: am
ae4619dd: am
df4c977d: am
24e10c0b: am
19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit '
9207b8567af2ea3913aec6085e8e610a70925e09':
Move StatusBar to use statusBarColor theme attribute
Diego Perez [Tue, 12 May 2015 21:36:02 +0000 (21:36 +0000)]
am
c87fe129: am
52ef7fce: am
ffeb8117: am
9c13c8de: am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
c87fe129e5ce33b03c570ce34184395a3011135c':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Tue, 12 May 2015 21:35:54 +0000 (21:35 +0000)]
am
790f6925: am
a131bfe0: am
3dbd18cd: am
872e9950: am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
790f6925a7381f5a59623854fcbd04c84f529fd1':
More layoutlib tests.
Deepanshu Gupta [Tue, 12 May 2015 21:35:46 +0000 (21:35 +0000)]
am
2ab7b460: resolved conflicts for merge of
a663e012 to mnc-dev
* commit '
2ab7b460562ca9cf52a5c47a9c61a5cc31fd3a13':
RecyclerView in LayoutLib: better XML attrs.
Diego Perez [Tue, 12 May 2015 21:35:37 +0000 (21:35 +0000)]
am
d7a53dab: am
9efcb308: am
21246bd9: am
8e75e307: am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
d7a53dab44babb38acc7cd0cc3067ae95152614d':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Tue, 12 May 2015 21:35:30 +0000 (21:35 +0000)]
am
15432daa: am
9c9bcd34: am
cae76a70: am
46241071: am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
15432daa6e35d8978393da083f934848957f147c':
Nullity annotations to some tests.
Deepanshu Gupta [Tue, 12 May 2015 21:35:23 +0000 (21:35 +0000)]
am
dbcedeea: am
b2951490: am
b19325be: am
2e3c41a4: am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
dbcedeea2031554d5ebf9b3c09df90374b3273a7':
Fix title bar showing when not required.
Deepanshu Gupta [Tue, 12 May 2015 21:35:16 +0000 (21:35 +0000)]
am
c49b8f9d: am
88b193d7: am
047a28ec: am
96437fb4: am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
c49b8f9d1b00e89e24f598eaeab6f7395fc68f32':
LayoutLib: fix crash when shadow size <=0.
Adam Powell [Tue, 12 May 2015 21:35:05 +0000 (21:35 +0000)]
am
90ae4553: Merge "Move PhoneWindow and friends back into internal package" into mnc-dev
* commit '
90ae4553fe8649f248351dd39bb77b1c46a7ebae':
Move PhoneWindow and friends back into internal package
Seigo Nonaka [Tue, 12 May 2015 21:34:33 +0000 (21:34 +0000)]
am
7afd01e2: Merge "Do nothing if hideSoftInput is called from not focused client." into mnc-dev
* commit '
7afd01e2f1c0235f5d5a95744200d6739d6fcaa4':
Do nothing if hideSoftInput is called from not focused client.
John Spurlock [Tue, 12 May 2015 21:33:58 +0000 (21:33 +0000)]
am
c2ec3340: Merge "Add setting to mute wireless charging sound." into mnc-dev
* commit '
c2ec334079375ac6a4337bd5b94e173534b51129':
Add setting to mute wireless charging sound.
Yorke Lee [Tue, 12 May 2015 21:33:23 +0000 (21:33 +0000)]
am
9a7db1a6: Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev
* commit '
9a7db1a6f58a3efc37c7e761445617f22adb9d4e':
Fix potential NPE in TelecomManager.placeCall
Nicolas Prevot [Tue, 12 May 2015 21:32:59 +0000 (21:32 +0000)]
am
2665fdfd: Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev
* commit '
2665fdfd61abce66a4843436333d5471cf389753':
Fetch DISALLOW_CONFIG_VPN for the current user.
John Reck [Tue, 12 May 2015 21:32:50 +0000 (21:32 +0000)]
am
4862e973: Merge "Annotate Application with @CallSuper" into mnc-dev
* commit '
4862e973a643a0f66da50ce416258c62d7c55e2d':
Annotate Application with @CallSuper
Jinsuk Kim [Tue, 12 May 2015 21:32:42 +0000 (21:32 +0000)]
am
e184a6b9: Merge "CEC: Reset active source/path before going into standby" into mnc-dev
* commit '
e184a6b9ac6d2f871bc094665bef5efa7f2292e5':
CEC: Reset active source/path before going into standby
Matthew Williams [Tue, 12 May 2015 21:32:20 +0000 (21:32 +0000)]
am
41fe5292: Merge "Delay all syncing until the device is provisioned" into mnc-dev
* commit '
41fe5292fdf692ffba5b80e984113d431ce7d2fd':
Delay all syncing until the device is provisioned
Raph Levien [Tue, 12 May 2015 21:31:57 +0000 (21:31 +0000)]
am
6402dc7e: Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev
* commit '
6402dc7e4adbfb64ee80858292958ed217560c12':
Clear all StaticLayout.Builder fields on pool recycle
John Spurlock [Tue, 12 May 2015 21:31:39 +0000 (21:31 +0000)]
am
03dbaf15: Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev
* commit '
03dbaf15ee466d262c059bfe79f74b8bccec8c03':
Volume a11y: Resize zen footer text when changed.
John Spurlock [Tue, 12 May 2015 21:31:25 +0000 (21:31 +0000)]
am
0c467064: Merge "Volume a11y: Rename introduction \'confirm\' button to \'close\'." into mnc-dev
* commit '
0c467064e2ae4a49ae45cb87509e578dd021daf6':
Volume a11y: Rename introduction 'confirm' button to 'close'.
Tim Murray [Tue, 12 May 2015 21:31:12 +0000 (21:31 +0000)]
am
54e685c4: Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev
* commit '
54e685c4bc37c4d1258d3e272e5c012891d7e573':
Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest
Adam Powell [Tue, 12 May 2015 21:30:59 +0000 (21:30 +0000)]
am
cfd6e9df: Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev
* commit '
cfd6e9dfd063cba795497f251aa6f7fe2554f10b':
Add alternate intents and refinement callbacks to ChooserActivity
Ruben Brunk [Tue, 12 May 2015 21:30:40 +0000 (21:30 +0000)]
am
0a323036: Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev
* commit '
0a323036e2351ce4e9347ca1a1b5664e0f6e7672':
Revert "camera: Start/stop preview before clearing surface."
Sanket Padawe [Tue, 12 May 2015 21:30:27 +0000 (21:30 +0000)]
am
60137fdc: Merge "Saved network summary string fixes in Wifi Settings" into mnc-dev
* commit '
60137fdcb3294acb3faf8a31d96cb6aa2dd78b1a':
Saved network summary string fixes in Wifi Settings
Seigo Nonaka [Tue, 12 May 2015 21:30:02 +0000 (21:30 +0000)]
am
06bdf9c6: Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev
* commit '
06bdf9c6a6e2a23f18129cf390c6277085210dd1':
Always show auxiliary subtypes from NavBar keyboard icon.
Christopher Tate [Tue, 12 May 2015 21:29:50 +0000 (21:29 +0000)]
am
a1d3c508: Merge "Fix requestRestore() of an app\'s own package" into mnc-dev
* commit '
a1d3c508e160b35f4f8ef56c2fb2fd6f65d5cbbd':
Fix requestRestore() of an app's own package
Jason Sams [Tue, 12 May 2015 21:29:44 +0000 (21:29 +0000)]
am
22f07f89: Merge "Fix Allocation-less launches" into mnc-dev
* commit '
22f07f89df69e888ffb9e7b8e498cc8ac5fb282f':
Fix Allocation-less launches
Tim Murray [Tue, 12 May 2015 21:29:32 +0000 (21:29 +0000)]
am
a0511081: Merge "Add loop option to hwuitest." into mnc-dev
* commit '
a0511081d037722a89d3d69e7edcd0d0dc6ec965':
Add loop option to hwuitest.
Chris Wren [Tue, 12 May 2015 21:29:15 +0000 (21:29 +0000)]
am
9260cb7f: Merge "count panel open method" into mnc-dev
* commit '
9260cb7ffe0845d229a8cfe948b4ba30fe32127b':
count panel open method
Eric Laurent [Tue, 12 May 2015 21:28:56 +0000 (21:28 +0000)]
am
b65cd17b: Merge "Implement audio routing callbacks" into mnc-dev
* commit '
b65cd17b0508a5a7afdd92e69437825071a1631b':
Implement audio routing callbacks
Alex Klyubin [Tue, 12 May 2015 21:28:33 +0000 (21:28 +0000)]
am
6223ec12: Merge "Keystore uses 0 for invalid operation handles." into mnc-dev
* commit '
6223ec129b256526d8c30920271b2ee3960bcf1f':
Keystore uses 0 for invalid operation handles.