OSDN Git Service
Selim Cinek [Fri, 31 Oct 2014 15:03:42 +0000 (15:03 +0000)]
Merge "Fixed a crash in the Notification expandHelper" into lmp-mr1-dev
Selim Cinek [Fri, 31 Oct 2014 15:03:09 +0000 (15:03 +0000)]
Merge "Fixed a bug when tapping in the empty space of the notification panel" into lmp-mr1-dev
Christoph Studer [Fri, 31 Oct 2014 14:55:29 +0000 (14:55 +0000)]
Merge "SysUI: Never log GONE notifications as visible" into lmp-mr1-dev
Jason Monk [Fri, 31 Oct 2014 14:15:34 +0000 (14:15 +0000)]
Merge "Download PAC when set after a diff PAC URL" into lmp-mr1-dev
Kenny Guy [Fri, 31 Oct 2014 12:47:37 +0000 (12:47 +0000)]
Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev
Selim Cinek [Tue, 28 Oct 2014 14:20:34 +0000 (15:20 +0100)]
Fixed a crash in the Notification expandHelper
Bug:
18004384
Change-Id: I3b8e60041c527689722591962f384ea91f4a954a
Selim Cinek [Tue, 28 Oct 2014 13:21:10 +0000 (14:21 +0100)]
Fixed a bug when tapping in the empty space of the notification panel
This happens often when tapping in the dismissView area.
Also fixed a bug where the decor views and the speedbump where swipable.
Bug:
18031244
Change-Id: I2c9685e068420c21032affb3aa58f7d53183ff52
Kenny Guy [Fri, 31 Oct 2014 11:23:12 +0000 (11:23 +0000)]
Tidy up unused hidden methods in LauncherApps
Bug:
17483329
Change-Id: Ic4fbb180bafaa4d2c5ba332fe228c3d9baf4761c
Sander Alewijnse [Fri, 31 Oct 2014 10:05:34 +0000 (10:05 +0000)]
Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
Tyler Gunn [Fri, 31 Oct 2014 03:16:07 +0000 (03:16 +0000)]
Merge "Creating connections for conference event package participants." into lmp-mr1-dev
Yohei Yukawa [Fri, 31 Oct 2014 03:09:04 +0000 (03:09 +0000)]
Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 23:15:11 +0000 (23:15 +0000)]
Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev
George Mount [Thu, 30 Oct 2014 23:11:52 +0000 (23:11 +0000)]
Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 22:30:20 +0000 (22:30 +0000)]
Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev
Craig Mautner [Thu, 30 Oct 2014 22:12:30 +0000 (22:12 +0000)]
Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
Craig Mautner [Wed, 29 Oct 2014 02:59:59 +0000 (19:59 -0700)]
Add enter-animation-done callback for system windows
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.
The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.
Fixes bug
16661752.
Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
Tyler Gunn [Thu, 30 Oct 2014 21:27:48 +0000 (14:27 -0700)]
Creating connections for conference event package participants.
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.
Bug:
18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
Alan Viverette [Thu, 30 Oct 2014 21:09:18 +0000 (21:09 +0000)]
Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev
Guang Zhu [Thu, 30 Oct 2014 20:56:39 +0000 (20:56 +0000)]
Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 20:51:21 +0000 (13:51 -0700)]
Remove scroll view from correct parent in AlertController
BUG:
18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
Santos Cordon [Thu, 30 Oct 2014 20:01:39 +0000 (20:01 +0000)]
Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev
Santos Cordon [Thu, 30 Oct 2014 19:25:39 +0000 (19:25 +0000)]
Merge "Even more javadocs for telecom." into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 19:22:08 +0000 (12:22 -0700)]
Fix inset check in ThreadedRenderer
BUG:
17729606
Change-Id: I9303a788968b424fd8ca27fe4bb99bab51ec34a7
George Mount [Thu, 30 Oct 2014 18:28:00 +0000 (11:28 -0700)]
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
Bug
18170774
Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
Selim Cinek [Thu, 30 Oct 2014 18:33:13 +0000 (18:33 +0000)]
Merge "Fixed a bug with notification clipping" into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 18:26:29 +0000 (11:26 -0700)]
Only draw AbsListView selector when focused or pressed
BUG:
18176135
Change-Id: Ibd9d9c0f439e5daa8eba606abc5ff055a3d8ff0c
Guang Zhu [Wed, 29 Oct 2014 21:31:48 +0000 (14:31 -0700)]
also add backtraces of CPUs before watchdog kills system server
Bug:
18003452
Change-Id: I052fe0b2948ea036c3f1b842ea6270b6f11eadef
Selim Cinek [Wed, 29 Oct 2014 18:04:19 +0000 (19:04 +0100)]
Fixed a bug with notification clipping
The clip rect was not correctly set for a view which
was fading out leading to some overdraw.
It also fixes a bug where the alpha was not applied when
made invisible.
Bug:
16077953
Change-Id: I4c26aee88c5c87147df31ec7fb413bc63cd2625c
John Spurlock [Thu, 30 Oct 2014 18:12:22 +0000 (18:12 +0000)]
Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev
Hyejin Kim [Mon, 27 Oct 2014 08:17:06 +0000 (17:17 +0900)]
Fix not to show a log with empty default ime
It'll make reboot to show a log with empty defualt ime.
Bug:
18165757
Change-Id: I7a0d55bc0da0566a60abb24123c1dbcdd03be9ed
John Spurlock [Thu, 30 Oct 2014 17:42:05 +0000 (13:42 -0400)]
Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
Bug:
18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
Alan Viverette [Thu, 30 Oct 2014 17:38:39 +0000 (17:38 +0000)]
Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 17:29:03 +0000 (10:29 -0700)]
Ensure we don't pass null values in to Theme.resolveAttributes
BUG:
18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
Ricardo Cervera [Thu, 30 Oct 2014 15:44:55 +0000 (15:44 +0000)]
am
0db81996: am
e0acf536: am
e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
* commit '
0db8199664e9f501c4b2d1f8e404d762f68ae684':
docs: Two-page notification fix.
Ricardo Cervera [Thu, 30 Oct 2014 15:38:35 +0000 (15:38 +0000)]
am
e0acf536: am
e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
* commit '
e0acf536a00cc30ab8420e43321096afba601024':
docs: Two-page notification fix.
Ricardo Cervera [Thu, 30 Oct 2014 15:34:37 +0000 (15:34 +0000)]
am
e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
* commit '
e3dd89a42a48c9ba461a0fff7859b7d0b205d146':
docs: Two-page notification fix.
Ricardo Cervera [Thu, 30 Oct 2014 15:27:31 +0000 (15:27 +0000)]
Merge "docs: Two-page notification fix." into lmp-docs
Sander Alewijnse [Wed, 29 Oct 2014 13:28:49 +0000 (13:28 +0000)]
Change javadoc of setAccountManagementDisabled.
Method can also be called by device owner.
Bug:
18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
Jorim Jaggi [Thu, 30 Oct 2014 14:51:44 +0000 (14:51 +0000)]
Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev
Jorim Jaggi [Tue, 28 Oct 2014 21:47:46 +0000 (22:47 +0100)]
Make status bar expanding more tightly coupled to finger
Improves the "direct modification" feeling a bit.
Bug:
17040206
Change-Id: Ide4bfb36aef584da36e0340bc2ed099e2e24c0ee
Jorim Jaggi [Thu, 30 Oct 2014 14:25:49 +0000 (14:25 +0000)]
Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev
Lorenzo Colitti [Thu, 30 Oct 2014 13:27:56 +0000 (13:27 +0000)]
Merge "Enable 464xlat on wifi." into lmp-mr1-dev
Lorenzo Colitti [Thu, 30 Oct 2014 13:27:53 +0000 (13:27 +0000)]
Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
Lorenzo Colitti [Tue, 28 Oct 2014 06:24:03 +0000 (15:24 +0900)]
Enable 464xlat on wifi.
Bug:
12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec
Lorenzo Colitti [Tue, 28 Oct 2014 06:24:03 +0000 (15:24 +0900)]
Add support for running 464xlat on wifi as well.
1. Add a command to NetworkManagementService to enable/disable
IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
on a wifi network (which means it detected a NAT64), and
correspondingly re-enable offload when the clatd interface
goes down.
This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.
Bug:
12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
Nicolas Prevot [Thu, 30 Oct 2014 10:28:17 +0000 (10:28 +0000)]
Merge "Schedule to write package restrictions." into lmp-mr1-dev
Chris Banes [Thu, 30 Oct 2014 08:42:34 +0000 (08:42 +0000)]
Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev
Dongwon Kang [Mon, 27 Oct 2014 08:55:27 +0000 (17:55 +0900)]
TIF: handle inputs holding the overlay view even after the session release
Bug:
17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
Dongwon Kang [Thu, 30 Oct 2014 04:32:29 +0000 (04:32 +0000)]
Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev
Yigit Boyar [Thu, 30 Oct 2014 02:02:14 +0000 (02:02 +0000)]
Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 00:52:16 +0000 (00:52 +0000)]
Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 00:41:42 +0000 (00:41 +0000)]
Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
Dongwon Kang [Wed, 29 Oct 2014 05:39:27 +0000 (14:39 +0900)]
TIF: Handle notifyXXX() calls requested before the session initialization
Previously, we relied on a handler by posting runnables when the
session is not initialized yet. However, this trick was broken when we
separated the creation procedure into DO_CREATE_SESSION and
DO_NOTIFY_SESSION_CREATED.
Bug:
17909798
Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec
Alan Viverette [Thu, 30 Oct 2014 00:26:37 +0000 (17:26 -0700)]
Ensure ImageView.setImageResource() always resolves Drawable
Fixes no-op on method call after configuration change at the expense
of removing a micro-optimization that wasn't really needed.
BUG:
18178233
Change-Id: I36eccf91b138e4bed34be96d9b87200edeb66938
Alan Viverette [Thu, 30 Oct 2014 00:24:27 +0000 (00:24 +0000)]
Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev
Alan Viverette [Thu, 30 Oct 2014 00:18:31 +0000 (00:18 +0000)]
Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
Alan Viverette [Wed, 29 Oct 2014 22:46:06 +0000 (15:46 -0700)]
Show scroll indicators in AlertDialog
BUG:
16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd
Alan Viverette [Thu, 30 Oct 2014 00:09:36 +0000 (17:09 -0700)]
Distinguish unspecified and explicit null values in resources
BUG:
17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
kmccormick [Wed, 29 Oct 2014 23:49:03 +0000 (23:49 +0000)]
am
4d9872e6: am
1649712f: am
13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
* commit '
4d9872e6ecc221d3c8bbd66b8efee819d12dbb90':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:48:53 +0000 (23:48 +0000)]
am
63ee1976: am
2b20b9d2: am
3e92c4a2: am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
63ee197682bf7cf831950087028b2a81902f92c9':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:26:18 +0000 (23:26 +0000)]
am
1649712f: am
13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
* commit '
1649712f8745f6b62e453b8b4a230374308732ce':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:20:34 +0000 (23:20 +0000)]
am
13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
* commit '
13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:19:46 +0000 (23:19 +0000)]
am
2b20b9d2: am
3e92c4a2: am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:12:52 +0000 (23:12 +0000)]
am
3e92c4a2: am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.
Adam Lesinski [Wed, 29 Oct 2014 23:11:52 +0000 (23:11 +0000)]
Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev
kmccormick [Wed, 29 Oct 2014 23:09:23 +0000 (23:09 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
Doc update: deliv receipt, rate exceeded, bug fixes.
Wale Ogunwale [Wed, 29 Oct 2014 23:08:20 +0000 (23:08 +0000)]
Merge "Fix issue
6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev
Eric Laurent [Wed, 29 Oct 2014 23:07:31 +0000 (23:07 +0000)]
Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev
kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
Fix for:
b/
17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
kmccormick [Wed, 29 Oct 2014 23:04:28 +0000 (23:04 +0000)]
Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
Santos Cordon [Wed, 29 Oct 2014 17:38:40 +0000 (10:38 -0700)]
Even more javadocs for telecom.
Bug:
18142177
Change-Id: I4eefe422ec66bb9e14fd8a3b1ee2cb24fedbff51
Eric Laurent [Wed, 29 Oct 2014 22:52:43 +0000 (15:52 -0700)]
SoundTrigger JNI: fix local reference leak.
Bug:
17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53
kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]
Doc update: deliv receipt, rate exceeded, bug fixes.
Fix for:
b/
17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
Alan Viverette [Wed, 29 Oct 2014 22:20:17 +0000 (22:20 +0000)]
Merge "Update drawable state after updating tint list" into lmp-mr1-dev
Svetoslav [Wed, 29 Oct 2014 22:17:56 +0000 (22:17 +0000)]
Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev
Alan Viverette [Wed, 29 Oct 2014 22:05:09 +0000 (22:05 +0000)]
Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
Alan Viverette [Wed, 29 Oct 2014 22:05:04 +0000 (22:05 +0000)]
Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev
Alan Viverette [Wed, 29 Oct 2014 22:05:00 +0000 (22:05 +0000)]
Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev
Dianne Hackborn [Wed, 29 Oct 2014 21:55:49 +0000 (21:55 +0000)]
Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
Tom Taylor [Wed, 29 Oct 2014 21:55:32 +0000 (21:55 +0000)]
Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev
Jeff Hao [Wed, 29 Oct 2014 21:47:29 +0000 (21:47 +0000)]
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
Jeff Hao [Wed, 29 Oct 2014 01:51:07 +0000 (18:51 -0700)]
Change boot screen title to "Android is starting" when not upgrading.
Bug:
17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
Tyler Gunn [Wed, 29 Oct 2014 21:32:52 +0000 (21:32 +0000)]
Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
Tom Taylor [Wed, 29 Oct 2014 21:30:37 +0000 (14:30 -0700)]
Add a missing mms_config constant to SmsManager
Bug
18079788
Change-Id: Ifb2040fb8f9e2a7390da74161539afcf3d6b03af
Alan Viverette [Wed, 29 Oct 2014 21:27:47 +0000 (14:27 -0700)]
Add setters for window elevation and clipToOutline properties
These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.
BUG:
16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69
Ricardo Cervera [Wed, 29 Oct 2014 21:27:22 +0000 (14:27 -0700)]
docs: Two-page notification fix.
Bug:
18108228
Change-Id: I96863766dc3b787af92e8bf71615eee56afbbca9
Alan Viverette [Wed, 29 Oct 2014 21:14:55 +0000 (21:14 +0000)]
Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
Santos Cordon [Tue, 28 Oct 2014 20:10:36 +0000 (13:10 -0700)]
More updates to javadocs for Telecom APIs.
Change-Id: I8f8389f521c0d654c9bfdc3ad9670be0d118f480
Vladimir Marko [Wed, 29 Oct 2014 21:12:07 +0000 (21:12 +0000)]
Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
Svetoslav [Wed, 29 Oct 2014 20:49:00 +0000 (13:49 -0700)]
Print preview disappearing if printer is changed.
This is a regression caused by my previous patch.
Change-Id: I80a0b4d880fd4e48e6a44fac303a4c8204e8ec0d
Chris Wren [Wed, 29 Oct 2014 20:43:26 +0000 (16:43 -0400)]
fix build break from mis-named DEBUG flag in SystemUI
Change-Id: I55459fe090ae4c159ebdad8b60658b25db29271e
Vladimir Marko [Wed, 29 Oct 2014 20:34:15 +0000 (20:34 +0000)]
Fix android_media_AudioSystem_getMasterMute return type.
Caused FPU stack overflow on x86.
Bug:
18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192
Chris Wren [Wed, 29 Oct 2014 19:54:51 +0000 (19:54 +0000)]
Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev
Alan Viverette [Tue, 28 Oct 2014 21:41:36 +0000 (14:41 -0700)]
Update drawable state after updating tint list
BUG:
18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
Andre Eisenbach [Wed, 29 Oct 2014 19:35:17 +0000 (19:35 +0000)]
Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev
Andre Eisenbach [Wed, 29 Oct 2014 19:13:38 +0000 (12:13 -0700)]
Fix crash during Bluetooth on/off stress test
Bug:
18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
David Friedman [Wed, 29 Oct 2014 18:52:29 +0000 (18:52 +0000)]
am
51209aa3: am
43582423: am
0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
* commit '
51209aa38ee9895c639fbbb6f469f926f3c66b7f':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
Deepanshu Gupta [Wed, 29 Oct 2014 18:52:21 +0000 (18:52 +0000)]
am
03b100e1: am
617e8097: Add missing delegate for AnimatorInflater.
* commit '
03b100e11dad5bef34e71ccfd45b6c7adc9bfee4':
Add missing delegate for AnimatorInflater.
Geoff Mendal [Wed, 29 Oct 2014 18:52:13 +0000 (18:52 +0000)]
am
39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
39ae5dd786aff204888457a648ed291926e33334':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Oct 2014 18:52:00 +0000 (18:52 +0000)]
am
c88fbd3c: (-s ours) Import translations. DO NOT MERGE
* commit '
c88fbd3cce87f67aad17c636b9e23b4e29afac6a':
Import translations. DO NOT MERGE