OSDN Git Service
satok [Wed, 26 Oct 2011 20:18:19 +0000 (20:18 +0000)]
am
6f444425: Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
* commit '
6f444425fe1bb62e12973c5df6a3161bc2aa2ce7':
Make FLAG_AUTO_CORRECTION public
satok [Wed, 26 Oct 2011 20:14:36 +0000 (13:14 -0700)]
Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1
Mathias Agopian [Wed, 26 Oct 2011 19:51:44 +0000 (12:51 -0700)]
Merge "Rename SensorChannel to BitTube"
Eric Fischer [Wed, 26 Oct 2011 18:36:40 +0000 (18:36 +0000)]
am
08d0f642: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
08d0f6420ac439265e9b4086c931173b44409c51':
Import revised translations. DO NOT MERGE
Svetoslav Ganov [Wed, 26 Oct 2011 18:34:25 +0000 (18:34 +0000)]
am
1a3ad7d1: Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
* commit '
1a3ad7d18f0e15611268347da7f1b5db8c3b558d':
Adding accessibility support to the tablet swipe unlock.
Eric Fischer [Wed, 26 Oct 2011 18:32:07 +0000 (11:32 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Svetoslav Ganov [Wed, 26 Oct 2011 18:30:06 +0000 (11:30 -0700)]
Merge "Adding accessibility support to the tablet swipe unlock." into ics-mr1
Philip Milne [Wed, 26 Oct 2011 17:18:30 +0000 (10:18 -0700)]
Merge " Update to fix for bug
5393156"
Irfan Sheriff [Wed, 26 Oct 2011 16:49:33 +0000 (09:49 -0700)]
Merge "Switch to notifications for walled garden"
Bart Sears [Wed, 26 Oct 2011 14:25:27 +0000 (14:25 +0000)]
am
6e03b220: am
d887377a: Merge "Fix power key handling after volume change. Bug:
5497716" into ics-mr0
* commit '
6e03b22015bd834da1a5755e75d7468e5b3b13c5':
Fix power key handling after volume change. Bug:
5497716
Dianne Hackborn [Wed, 26 Oct 2011 14:25:25 +0000 (14:25 +0000)]
am
c6592d2e: am
67a1b7d6: Merge "Fix issue #
5508024: Rotation jank seen in live wallpapers" into ics-mr0
* commit '
c6592d2eb808befedc3d9c842b61e21cc6bedbf3':
Fix issue #
5508024: Rotation jank seen in live wallpapers
Justin Ho [Wed, 26 Oct 2011 14:25:24 +0000 (14:25 +0000)]
am
7acd70f1: am
1f182af9: Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299" into ics-mr0
* commit '
7acd70f180d15e6da80d137d7cf0730e11dbd472':
Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299
Ed Heyl [Wed, 26 Oct 2011 14:25:23 +0000 (14:25 +0000)]
am
e49cf107: (-s ours) merge ics-mr0
* commit '
e49cf107e2533b7ca71c500bc20a0f6dcdf9efdc':
Updated Roboto font Bugs:
5462847,
5497556,
5502610
Always use fresh NTP time for GPS
Reset cached light sensor values when toggling auto-brightness mode
Revert "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled."
Fix
5479823: black patch was showing before resuming call
Add Q3 2011 ADL slides to docs/shareables/adl
satok [Wed, 26 Oct 2011 14:23:04 +0000 (14:23 +0000)]
am
1bfe6e95: Merge "Fix a bug where surface crashes when the enter animation starts while the exit animation has not yet finished" into ics-mr1
* commit '
1bfe6e95a175b45ee68921e3ffe2571b222864bf':
Fix a bug where surface crashes when the enter animation starts while the exit animation has not yet finished
Bart Sears [Wed, 26 Oct 2011 12:22:44 +0000 (12:22 +0000)]
am
d887377a: Merge "Fix power key handling after volume change. Bug:
5497716" into ics-mr0
* commit '
d887377aa84f0d422cf605dad981f8dc53c0f99f':
Fix power key handling after volume change. Bug:
5497716
Dianne Hackborn [Wed, 26 Oct 2011 12:22:31 +0000 (12:22 +0000)]
am
67a1b7d6: Merge "Fix issue #
5508024: Rotation jank seen in live wallpapers" into ics-mr0
* commit '
67a1b7d6e5857d0ecdd1aa9d50d10189e5776c11':
Fix issue #
5508024: Rotation jank seen in live wallpapers
Justin Ho [Wed, 26 Oct 2011 11:47:08 +0000 (11:47 +0000)]
am
1f182af9: Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299" into ics-mr0
* commit '
1f182af915164b72582e7ee669f125f7553857ac':
Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)]
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug:
5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
Bart Sears [Wed, 26 Oct 2011 07:08:59 +0000 (00:08 -0700)]
Merge "Fix power key handling after volume change. Bug:
5497716" into ics-mr0
Peter Ng [Tue, 25 Oct 2011 23:33:24 +0000 (16:33 -0700)]
Merge "Convert the outer lockscreen ring to a shape drawable."
Gilles Debunne [Tue, 25 Oct 2011 22:54:51 +0000 (15:54 -0700)]
Merge "Text handles do not handle scroll correctly"
Dianne Hackborn [Tue, 25 Oct 2011 22:25:21 +0000 (15:25 -0700)]
Merge "Fix issue #
5508024: Rotation jank seen in live wallpapers" into ics-mr0
Justin Ho [Tue, 25 Oct 2011 21:28:29 +0000 (14:28 -0700)]
Merge "Update Prime keyboard feedback sounds Tune notification sound Hojus Bug:
5416299" into ics-mr0
Ed Heyl [Tue, 25 Oct 2011 20:47:51 +0000 (20:47 +0000)]
merge ics-mr0
Change-Id: I4f0b2bb1b1136c9467e9d55f57f5333153cae65d
Eric Fischer [Tue, 25 Oct 2011 18:42:28 +0000 (11:42 -0700)]
Merge "Import revised translations."
satok [Tue, 25 Oct 2011 17:48:23 +0000 (10:48 -0700)]
Merge "Fix a bug where surface crashes when the enter animation starts while the exit animation has not yet finished" into ics-mr1
Steve Block [Wed, 12 Oct 2011 16:27:03 +0000 (17:27 +0100)]
Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/141576
Bug:
5449033
Change-Id: I42575e7c29cf1c0f465c357a5c97ab118df6f473
Mike Lockwood [Tue, 25 Oct 2011 14:02:52 +0000 (07:02 -0700)]
Merge "Reset cached light sensor values when toggling auto-brightness mode" into ics-mr0
Mike Lockwood [Tue, 25 Oct 2011 14:02:45 +0000 (07:02 -0700)]
Merge "Revert "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled."" into ics-mr0
Roman Nurik [Tue, 25 Oct 2011 13:55:59 +0000 (06:55 -0700)]
Merge "Add Q3 2011 ADL slides to docs/shareables/adl" into ics-mr0
Mike Lockwood [Tue, 25 Oct 2011 13:51:28 +0000 (06:51 -0700)]
Merge "Always use fresh NTP time for GPS" into ics-mr0
Brian Colonna [Tue, 25 Oct 2011 12:43:37 +0000 (05:43 -0700)]
Merge "Fix
5479823: black patch was showing before resuming call" into ics-mr0
Fred Quintana [Tue, 25 Oct 2011 03:39:44 +0000 (20:39 -0700)]
am
763480fb: Merge "Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable." into ics-mr0
* commit '
763480fbcabedfc2f425484ed74bc1e2e1392176':
Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable.
Fred Quintana [Tue, 25 Oct 2011 03:36:30 +0000 (20:36 -0700)]
Merge "Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable." into ics-mr0
The Android Open Source Project [Tue, 25 Oct 2011 00:16:23 +0000 (17:16 -0700)]
Reconcile with ics-mr0-release
Change-Id: I73df979432604dda0d826d90e4b0bec6b174e0b8
Peter Ng [Tue, 25 Oct 2011 00:03:40 +0000 (17:03 -0700)]
Merge "tablet unlock ring and wave updated for ics"
Eric Fischer [Tue, 25 Oct 2011 00:01:36 +0000 (17:01 -0700)]
am
5657b739: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
5657b7399eb94429a8cc00ad9f79eaad0c26b93b':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 24 Oct 2011 23:59:41 +0000 (16:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Scott Main [Mon, 24 Oct 2011 23:50:12 +0000 (16:50 -0700)]
am
057e85ac: Merge "docs: remove links to ADP devices" into ics-mr0
* commit '
057e85ac0b055e45cfec0e04da3d82c36918af78':
docs: remove links to ADP devices
Scott Main [Mon, 24 Oct 2011 23:47:49 +0000 (16:47 -0700)]
Merge "docs: remove links to ADP devices" into ics-mr0
Claudia de Veaux [Mon, 24 Oct 2011 22:35:34 +0000 (15:35 -0700)]
Merge "String scrub to implement punc, wording, cap standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328"
Jeff Brown [Mon, 24 Oct 2011 22:13:13 +0000 (15:13 -0700)]
Merge "Use libcorkscrew for stack unwinding."
The Android Automerger [Mon, 24 Oct 2011 21:55:08 +0000 (14:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jim Miller [Mon, 24 Oct 2011 20:32:31 +0000 (13:32 -0700)]
am
7a962fef: Merge "Fix
3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
* commit '
7a962fef2f26b941b916595562d5adfae943d432':
Fix
3384942: Force ASCII-capable IME to show on lockscreen
Xavier Ducrohet [Mon, 24 Oct 2011 20:32:30 +0000 (13:32 -0700)]
am
e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.
* commit '
e869ca9626146265bbb2b5043018dfe532e0661f':
CherryPick f9e455 from master to mr0. do not merge.
Jim Miller [Mon, 24 Oct 2011 20:31:15 +0000 (13:31 -0700)]
Merge "Fix
3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
Xavier Ducrohet [Fri, 21 Oct 2011 23:18:48 +0000 (16:18 -0700)]
CherryPick f9e455 from master to mr0. do not merge.
Fix software GL renderer.
Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
Brian Colonna [Mon, 24 Oct 2011 20:22:13 +0000 (13:22 -0700)]
am
c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
* commit '
c9c417c85d08074e5ececd5c74db1364e9c097c2':
Added callback to allow Face Unlock to hide black area
Xavier Ducrohet [Mon, 24 Oct 2011 20:20:07 +0000 (13:20 -0700)]
am
b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.
* commit '
b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
CherryPick 35530d from master to mr0. do not merge.
Brian Colonna [Mon, 24 Oct 2011 20:19:55 +0000 (13:19 -0700)]
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
Xavier Ducrohet [Mon, 24 Oct 2011 20:01:46 +0000 (13:01 -0700)]
Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys."
The Android Automerger [Mon, 24 Oct 2011 19:56:26 +0000 (12:56 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Mon, 24 Oct 2011 19:46:39 +0000 (12:46 -0700)]
am
084369fb: docs: add uiOptions attribute to manifest docs
* commit '
084369fb5e738e4db6ae94b4e24e777bdd9d9c2c':
docs: add uiOptions attribute to manifest docs
Wink Saville [Mon, 24 Oct 2011 19:46:21 +0000 (12:46 -0700)]
am
cd3ec73f: Add getAvailableNetworks.
* commit '
cd3ec73f0ce164c718146bc1dbb7c430763be25a':
Add getAvailableNetworks.
Svetoslav Ganov [Mon, 24 Oct 2011 19:05:38 +0000 (12:05 -0700)]
Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces."
Peter Ng [Mon, 24 Oct 2011 17:55:30 +0000 (10:55 -0700)]
Merge "Stat notify image update"
The Android Open Source Project [Mon, 24 Oct 2011 13:32:19 +0000 (06:32 -0700)]
Reconcile with ics-mr0-release
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
Jeff Brown [Thu, 20 Oct 2011 03:32:43 +0000 (20:32 -0700)]
Use libcorkscrew for stack unwinding.
Change-Id: Iee1ee5a2018ab8cfc1ce12ec2a124809245eaa02
The Android Automerger [Sat, 22 Oct 2011 06:22:41 +0000 (23:22 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jake Hamby [Sat, 22 Oct 2011 00:04:15 +0000 (17:04 -0700)]
Merge "Add support for SMS-PP data download to USIM."
Mathias Agopian [Fri, 21 Oct 2011 22:18:28 +0000 (15:18 -0700)]
mDirtyRegion is single threaded, but could be accessed from a hwc thread
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug:
5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
Peter Ng [Fri, 21 Oct 2011 23:45:23 +0000 (16:45 -0700)]
am
be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
* commit '
be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
Peter Ng [Fri, 21 Oct 2011 23:42:49 +0000 (16:42 -0700)]
Merge "Do not merge - Recents background protection increased" into ics-mr0
John Reck [Fri, 21 Oct 2011 23:35:50 +0000 (16:35 -0700)]
Merge "Fix rebuildWebTextView issues"
Xavier Ducrohet [Fri, 21 Oct 2011 23:22:15 +0000 (16:22 -0700)]
Merge "Fix software GL renderer."
Xavier Ducrohet [Fri, 21 Oct 2011 23:18:48 +0000 (16:18 -0700)]
Fix software GL renderer.
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
Mathias Agopian [Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)]
am
aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
* commit '
aa938c8d9c0e71c9b556657cb33794210ce6ebf8':
mDirtyRegion is single threaded, but could be accessed from a hwc thread
Eric Fischer [Fri, 21 Oct 2011 22:57:54 +0000 (15:57 -0700)]
am
148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
148d5bd855e4872bbe99870b0019462bcf73b72c':
Import revised translations. DO NOT MERGE
Mathias Agopian [Fri, 21 Oct 2011 22:57:45 +0000 (15:57 -0700)]
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 22:56:22 +0000 (15:56 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
The Android Automerger [Fri, 21 Oct 2011 22:55:40 +0000 (15:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 22:18:28 +0000 (15:18 -0700)]
mDirtyRegion is single threaded, but could be accessed from a hwc thread
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug:
5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
Daniel Shiplacoff [Fri, 21 Oct 2011 22:22:54 +0000 (15:22 -0700)]
Merge "Recents background protection increased"
John Reck [Fri, 21 Oct 2011 22:22:11 +0000 (15:22 -0700)]
am
8bf89f30: (-s ours) Fix the build
* commit '
8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
Fix the build
Adam Cohen [Fri, 21 Oct 2011 21:38:41 +0000 (14:38 -0700)]
am
e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
* commit '
e3bb0ecb2b36964cb3b02bc0d575e9366818ee00':
Removing fades on last item in StackView for major FPS improvement on Prime
John Reck [Fri, 21 Oct 2011 21:38:32 +0000 (14:38 -0700)]
am
2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0
* commit '
2dd2e5b4eb95280bb18717c1a31ca8db40a6413b':
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
Dianne Hackborn [Fri, 21 Oct 2011 21:38:31 +0000 (14:38 -0700)]
am
943da7b8: Merge "Fix issue #
5342788: Setting wallpaper from gallery set default..." into ics-mr0
* commit '
943da7b895b7cc69cdaed7979cff422a7dbaac19':
Fix issue #
5342788: Setting wallpaper from gallery set default...
Dirk Dougherty [Fri, 21 Oct 2011 20:59:34 +0000 (13:59 -0700)]
am
f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
* commit '
f1ed59bcebfd3042aead8d91ee47eca38af543c6':
Doc change: fix typo in platform highlights.
Winson Chung [Fri, 21 Oct 2011 20:59:08 +0000 (13:59 -0700)]
am
53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug:
5333706)" into ics-mr0
* commit '
53a1b82c9a2133c5c3184898335fce0826279691':
Last update for screenshot animations for MR0. (Bug:
5333706)
Dianne Hackborn [Fri, 21 Oct 2011 20:59:07 +0000 (13:59 -0700)]
am
4bbd71a6: Merge "Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0
* commit '
4bbd71a6b2f4957f4778da13861ec03d30afbee7':
Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped
Mike Lockwood [Fri, 21 Oct 2011 20:59:05 +0000 (13:59 -0700)]
am
6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
* commit '
6b6bfb187412e4845c89d866eff0b87b6d0a5541':
PowerManagerService: Enable light sensor debug output
Gilles Debunne [Fri, 21 Oct 2011 20:59:04 +0000 (13:59 -0700)]
am
0499f90a: Merge "Bug
5428541: Check that span is still in text before deleting" into ics-mr0
* commit '
0499f90a2d2774f28ca3d430dfe563391669c515':
Bug
5428541: Check that span is still in text before deleting
Eric Fischer [Fri, 21 Oct 2011 20:59:03 +0000 (13:59 -0700)]
am
4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0
* commit '
4e7ce9352b9c3a832715ac4b8014b2434a447172':
Import revised translations.
Adam Cohen [Fri, 21 Oct 2011 20:34:46 +0000 (13:34 -0700)]
Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
Peter Ng [Fri, 21 Oct 2011 20:29:52 +0000 (13:29 -0700)]
Merge "Sharpening text edit assets"
George Mount [Fri, 21 Oct 2011 20:02:05 +0000 (13:02 -0700)]
Merge "Fixed spell check failing to change word."
RoboErik [Fri, 21 Oct 2011 20:01:56 +0000 (13:01 -0700)]
Merge "s/should/can"
John Reck [Fri, 21 Oct 2011 20:01:48 +0000 (13:01 -0700)]
Merge changes I2df047b6,I791eeb3c into ics-mr0
* changes:
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
Mangesh Ghiware [Fri, 21 Oct 2011 19:45:30 +0000 (12:45 -0700)]
Merge "Fix issue#
5492404: Reading level check thread error."
Dianne Hackborn [Fri, 21 Oct 2011 19:45:07 +0000 (12:45 -0700)]
Merge "Fix issue #
5342788: Setting wallpaper from gallery set default..." into ics-mr0
Dirk Dougherty [Fri, 21 Oct 2011 18:55:21 +0000 (11:55 -0700)]
Merge "Doc change: fix typo in platform highlights." into ics-mr0
Winson Chung [Fri, 21 Oct 2011 18:07:06 +0000 (11:07 -0700)]
Merge "Last update for screenshot animations for MR0. (Bug:
5333706)" into ics-mr0
Dianne Hackborn [Fri, 21 Oct 2011 18:03:34 +0000 (11:03 -0700)]
Merge "Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0
RoboErik [Fri, 21 Oct 2011 18:00:40 +0000 (11:00 -0700)]
Merge "Color API comment updates."
Mike Lockwood [Fri, 21 Oct 2011 17:26:55 +0000 (10:26 -0700)]
Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
Gilles Debunne [Fri, 21 Oct 2011 16:48:07 +0000 (09:48 -0700)]
Merge "Bug
5428541: Check that span is still in text before deleting" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 16:34:22 +0000 (09:34 -0700)]
Merge "Import revised translations." into ics-mr0
Kristian Monsen [Fri, 21 Oct 2011 11:48:22 +0000 (04:48 -0700)]
Merge "WebView part of fix for bug
5307956"
Jake Hamby [Fri, 21 Oct 2011 07:49:41 +0000 (00:49 -0700)]
Merge "Add wrapper classes for UICC service tables."
satok [Fri, 21 Oct 2011 06:35:27 +0000 (23:35 -0700)]
am
2cf1cf09: Fix possible NPE
* commit '
2cf1cf098513807ffd3420ae106f438e943d0cd8':
Fix possible NPE