OSDN Git Service
George Mount [Thu, 25 Jun 2015 20:55:33 +0000 (20:55 +0000)]
Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 20:00:54 +0000 (20:00 +0000)]
Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 20:00:03 +0000 (13:00 -0700)]
Constrain ListPopupWindow hint width spec to >= 0
Bug:
22092169
Change-Id: Ia05302cf8d167aae26eccbf53dd3fd21d09b326d
Alan Viverette [Thu, 25 Jun 2015 19:57:01 +0000 (19:57 +0000)]
Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev
Yohei Yukawa [Thu, 25 Jun 2015 19:39:31 +0000 (19:39 +0000)]
Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 19:24:27 +0000 (12:24 -0700)]
Constrain child width and height to >= 0 in FrameLayout.onMeasure()
Bug:
22093669
Change-Id: I55e8a0289f871b73ed07f3d73e8297786f9acac1
Svetoslav [Thu, 25 Jun 2015 18:53:57 +0000 (18:53 +0000)]
Merge "Add missing conditional in settings provider" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 18:53:02 +0000 (11:53 -0700)]
Add missing conditional in settings provider
Change-Id: I717e8b87eccbedf1a1abead77e7856a2aa2405fa
Selim Cinek [Thu, 25 Jun 2015 18:37:54 +0000 (18:37 +0000)]
Merge "Fixed a HUN crash with notification children" into mnc-dev
Chris Wren [Thu, 25 Jun 2015 18:21:01 +0000 (18:21 +0000)]
Merge "add banned packages to notification dumpsys" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 18:20:14 +0000 (18:20 +0000)]
Merge "Prevent certain actions of app has revoked permissions" into mnc-dev
Jun Mukai [Thu, 25 Jun 2015 18:16:55 +0000 (18:16 +0000)]
Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev
Chris Wren [Thu, 25 Jun 2015 18:04:33 +0000 (14:04 -0400)]
add banned packages to notification dumpsys
Bug:
20451514
Change-Id: I4ae3adfc8dcd7e7625ca41950e5642c30b8cb25e
Svetoslav [Thu, 25 Jun 2015 01:47:07 +0000 (18:47 -0700)]
Prevent certain actions of app has revoked permissions
bug:
21808294
Change-Id: I7214c1fe47c15fe185423a54a74b58caf8d82daa
Selim Gurun [Thu, 25 Jun 2015 17:53:49 +0000 (17:53 +0000)]
Merge "Remove Webviewtests in frameworks" into mnc-dev
Selim Gurun [Thu, 25 Jun 2015 17:35:51 +0000 (10:35 -0700)]
Remove Webviewtests in frameworks
Bug:
22090564
These tests were not touched for at least 3 years, and with webview
moving to chromium, they are tested at the chromium side.
Change-Id: I4424871dd97c5dc23bb3dbdcee0915d5ab893c7e
Chris Manton [Thu, 25 Jun 2015 17:42:16 +0000 (17:42 +0000)]
Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev
Yusuke Sato [Thu, 25 Jun 2015 17:33:59 +0000 (17:33 +0000)]
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev
Nancy Chen [Thu, 25 Jun 2015 17:32:22 +0000 (17:32 +0000)]
Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev
Winson Chung [Thu, 25 Jun 2015 17:24:53 +0000 (17:24 +0000)]
Merge "Refactoring recents search bar widget logic." into mnc-dev
Chris Manton [Wed, 24 Jun 2015 23:47:49 +0000 (16:47 -0700)]
Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL
Bug:
20828356
Change-Id: I30a286e7af884a11c51363916dd6a4dc965d399a
Alan Viverette [Thu, 25 Jun 2015 17:08:41 +0000 (17:08 +0000)]
Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 16:57:30 +0000 (09:57 -0700)]
Constrain width and height to >= 0 in FastScroller layout
Bug:
22071990
Change-Id: I9dcb2066ee069a3764b7d711cb341a4dfdc4445e
Alex Klyubin [Thu, 25 Jun 2015 16:46:15 +0000 (16:46 +0000)]
Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev
Alex Klyubin [Thu, 25 Jun 2015 16:04:37 +0000 (09:04 -0700)]
Support RSA encrypt using private key and PKCS#1 paddding.
Some apps such as OpenVPN Connect for some reason generate
PKCS#1-padded RSA signatures using Cipher (initialized in
Cipher.ENCRYPT_MODE with private key!) instead of using Signature.
Unfortunately, RI supports this strange behavior and previous releases
of Android Keystore did the same. So, we have to continue supporting
this craziness.
Bug:
22083023
Change-Id: Ife3950d0d4ceb4e44e08014635312c1252878b69
Mady Mellor [Thu, 25 Jun 2015 15:53:59 +0000 (15:53 +0000)]
Merge "Fix: Don't display the drag handles when focus is lost" into mnc-dev
Andrei Stingaceanu [Thu, 25 Jun 2015 15:52:48 +0000 (15:52 +0000)]
Merge "EditText - can not drag handles in extracted mode" into mnc-dev
Andres Morales [Thu, 25 Jun 2015 15:43:11 +0000 (15:43 +0000)]
Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev
Mady Mellor [Thu, 25 Jun 2015 15:40:27 +0000 (08:40 -0700)]
Fix: Don't display the drag handles when focus is lost
The text selection handles should be hidden / shown when the window
loses / regains focus.
Additionally renames method to make more sense.
Bug:
22062480
Change-Id: I6e160234cf112ee285367637e2f1c14defd82e89
Alex Klyubin [Thu, 25 Jun 2015 15:07:27 +0000 (15:07 +0000)]
Merge "Use standard copyright banner in android/security/key" into mnc-dev
Alex Klyubin [Thu, 25 Jun 2015 15:06:47 +0000 (15:06 +0000)]
Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev
Selim Cinek [Thu, 25 Jun 2015 15:04:20 +0000 (11:04 -0400)]
Fixed a HUN crash with notification children
Notification children were not properly handled
before when added lead to a crash.
This will fix this bug finally.
Bug:
21868047
Change-Id: I92f2f7e71659de8274711a448e370084d423ca9f
Jason Monk [Thu, 25 Jun 2015 14:05:19 +0000 (14:05 +0000)]
Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev
Andrei Stingaceanu [Wed, 24 Jun 2015 10:56:43 +0000 (11:56 +0100)]
EditText - can not drag handles in extracted mode
In TextView's onPreDraw method, startSelectionActionMode()
is called, but the selection has already been started so
in startSelectionActionMode() it shows the
insertionController which hides the selectionController.
Fix this by adding a check to start the action mode only
if it is not already started.
Bug:
22028858
Change-Id: I2999423155b7a63a7d879bc8ea5032e17dff459f
Igor Viarheichyk [Fri, 15 May 2015 01:47:00 +0000 (18:47 -0700)]
ICU format support for pseudolocalizes.
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.
(cherry picked from commit
cbb1e676b56677ae3585c067f29646dddffb4857)
bug:
22060509
Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
Erik Kline [Thu, 25 Jun 2015 03:46:33 +0000 (03:46 +0000)]
Merge "Don't lose critical success/failure messages" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 02:14:53 +0000 (02:14 +0000)]
Merge "iUpdate the sensor group description" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 02:12:28 +0000 (19:12 -0700)]
iUpdate the sensor group description
bug:
21784262
Change-Id: I417e2170b8a977b274ca0f6b2364c670bbb5264a
Winson Chung [Thu, 4 Jun 2015 00:31:39 +0000 (17:31 -0700)]
Refactoring recents search bar widget logic.
Bug:
19062975
Change-Id: I303710598675aeebca8f34ac57de6249462ec033
Anthony Hugh [Thu, 25 Jun 2015 01:37:28 +0000 (01:37 +0000)]
am
a50fa710: (-s ours) am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
a50fa71044f759013dc506ae3dc5fce11e67494e':
DO NOT MERGE: Introduce stem keycodes for Wear
Alex Klyubin [Thu, 25 Jun 2015 01:31:17 +0000 (01:31 +0000)]
Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev
Jun Mukai [Thu, 25 Jun 2015 01:31:06 +0000 (18:31 -0700)]
Apply thumbTint and trackTint styles to Switch from xml.
Bug:
21664957
Change-Id: Id08ae89fb1586968df4b901816a8e108bb8570af
Andreas Gampe [Thu, 25 Jun 2015 01:29:36 +0000 (01:29 +0000)]
Merge "Frameworks/base: Add tracing system properties" into mnc-dev
Anthony Hugh [Thu, 25 Jun 2015 01:27:41 +0000 (01:27 +0000)]
am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
001df9ca900f3098222a4920a0048d2eb947bd4e':
DO NOT MERGE: Introduce stem keycodes for Wear
Dave Langemak [Thu, 25 Jun 2015 01:17:57 +0000 (01:17 +0000)]
Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev
Dave Langemak [Thu, 25 Jun 2015 01:14:26 +0000 (01:14 +0000)]
Revert "Throw IAE on invalid measure spec size"
This reverts commit
ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7.
Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
Amith Yamasani [Thu, 25 Jun 2015 00:24:18 +0000 (00:24 +0000)]
Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:09:05 +0000 (00:09 +0000)]
Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
Adam Powell [Thu, 25 Jun 2015 00:08:52 +0000 (00:08 +0000)]
Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:03:48 +0000 (17:03 -0700)]
Avoid negative childSpecSize in RelativeLayout
Bug:
22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
ztenghui [Wed, 24 Jun 2015 23:32:16 +0000 (23:32 +0000)]
Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
Alan Viverette [Wed, 24 Jun 2015 23:15:14 +0000 (23:15 +0000)]
Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
Anthony Hugh [Tue, 23 Jun 2015 17:44:17 +0000 (10:44 -0700)]
DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG:
21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
Junda Liu [Wed, 24 Jun 2015 21:41:14 +0000 (14:41 -0700)]
Rename and add carrier config keys for volte and ims.
Bug: b/
21878236
Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
Alex Klyubin [Wed, 24 Jun 2015 23:06:55 +0000 (16:06 -0700)]
Use standard copyright banner in android/security/key
Bug:
18088752
Change-Id: I22eec18130cc46222d50481164069e7714154979
Tim Murray [Wed, 24 Jun 2015 22:59:51 +0000 (22:59 +0000)]
Merge "add cpuset support" into mnc-dev
Alex Klyubin [Wed, 24 Jun 2015 22:46:45 +0000 (15:46 -0700)]
Track rename of INT and LONG Keymaster tag types.
Bug:
22008538
Change-Id: Id0091e59738c828a96305edbfc4f3958e712278b
Amith Yamasani [Wed, 24 Jun 2015 22:46:09 +0000 (15:46 -0700)]
No need to check WRITE_SETTINGS permission in ContentProvider
Permission checks are enforced within the SettingsProvider specifically
for SECURE/SYSTEM/GLOBAL. Now WRITE_SETTINGS is runtime, so it shouldn't
apply to all the settings types.
Bug:
22044704
Change-Id: I9ed25d96b2fa4f46d3d049efa4300cd1d37bbd24
Alex Klyubin [Wed, 24 Jun 2015 19:25:52 +0000 (12:25 -0700)]
Make NONEwithECDSA truncate input when necessary.
Keymaster's implementation of ECDSA with digest NONE rejects input
longer than group size in bytes. RI's NONEwithECDSA accepts inputs
of arbitrary length by truncating them to the above size. This CL
makes Android Keystore's NONEwithECDSA do the truncation to keep
the JCA and Keymaster happy.
The change is inside AndroidKeyStoreECDSASignatureSpi$NONE. All other
small modifications are for supporting that change by making it
possible for AndroidKeyStoreSignatureSpiBase to pass in the signature
being verified into KeyStoreCryptoOperationStreamer. This in turn is
needed to make it possible for NONEwithECDSA implementation to provide
a wrapper streamer which truncates input.
Bug:
22030217
Change-Id: I26064f6df37ef8c631d70a36a356aa0b76a9ad29
Selim Cinek [Wed, 24 Jun 2015 22:19:57 +0000 (22:19 +0000)]
Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev
Selim Cinek [Wed, 24 Jun 2015 22:19:37 +0000 (22:19 +0000)]
Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
Chris Wren [Wed, 24 Jun 2015 22:17:39 +0000 (22:17 +0000)]
Merge "remove setLatestEventInfo" into mnc-dev
ztenghui [Wed, 24 Jun 2015 20:23:40 +0000 (13:23 -0700)]
Resize the VectorDrawable according to the virtual Dpi
b/
21928507
Change-Id: I9e596192a0fdf13fc91481f990a345c3b267f225
Joe Fernandez [Wed, 24 Jun 2015 21:52:49 +0000 (21:52 +0000)]
am
1ee8470c: am
3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '
1ee8470ca399362424544e763dcb67e515590b10':
docs: Update Android support page
Alan Viverette [Wed, 24 Jun 2015 21:42:44 +0000 (14:42 -0700)]
Update local state when creating LayerDrawable from constant state
Also clears DrawableContainer's futures list when it's no longer needed,
correctly sets deep copy of state set in StateListDrawable, makes some
private methods into package-protected to avoid thunk, and propagates
state to StateListDrawable's super class so that getState() has correct
information.
Bug:
21840003
Change-Id: I0d4232807f280d663c03b4a80e4aab8626806440
Joe Fernandez [Wed, 24 Jun 2015 21:38:28 +0000 (21:38 +0000)]
am
3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '
3eefa1f9de9e6466251373074f3c720936b62a8c':
docs: Update Android support page
Adam Lesinski [Wed, 24 Jun 2015 21:32:36 +0000 (21:32 +0000)]
Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev
Joe Fernandez [Wed, 24 Jun 2015 21:30:02 +0000 (21:30 +0000)]
Merge "docs: Update Android support page" into mnc-preview-docs
ztenghui [Wed, 24 Jun 2015 21:27:14 +0000 (21:27 +0000)]
Merge "Update the internal test case to show the strokeWidth can scale now" into mnc-dev
Joe Fernandez [Wed, 24 Jun 2015 20:48:26 +0000 (13:48 -0700)]
docs: Update Android support page
- remove Helpouts
- remove Merchant issue reporting link
- remove other dead links
- clean up page code
b\
18579472
b\
19355066
Change-Id: If55aa57b11604bdd328c55e26ad5bd4ba0b32de7
Winson Chung [Wed, 24 Jun 2015 21:21:23 +0000 (21:21 +0000)]
Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev
Raph Levien [Wed, 24 Jun 2015 21:12:33 +0000 (21:12 +0000)]
Merge "Make measureText(String, int, int) not use context" into mnc-dev
Winson Chung [Tue, 23 Jun 2015 18:52:04 +0000 (11:52 -0700)]
Catching launch errors when trying to go Home while Home is updating.
Bug:
21442898
Change-Id: I7fc74422b220cb02acb195b5c9121ff72bc16dbe
ztenghui [Wed, 24 Jun 2015 21:06:53 +0000 (14:06 -0700)]
Update the internal test case to show the strokeWidth can scale now
Change-Id: I16b0a232eb4108aedc9289e51a52ec9472b9dfd0
Raph Levien [Wed, 24 Jun 2015 16:36:31 +0000 (09:36 -0700)]
Make measureText(String, int, int) not use context
The measureText method when applied to a string should just measure
the substring, rather than treat the entire string as context. It was
less likely to cause problems than the similar issues with char
arrays, but still wrong. This patch makes the behavior consistent.
Bug:
20087437
Change-Id: I1c6e07a694b151f4fb097edae8e271805e996d06
Adam Powell [Wed, 24 Jun 2015 20:54:10 +0000 (13:54 -0700)]
Fix ChooserActivity check for still-alive ChooserTargets
Only prune ChooserTargets if the resolved activity source they came
from is still present after refreshing the list. Compare this directly
against the ComponentName rather than ResolveInfo.equals, as the
latter isn't implemented.
Bug
21953672
Change-Id: I6486bda85c19d7371167affe2a2b80a2668bd734
Adam Lesinski [Wed, 24 Jun 2015 20:24:35 +0000 (13:24 -0700)]
Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
Bug:
22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
Christopher Tate [Wed, 24 Jun 2015 20:35:17 +0000 (20:35 +0000)]
Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev
Andrew Solovay [Wed, 24 Jun 2015 20:27:51 +0000 (20:27 +0000)]
am
f5222156: am
00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
* commit '
f522215653bef1dc6bc5a140d6e1cb0cd2db7824':
docs: Added "Single Use Devices" video to Android for Work main page
Christopher Tate [Wed, 24 Jun 2015 02:23:46 +0000 (19:23 -0700)]
Require that verified intent filters only have http/https <data> decls
It is malformed to write a single intent filter like this:
<intent-filter android:autoVerify="true">
<data android:host="foo.example"
android:path="/"
android:scheme="http" />
<data android:host="*"
android:path="/custom"
android:scheme="fooexamplecustomscheme" />
</intent-filter>
In practice this app is accidentally defining a filter that will match
"http://*". This is now detected, and will never be auto-verified for
any of the mentioned domains.
Verified intent filters must *only* handle the http & https schemes.
Bug
21920537
Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
Andrew Solovay [Wed, 24 Jun 2015 20:15:17 +0000 (20:15 +0000)]
am
00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
* commit '
00ebd145d1572e0d12403ed0194d540926996f0e':
docs: Added "Single Use Devices" video to Android for Work main page
Alex Klyubin [Wed, 24 Jun 2015 20:03:08 +0000 (20:03 +0000)]
Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev
Tony Mantler [Wed, 24 Jun 2015 19:48:32 +0000 (19:48 +0000)]
Merge "Notify on BAD_REMOVAL and pass fsUuid in broadcast" into mnc-dev
Christopher Tate [Wed, 24 Jun 2015 19:45:27 +0000 (19:45 +0000)]
Merge "Fix NPE when walking the set of packages to update app link policy" into mnc-dev
Makoto Onuki [Wed, 24 Jun 2015 19:25:26 +0000 (19:25 +0000)]
Merge "Actually wait for installd" into mnc-dev
Christopher Tate [Wed, 24 Jun 2015 19:18:05 +0000 (12:18 -0700)]
Fix NPE when walking the set of packages to update app link policy
Bug
21851441
Change-Id: I3616c5a7e40f5ff9ad9bbfee579a4a2fb2b1f7fd
Chris Wren [Wed, 24 Jun 2015 19:18:34 +0000 (15:18 -0400)]
remove setLatestEventInfo
This has been deprecated since API 11.
Bug:
18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
Andrew Solovay [Wed, 24 Jun 2015 18:56:56 +0000 (11:56 -0700)]
docs: Added "Single Use Devices" video to Android for Work main page
See first comment for doc stage location.
Change-Id: I0b64f8462eebc5d11c7972fd49147fdd1d6cdd3a
John Spurlock [Wed, 24 Jun 2015 18:46:51 +0000 (18:46 +0000)]
Merge "Volume Motion: Initial show and expand transition." into mnc-dev
Adam Lesinski [Wed, 24 Jun 2015 18:45:44 +0000 (18:45 +0000)]
Merge "Fix unit issue in Slog.wtf output" into mnc-dev
Tony Mantler [Wed, 24 Jun 2015 18:45:25 +0000 (11:45 -0700)]
Notify on BAD_REMOVAL and pass fsUuid in broadcast
b/
21328721
Change-Id: I6d2fd18468bcde72e4c050b975fd7286716fbc50
Adam Lesinski [Wed, 24 Jun 2015 18:37:26 +0000 (11:37 -0700)]
Fix unit issue in Slog.wtf output
Bug:
22063930
Change-Id: I02add66892eb32b1df7e845b8542beb928d2b3ca
Alan Viverette [Wed, 24 Jun 2015 18:22:31 +0000 (18:22 +0000)]
Merge "Constrain FastScroller max width to be >= 0" into mnc-dev
Todd Volkert [Wed, 24 Jun 2015 18:10:37 +0000 (11:10 -0700)]
Remove unused PermissionsInfo class
b/
22008424
Change-Id: I53fc04af89c89cc1726dd80b05f2e18d5cc53524
John Spurlock [Wed, 17 Jun 2015 15:56:12 +0000 (11:56 -0400)]
Volume Motion: Initial show and expand transition.
Also re-enable the content collapse layout transition animations,
supported by ensuring the dialog window is tall enough for long
enough to complete the transition, avoiding clipping.
Bug:
21335976
Change-Id: Ibc4cbb1e882c1e11c4406463752afa177fb1e6d7
Chris Craik [Wed, 24 Jun 2015 17:57:59 +0000 (17:57 +0000)]
Merge "Avoid over-damaging layer area for multidraws" into mnc-dev
Chris Wren [Wed, 24 Jun 2015 17:54:21 +0000 (17:54 +0000)]
Merge "don't clear notification effects in response to peeks" into mnc-dev
Geoff Mendal [Wed, 24 Jun 2015 17:48:31 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Nancy Chen [Wed, 24 Jun 2015 17:37:16 +0000 (17:37 +0000)]
Merge "Add public action to open voicemail settings." into mnc-dev
Santos Cordon [Wed, 24 Jun 2015 17:37:06 +0000 (17:37 +0000)]
Merge "InCallService meta-data [2/4]" into mnc-dev