OSDN Git Service
George Mount [Wed, 21 May 2014 13:51:43 +0000 (13:51 +0000)]
Merge changes I2da66b54,I8a65428d
* changes:
Fix for quick "back" in Activity Transitions.
Enter and exit transitions are inverted in calling Activity.
Adrian Roos [Wed, 21 May 2014 13:44:06 +0000 (13:44 +0000)]
Merge "Add dumpsys facility and a history to TrustManagerService"
Dan Sandler [Fri, 16 May 2014 02:22:10 +0000 (22:22 -0400)]
Elide extras strings from noman dumpsys output.
Bug:
14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
Chris Wren [Wed, 21 May 2014 12:36:05 +0000 (12:36 +0000)]
Merge "add ranking information to the dumpsys info"
Jeff Brown [Wed, 21 May 2014 11:16:58 +0000 (11:16 +0000)]
am
c2871696: am
6099fd21: Merge "Fix build." into klp-modular-dev
* commit '
c28716964c4525bf9a291404d7f14e74de23f36f':
Fix build.
Jeff Brown [Wed, 21 May 2014 11:16:52 +0000 (11:16 +0000)]
am
77669abb: am
9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
* commit '
77669abb8300b672700418216939b9253dc98bee':
Defer display ready until brightness ramp completes.
Narayan Kamath [Wed, 21 May 2014 11:07:35 +0000 (12:07 +0100)]
resolved conflicts for merge of
fcc4fed3 to master
Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0
Sander Alewijnse [Wed, 21 May 2014 10:33:59 +0000 (10:33 +0000)]
Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE."
Robin Lee [Wed, 21 May 2014 09:41:19 +0000 (09:41 +0000)]
Merge "DPM: Disallow some DeviceAdmin policies for ProfileOwners"
Robin Lee [Tue, 20 May 2014 15:26:49 +0000 (16:26 +0100)]
DPM: Disallow some DeviceAdmin policies for ProfileOwners
A profile owner should only have control over the profile. All of the
following device admin APIs that affect the device beyond the profile
that they are called from are now disallowed:
- Camera enable/disable
- Keyguard
- Wipe external storage
@bug
14434826
Change-Id: I69acfdf6f654f48b5db91aeb3ea86662d7857075
Sander Alewijnse [Wed, 21 May 2014 09:19:07 +0000 (09:19 +0000)]
Merge "Disallow adb sideloading if UserManager flag is set for user."
Sander Alewijnse [Wed, 14 May 2014 11:52:46 +0000 (12:52 +0100)]
Disallow adb sideloading if UserManager flag is set for user.
Solution is based on "redefining" the User_all.
Change-Id: Ie1ce5d6391e807f8caa05fe2a92009923d1032a8
Brian Carlstrom [Wed, 21 May 2014 09:08:16 +0000 (09:08 +0000)]
am
1d265716: am
e77a77d0: am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
1d265716954122f79d5fdd9d953a98e303d298c9':
Improve ABI handling for shared user ids.
Jeff Brown [Wed, 21 May 2014 08:40:39 +0000 (08:40 +0000)]
am
6099fd21: Merge "Fix build." into klp-modular-dev
* commit '
6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
Fix build.
Jeff Brown [Wed, 21 May 2014 08:40:36 +0000 (08:40 +0000)]
am
9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
* commit '
9beccf9f9e28f74bd78041e4381b59ce0a2351e7':
Defer display ready until brightness ramp completes.
Jeff Brown [Wed, 21 May 2014 08:40:33 +0000 (08:40 +0000)]
am
6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
* commit '
6fb904bfd1f943547d6e5bc6f199ffec2290da01':
Make power button behavior configurable.
Brian Carlstrom [Wed, 21 May 2014 08:27:03 +0000 (08:27 +0000)]
am
e77a77d0: am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
e77a77d081ff9d05100702f5880f356da27fd087':
Improve ABI handling for shared user ids.
Brian Carlstrom [Wed, 21 May 2014 06:46:26 +0000 (06:46 +0000)]
am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
ec71fed089965c4d731eaa90344849a1775f937a':
Improve ABI handling for shared user ids.
Jungshik Jang [Wed, 21 May 2014 06:43:09 +0000 (06:43 +0000)]
Merge "Add several actions for ARC (Audio Return Channel)"
Jungshik Jang [Tue, 20 May 2014 05:37:38 +0000 (14:37 +0900)]
Fix NullPointerException on init of HdmiMhlController.
Change-Id: I2f79ce0ef3a368c2fcc8d047de2dcad914679e0c
Brian Carlstrom [Wed, 21 May 2014 06:24:14 +0000 (06:24 +0000)]
Merge "Improve ABI handling for shared user ids."
Brian Carlstrom [Wed, 21 May 2014 06:01:06 +0000 (06:01 +0000)]
Merge "Improve ABI handling for shared user ids."
Jungshik Jang [Thu, 15 May 2014 05:05:24 +0000 (14:05 +0900)]
Add several actions for ARC (Audio Return Channel)
ARC channel is established by both TV and AV Reciever.
From TV, it sends <Request ARC Initiation> and AVR
responds with <Initiate ARC>.
From AVR, it can be initiated by sending <Initiate ARC> directly
to TV.
Once TV receives <Initiate ARC> it sets up ARC internally
and replies <Report ARC Initiated> to AVR.
Termination steps are almost same except for message name
(use Terminate instread of Initiation).
In order to implement the above steps, this change introduces
following classes.
RequestArcInitiation(Termination)Action:
handles <Request ARC Initiation> (<Request ARC Termination>)
RequestArcAction handles common logic of them.
SetArcTransmissionStateAction:
handles ARC set up, enabling/disabling ARC and
reports results to AVR.
<Initiate ARC> and <Terminate ARC> handles directly in
HdmiControlService
Along with this, this change has implmentation for
add&removeAction. To avoid synchronization issue
they are isolated to main thread.
Change-Id: I3c5cf7c777e6c1de50d63ce4643b191dfe15fe1f
Vinit Deshpande [Wed, 21 May 2014 01:42:36 +0000 (18:42 -0700)]
Make Wifi WPS API available on application layer
Un-hide WPS methods (and required interface classes, etc.) of WifiManager to
enable Apps to start/stop the WPS procedure, add a patch for WPS method
KEYPAD to avoid early failure callbacks. (Methods PBC, DISPLAY, KEYPAD
tested on 4.4.2_r2.)
Change-Id: I25aafdc4b637c87d754d4fdb70e40a34a569b738
Signed-off-by: Olaf Stoyke <o.stoyke@avm.de>
Jeff Brown [Wed, 21 May 2014 05:17:31 +0000 (05:17 +0000)]
Merge "Fix build." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:16:25 +0000 (22:16 -0700)]
Fix build.
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
Narayan Kamath [Tue, 20 May 2014 12:55:09 +0000 (13:55 +0100)]
Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.
This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.
This also has the side effect of fixing
15081286.
bug:
15081286
(cherry-picked from commit
b851c89d2252cf3d1dc504558ce1553527885316)
Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
Jeff Brown [Wed, 21 May 2014 05:09:15 +0000 (05:09 +0000)]
Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:02:46 +0000 (22:02 -0700)]
Defer display ready until brightness ramp completes.
Bug:
14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
Jason Sams [Wed, 21 May 2014 04:50:23 +0000 (04:50 +0000)]
Merge "Validate RenderScript context creation flags"
Jeff Brown [Wed, 21 May 2014 04:28:34 +0000 (04:28 +0000)]
Merge "Make power button behavior configurable." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 04:24:38 +0000 (21:24 -0700)]
Make power button behavior configurable.
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.
Bug:
14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
Yuhao Zheng [Wed, 21 May 2014 04:21:23 +0000 (04:21 +0000)]
Merge "Hotspot 2.0 framework - add implementation"
Wei Wang [Wed, 21 May 2014 00:59:36 +0000 (17:59 -0700)]
Add scan response as an advertising parameter(1/2).
Change-Id: I75c500dd7b5f2609d3092f50ba284a5ec4a41987
Griff Hazen [Wed, 21 May 2014 02:48:24 +0000 (02:48 +0000)]
am
08a8c2ca: am
ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit '
08a8c2ca45dc859e79d54990d2ae0392d475aeda':
Fixes to WearableActionExtensions
Griff Hazen [Wed, 21 May 2014 02:44:16 +0000 (02:44 +0000)]
am
ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit '
ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
Fixes to WearableActionExtensions
Jeff Brown [Wed, 21 May 2014 02:41:06 +0000 (02:41 +0000)]
am
ccf51bef: am
2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '
ccf51bef288652cb618a566a376173e252b84af0':
I'm feeling the good vibrations.
Griff Hazen [Wed, 21 May 2014 02:41:01 +0000 (02:41 +0000)]
Merge "Fixes to WearableActionExtensions" into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 02:41:00 +0000 (02:41 +0000)]
am
8f120dd6: am
0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '
8f120dd6d631ac632d3356b81403a53f958021f0':
Allow display timeouts to be set in config.xml.
Jeff Brown [Wed, 21 May 2014 02:38:11 +0000 (02:38 +0000)]
am
2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '
2d9b513dab78242281bca125b4abc6b8235089a6':
I'm feeling the good vibrations.
Jeff Brown [Wed, 21 May 2014 02:38:07 +0000 (02:38 +0000)]
am
0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '
0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
Allow display timeouts to be set in config.xml.
Jeff Brown [Wed, 21 May 2014 02:35:09 +0000 (02:35 +0000)]
Merge "I'm feeling the good vibrations." into klp-modular-dev
Dirk Dougherty [Wed, 21 May 2014 02:34:43 +0000 (02:34 +0000)]
am
3dc330af: am
f7963fab: am
c1bb79d9: am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
3dc330af6b590ebd3c6529e8b123f51cebb134e2':
Remove monetization image in edu guidelines.
Jeff Brown [Wed, 21 May 2014 02:34:25 +0000 (02:34 +0000)]
Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 02:29:29 +0000 (19:29 -0700)]
I'm feeling the good vibrations.
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution. However if
the system is performing haptic feedback then we want to allow
it to run to completion.
Bug:
14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
Dirk Dougherty [Wed, 21 May 2014 02:29:04 +0000 (02:29 +0000)]
am
f7963fab: am
c1bb79d9: am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
f7963fab0decb70b72b848fe3d7a14c5ed54ff95':
Remove monetization image in edu guidelines.
Dirk Dougherty [Wed, 21 May 2014 02:25:09 +0000 (02:25 +0000)]
am
c1bb79d9: am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
c1bb79d966c5fee256a349d8902c7abd362ddc39':
Remove monetization image in edu guidelines.
Dirk Dougherty [Wed, 21 May 2014 02:20:16 +0000 (02:20 +0000)]
am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
bb0b8449f80338a35768c9264e9c1e5eae54c7fa':
Remove monetization image in edu guidelines.
Dirk Dougherty [Wed, 21 May 2014 02:10:26 +0000 (19:10 -0700)]
Remove monetization image in edu guidelines.
Change-Id: I2cea7a3507eda30ab185560304d64fc455ba19f7
Jason Sams [Wed, 21 May 2014 01:48:35 +0000 (18:48 -0700)]
Validate RenderScript context creation flags
Sync the IDs to that of the native interface.
Change-Id: I7516c1ea4f4a93844ddb8397b2fc1e79ff8d6b68
Griff Hazen [Wed, 21 May 2014 01:46:16 +0000 (18:46 -0700)]
Fixes to WearableActionExtensions
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN
Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
Roger Chang [Thu, 15 May 2014 21:46:49 +0000 (14:46 -0700)]
Hotspot 2.0 framework - add implementation
Bug:
5485670
Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
Wonsik Kim [Wed, 21 May 2014 00:44:15 +0000 (00:44 +0000)]
Merge "Change visibility of TvInputManager.Session.setSurface()"
Kristian Monsen [Wed, 21 May 2014 00:42:19 +0000 (00:42 +0000)]
Merge "Consider addAction(int action) to possibly be a bit mask"
Winson Chung [Wed, 21 May 2014 00:32:15 +0000 (00:32 +0000)]
Merge "Removing unnecessary proguard flag for removed info view."
Winson Chung [Wed, 21 May 2014 00:30:52 +0000 (17:30 -0700)]
Removing unnecessary proguard flag for removed info view.
Lorenzo Colitti [Wed, 21 May 2014 00:20:33 +0000 (00:20 +0000)]
Merge "Fix build."
Lorenzo Colitti [Wed, 21 May 2014 00:17:21 +0000 (17:17 -0700)]
Fix build.
Change-Id: I5c09a406b6c43318cea600171b8dd25eeeffa673
Jeff Brown [Wed, 21 May 2014 00:17:10 +0000 (17:17 -0700)]
Allow display timeouts to be set in config.xml.
Bug:
13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
Griff Hazen [Tue, 20 May 2014 23:59:45 +0000 (23:59 +0000)]
Merge "resolved conflicts for merge of
cbe69ec1 to master"
Amith Yamasani [Tue, 20 May 2014 23:58:44 +0000 (23:58 +0000)]
Merge "Pass along the appOp param to broadcastIntent"
Amith Yamasani [Tue, 20 May 2014 23:57:26 +0000 (16:57 -0700)]
Pass along the appOp param to broadcastIntent
Forgot to pass that along in the original CL
Change-Id: I3aaa7de9cf5c73ab5cbff367e5889429e9ac2301
Griff Hazen [Tue, 20 May 2014 23:53:09 +0000 (16:53 -0700)]
resolved conflicts for merge of
cbe69ec1 to master
Change-Id: I183f94c726c9acb3de7d9369e315cc4ae1ff92d6
Kristian Monsen [Tue, 20 May 2014 20:16:19 +0000 (13:16 -0700)]
Consider addAction(int action) to possibly be a bit mask
bug=
15092606
Change-Id: I885808b3f4d2337129d1660300be8e926f8a8425
Andres Morales [Tue, 20 May 2014 23:40:37 +0000 (23:40 +0000)]
Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class.""
Chris Craik [Tue, 20 May 2014 23:27:20 +0000 (23:27 +0000)]
Merge "Clean up Outline API, method on drawable"
Winson Chung [Tue, 20 May 2014 23:25:41 +0000 (23:25 +0000)]
Merge "Wrapping console logs."
Winson Chung [Tue, 20 May 2014 23:21:31 +0000 (16:21 -0700)]
Wrapping console logs.
Griff Hazen [Tue, 20 May 2014 23:21:01 +0000 (23:21 +0000)]
am
7ea18e1c: Add wearable notification extensions to frameworks/base.
* commit '
7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
Add wearable notification extensions to frameworks/base.
Jim Miller [Tue, 20 May 2014 23:18:48 +0000 (23:18 +0000)]
Merge "Update FingerprintManager API after discussions."
Lorenzo Colitti [Tue, 20 May 2014 23:15:50 +0000 (23:15 +0000)]
Merge "Move IP config from WifiConfiguration to IpConfiguration."
Maurice Lam [Tue, 20 May 2014 23:15:42 +0000 (23:15 +0000)]
Merge "Disable swipe-to-reveal nav bar / status bar during setup"
Jim Miller [Tue, 20 May 2014 23:12:07 +0000 (23:12 +0000)]
Merge "Fix Keyguard PIN error message for N < 4."
Yuncheol Heo [Tue, 20 May 2014 22:53:12 +0000 (22:53 +0000)]
Merge "Fix the wrong conversion of byte to int."
George Mount [Thu, 15 May 2014 16:57:17 +0000 (09:57 -0700)]
Fix for quick "back" in Activity Transitions.
Bug
14990153
Stops two potential animators working against the background
drawable. Forces the entering views to become visible onResume.
Change-Id: I2da66b54a16c6c69533eebbeff6db7f5a7794a89
George Mount [Tue, 20 May 2014 22:10:20 +0000 (15:10 -0700)]
Enter and exit transitions are inverted in calling Activity.
Bug
15115028
Also fixes NPE when there is shared element name mismatch.
Change-Id: I8a65428d4b215ada532e98a555649c2e046de5ef
Jaewan Kim [Mon, 10 Mar 2014 08:10:51 +0000 (17:10 +0900)]
Move IP config from WifiConfiguration to IpConfiguration.
This is so that Ethernet can use it in the future.
Bug:
7606609
Bug:
8687763
Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
Amith Yamasani [Tue, 20 May 2014 22:20:06 +0000 (22:20 +0000)]
Merge "Per-user telephony restrictions"
Julia Reynolds [Tue, 20 May 2014 22:19:02 +0000 (22:19 +0000)]
Merge "Add Device/Profile Owner gated apis for setting/getting blocked packages."
Amith Yamasani [Fri, 16 May 2014 21:49:15 +0000 (14:49 -0700)]
Per-user telephony restrictions
Allow profile owners or administrators of restricted profiles
to restrict access to telephony features such as calling and
texting for a user.
Change-Id: I89f97608c07c647ad8a7b43fef9d1e6bc4a84e95
Julia Reynolds [Tue, 20 May 2014 22:10:45 +0000 (22:10 +0000)]
Merge "Allow device/profile owners to update settings."
Yuhao Zheng [Tue, 20 May 2014 22:08:32 +0000 (22:08 +0000)]
Merge "Fix a boot failure due to Wifi / Wifi Passpoint"
Alan Viverette [Tue, 20 May 2014 22:06:12 +0000 (22:06 +0000)]
Merge "Various API review fixes to resources and drawables"
Julia Reynolds [Wed, 14 May 2014 16:23:08 +0000 (12:23 -0400)]
Add Device/Profile Owner gated apis for setting/getting blocked packages.
DMAgent currently needs to live in /system/priv-app in order to
(among other things) set and get blocked packages. These APIs will
get us closer to being able to move DMAgent out of priv-app.
Bug:
14945334
Change-Id: I108e2013c67409dca554acf78e3a710745900706
Julia Reynolds [Wed, 14 May 2014 21:15:16 +0000 (17:15 -0400)]
Allow device/profile owners to update settings.
Device owners can update Settings.Secure and Settings.Global settings.
Profile owners can update Settings.Secure settings.
DMAgent currently needs to live in /system/priv-app in order to
(among other things) update global and secure settings. This change will
get us closer to being able to move DMAgent out of priv-app.
Bug:
14965414
Change-Id: If2cc3a56de91bffde33b838ab8ecea2c32412803
Winson Chung [Tue, 20 May 2014 21:42:51 +0000 (21:42 +0000)]
Merge "Removing the info pane."
Eric Laurent [Tue, 20 May 2014 21:39:22 +0000 (21:39 +0000)]
Merge "AudioSystem: add new audio device definitions"
Winson Chung [Tue, 20 May 2014 21:36:28 +0000 (21:36 +0000)]
Merge "Fixing transition to/from Recents with full screen apps."
Winson Chung [Tue, 20 May 2014 21:27:39 +0000 (14:27 -0700)]
Removing the info pane.
Change-Id: I5486291144cbcb1b31a7e5b8a234e5ef7cf85325
Jorim Jaggi [Tue, 20 May 2014 21:28:59 +0000 (21:28 +0000)]
Merge "Fix invisible notification backgrounds."
Winson Chung [Tue, 20 May 2014 21:17:22 +0000 (14:17 -0700)]
Fixing transition to/from Recents with full screen apps.
Change-Id: I2f400b6736581a37d38a75ee7194fc7cb6438460
Jorim Jaggi [Tue, 20 May 2014 21:16:42 +0000 (23:16 +0200)]
Fix invisible notification backgrounds.
Bug:
15094262
Change-Id: I37eeb03a6ebb595da6793cfc95aa159662ab3990
Chris Wren [Tue, 20 May 2014 20:12:43 +0000 (16:12 -0400)]
add ranking information to the dumpsys info
Change-Id: Ie08186066821a10feef010fd7967150b5517cd54
Yuhao Zheng [Tue, 20 May 2014 21:06:49 +0000 (14:06 -0700)]
Fix a boot failure due to Wifi / Wifi Passpoint
Bug:
15060373
Change-Id: Ie72fd2e4b855c46a8f9ed12deb8b07fd0c29f522
RoboErik [Tue, 20 May 2014 21:02:18 +0000 (21:02 +0000)]
Merge "Add getMediaSession to RCC"
RoboErik [Tue, 20 May 2014 01:18:12 +0000 (18:18 -0700)]
Add getMediaSession to RCC
This is to make integration with Media notifications easier.
Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
Griff Hazen [Tue, 20 May 2014 20:50:06 +0000 (13:50 -0700)]
Add wearable notification extensions to frameworks/base.
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
Jeff Brown [Tue, 20 May 2014 20:47:29 +0000 (20:47 +0000)]
am
9777fdb7: am
b0a7f84b: am
63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '
9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3':
Fix NullException in QwertyKeyListener.KeyDown
Jeff Brown [Tue, 20 May 2014 20:44:21 +0000 (20:44 +0000)]
am
b0a7f84b: am
63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '
b0a7f84b6de20edc6337163a4a07e3c524991ddb':
Fix NullException in QwertyKeyListener.KeyDown
Jeff Brown [Tue, 20 May 2014 20:40:20 +0000 (20:40 +0000)]
am
63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '
63bf04d88bcc00876c30c9f2848da8c44b42185b':
Fix NullException in QwertyKeyListener.KeyDown