OSDN Git Service
Andrew Solovay [Sat, 16 Jul 2016 00:22:59 +0000 (00:22 +0000)]
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am:
833722e049
Change-Id: I8b594c2f28db69dd6e645dc2d79405f6da764806
TreeHugger Robot [Sat, 16 Jul 2016 00:13:16 +0000 (00:13 +0000)]
Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev
TreeHugger Robot [Sat, 16 Jul 2016 00:03:51 +0000 (00:03 +0000)]
Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 23:59:44 +0000 (23:59 +0000)]
Merge "Include an app icon." into nyc-mr1-dev
Doris Liu [Fri, 15 Jul 2016 23:46:07 +0000 (23:46 +0000)]
Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 23:41:10 +0000 (23:41 +0000)]
Merge "Don't accept resource references in string fields" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 23:05:14 +0000 (23:05 +0000)]
Merge "Build both filename views before deleting." into nyc-mr1-dev
Andrew Solovay [Fri, 15 Jul 2016 22:55:37 +0000 (22:55 +0000)]
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am:
b91693fedd
Change-Id: I9e9a0982a141d09da5e7d68fb01df48adcb619a3
Andrew Solovay [Fri, 15 Jul 2016 22:46:49 +0000 (22:46 +0000)]
Merge "docs: Updating N Preview release notes for DP5" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:45:57 +0000 (22:45 +0000)]
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am:
085b4e8f7b
Change-Id: Id0ad00358c59e0a4187bd1f67bfc329e328c17bd
TreeHugger Robot [Fri, 15 Jul 2016 22:42:27 +0000 (22:42 +0000)]
Merge "docs: Describe how to update N Preview test devices on N release" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 20:04:04 +0000 (13:04 -0700)]
docs: Updating N Preview "API Overview" doc for DP5
Added new "WebView" section, and minor tweak to the "Always On VPN"
section.
See first comment for doc stage location.
Change-Id: I1f57c2a73d1c8adaf4de0bf928711ba75f732436
Steve McKay [Fri, 15 Jul 2016 21:46:56 +0000 (14:46 -0700)]
Include an app icon.
Bug:
29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853
Amith Yamasani [Fri, 15 Jul 2016 22:33:03 +0000 (15:33 -0700)]
Block camera gesture during secondary user SUW
Check for the current user's setup_complete state
before acting on the double-tap on power camera
launcher.
Bug:
30155500
Change-Id: I2ee8601411d270e288410e9d22ae07b97fa0de70
Makoto Onuki [Fri, 15 Jul 2016 22:22:33 +0000 (22:22 +0000)]
Merge "Cache the default launcher." into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 22:20:37 +0000 (22:20 +0000)]
Merge "Frameworks/base: Add compiler stats to Package Manager" into nyc-mr1-dev
Ashutosh Joshi [Fri, 15 Jul 2016 22:12:41 +0000 (22:12 +0000)]
Merge "Loading NanoApps now works." into nyc-mr1-dev
Cheryl Potter [Fri, 15 Jul 2016 22:07:16 +0000 (22:07 +0000)]
Merge \"docs: Add redirect for new AS Help menu item b/
30165151\" into nyc-dev
am:
462e5aae83
Change-Id: Iaf769efa2d7e30d82d02f1e8fd1ee96da640bf57
Cheryl Potter [Fri, 15 Jul 2016 21:55:04 +0000 (21:55 +0000)]
Merge "docs: Add redirect for new AS Help menu item b/
30165151" into nyc-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:43:01 +0000 (21:43 +0000)]
Merge "Fix the allowed icon type error message" into nyc-mr1-dev
Jeff Sharkey [Fri, 15 Jul 2016 21:34:41 +0000 (15:34 -0600)]
Build both filename views before deleting.
Otherwise we'll throw when trying to create the second (visible)
filename because we just deleted it.
Bug:
30087518
Change-Id: I940a8f81c264fc17d477fadf46fd48eae29f2f6f
Andrew Solovay [Wed, 13 Jul 2016 19:13:08 +0000 (12:13 -0700)]
docs: Describe how to update N Preview test devices on N release
Noted that devices that are signed up for OTA updates will
automatically update to release version; devices that you flash
manually (and don't subsequently sign up for the beta program) will
need to be flashed with the production version.
See first comment for doc stage location.
Change-Id: I6755c837f80a459776880422f6d84af1d0b75f34
TreeHugger Robot [Fri, 15 Jul 2016 21:28:33 +0000 (21:28 +0000)]
Merge "Back up Night Light settings" into nyc-mr1-dev
Andrew Solovay [Fri, 15 Jul 2016 21:16:06 +0000 (21:16 +0000)]
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
am:
84d59bc35d
Change-Id: I9c9f5afb071adccacc27b2479330ddbd121a631f
Adrian Roos [Fri, 15 Jul 2016 21:09:50 +0000 (21:09 +0000)]
Merge "Doze: Add config for fine grained proximity checks" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 21:09:36 +0000 (21:09 +0000)]
Merge "Notification: Apply small icon level" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:08:45 +0000 (21:08 +0000)]
Merge "docs: Updating image download pages for DP5" into nyc-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:07:30 +0000 (21:07 +0000)]
Merge "Add way to set live wallpaper across users" into nyc-mr1-dev
Ashutosh Joshi [Fri, 15 Jul 2016 20:46:22 +0000 (13:46 -0700)]
Loading NanoApps now works.
Fixing transaction handling for loading/unloading nanoApps.
Bug:
30165105
Change-Id: I540243d730040e70b2d104ccd9ea5a0baaa0d97d
Cheryl Potter [Fri, 15 Jul 2016 20:41:57 +0000 (13:41 -0700)]
docs: Add redirect for new AS Help menu item
b/
30165151
Change-Id: I23cebb22ab697f750846cccb2eb42088a22f1cc9
Makoto Onuki [Fri, 15 Jul 2016 20:23:54 +0000 (13:23 -0700)]
Fix the allowed icon type error message
Bug
30162778
Change-Id: I925c563c1924c6525fe17afc44626d62864ba7e1
Mike Tsao [Fri, 15 Jul 2016 16:54:07 +0000 (09:54 -0700)]
Back up Night Light settings
Bug:
30150787
Change-Id: I79697b41b68e0f123de20e7b8782c6058bef7977
Daniel Yu [Fri, 15 Jul 2016 20:09:41 +0000 (20:09 +0000)]
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am:
344a7375d7
Change-Id: Ia090eda73ad984c7e15a94c9b318e3a314fe0582
Andreas Gampe [Wed, 13 Jul 2016 05:42:41 +0000 (22:42 -0700)]
Frameworks/base: Add compiler stats to Package Manager
Add a simple class for storing compiler statistics. Capture compile
times for code paths from a package.
Bug:
29223204
Change-Id: I1b066de6a83a739470a42480eee0bfef88423eea
Dan Yu [Fri, 15 Jul 2016 19:59:56 +0000 (19:59 +0000)]
Merge "docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5" into nyc-dev
Makoto Onuki [Fri, 15 Jul 2016 01:14:08 +0000 (18:14 -0700)]
Cache the default launcher.
Originally we always checked with PM for the default launcher,
which would take ~2ms.
Now we cache the result, and clears the cache when (any) preferred
activities change.
Bug
30126557
Change-Id: Iceef288cd372c8bb9b119aa493e5173d894f2302
Svetoslav Ganov [Fri, 15 Jul 2016 19:56:41 +0000 (19:56 +0000)]
Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 19:52:08 +0000 (19:52 +0000)]
Merge "Reduce contention of ApplicationsState locks" into nyc-mr1-dev
Vineeta Srivastava [Fri, 15 Jul 2016 19:44:44 +0000 (19:44 +0000)]
Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 19:08:10 +0000 (19:08 +0000)]
Merge "Align empty views for quicksetting center in detail panel." into nyc-mr1-dev
Junda Liu [Thu, 14 Jul 2016 20:55:03 +0000 (13:55 -0700)]
Add carrier config to report IMEI on CDMA phone.
Bug: b/
29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
Kevin Hufnagle [Fri, 15 Jul 2016 18:58:07 +0000 (18:58 +0000)]
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
am:
68b98bc608
Change-Id: I1ae42e82f830ac939491c7d754d71420ec2092d9
Andrew Solovay [Thu, 14 Jul 2016 22:51:58 +0000 (15:51 -0700)]
docs: Updating image download pages for DP5
Updating with current images, which I've also uploaded to the cloud
share. I briefly made the cloud share public, so I could test the
download links and verify the checksums on the web page against the
downloaded files; the downloads and checksums all worked, so I made
the cloud files private again (so the links in these pages don't
work at the moment).
Also updated the download tables in the internationalized versions
of these files, since it's just a copy/paste.
See first comment for doc stage location.
bug:
29738757
Change-Id: I384786dcdf0dd249be0d1d0e38c88fa2b2109e0b
Kevin Hufnagle [Fri, 15 Jul 2016 18:44:09 +0000 (18:44 +0000)]
Merge "docs: Added note about limited support for hardware key attestation" into nyc-dev
Daniel Yu [Wed, 13 Jul 2016 19:12:59 +0000 (12:12 -0700)]
docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus()
and Direct Boot for DP5
getStorageEncryptionStatus() now returns new
ENCRYPTION_STATUS_ACTIVE_PER_USER if the device is not
using direct boot (and the not-new ENCRYPTION_STATUS_ACTIVE
is returned if direct boot is used)
Bug:
30112425
Change-Id: I27c11b2afe2afd9a19c9f8268f486b09af22e6ac
TreeHugger Robot [Fri, 15 Jul 2016 18:26:50 +0000 (18:26 +0000)]
Merge "Always return valid ClipDescription for ACTION_DRAG_EXITED" into nyc-mr1-dev
Chong Zhang [Fri, 15 Jul 2016 18:26:27 +0000 (18:26 +0000)]
Merge "Don't release surface if relayout is visible" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 18:24:27 +0000 (18:24 +0000)]
Merge "Add ApplicationErrorReport tests" into nyc-mr1-dev
Adrian Roos [Thu, 14 Jul 2016 21:19:55 +0000 (14:19 -0700)]
Add way to set live wallpaper across users
Also adds an entry point for vendor specific services
to SystemUI.
Bug:
30038484
Change-Id: I8f335c1f7de15d619f2c688a8ac95372f166595f
Ruben Brunk [Fri, 15 Jul 2016 18:09:34 +0000 (18:09 +0000)]
Merge "Remove VR package disable logic." into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 18:05:06 +0000 (18:05 +0000)]
Merge "Turn down restore-time logspam" into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 17:53:15 +0000 (10:53 -0700)]
Turn down restore-time logspam
Bug
30160827
Change-Id: I14ccf0a31e5a6882bf189c28c79d1c139ec44bcc
Jason Monk [Fri, 15 Jul 2016 17:54:42 +0000 (13:54 -0400)]
Reduce contention of ApplicationsState locks
Change-Id: I5b2ad52b014eea5bdf77526554eb10f4ba303105
Fixes:
30113789
Fan Zhang [Fri, 15 Jul 2016 17:39:03 +0000 (10:39 -0700)]
Align empty views for quicksetting center in detail panel.
Change-Id: I6d0f1eaeee1ea59890cf0589381332a3f3a8fb4e
Fixes:
29981651
Bert McMeen [Fri, 15 Jul 2016 17:19:42 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I65edec2172b347df56a4be699060bd456cfe3923
Bert McMeen [Fri, 15 Jul 2016 17:14:06 +0000 (17:14 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51
am:
274d904d4c
Change-Id: I2bf5f981b7b8b001ce3d25ff0179270e23d08588
Bert McMeen [Fri, 15 Jul 2016 17:08:31 +0000 (17:08 +0000)]
Docs: Behavior changes such as activity dismissal
am:
f506485b51
Change-Id: Ia133aef14f006a15304ca744d933eb8934c80bb5
Jason Monk [Fri, 15 Jul 2016 16:55:22 +0000 (16:55 +0000)]
Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev
Esteban Talavera [Fri, 15 Jul 2016 16:14:20 +0000 (16:14 +0000)]
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 16:04:17 +0000 (16:04 +0000)]
Merge "QS Detail: Don't animate switch before panel open" into nyc-mr1-dev
Pankaj Kanwar [Fri, 15 Jul 2016 15:10:26 +0000 (15:10 +0000)]
Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 14:37:07 +0000 (10:37 -0400)]
QS Detail: Don't animate switch before panel open
This will make it more obvious that wifi gets turned on by opening
the panel as the animation of the state change will be visible.
Change-Id: I6ceb0bef914a9ff368b1bdb750d19aeb43593e78
Fixes:
29057528
Julia Reynolds [Fri, 15 Jul 2016 14:34:21 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I0d01f75f3ba19142675de8c589071af9888deeab
Julia Reynolds [Fri, 15 Jul 2016 14:27:24 +0000 (14:27 +0000)]
Merge \\\\"Check caller\\\\'s uid before allowing notification policy access.\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89
am:
e1d8b98189 -s ours
Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237
Julia Reynolds [Fri, 15 Jul 2016 14:17:56 +0000 (14:17 +0000)]
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c
am:
5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
Julia Reynolds [Fri, 15 Jul 2016 14:12:23 +0000 (14:12 +0000)]
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am:
234e1c25e4
am:
8e8bb6633c
Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3
Julia Reynolds [Fri, 15 Jul 2016 14:06:49 +0000 (14:06 +0000)]
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am:
234e1c25e4
Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
Julia Reynolds [Fri, 15 Jul 2016 13:59:04 +0000 (13:59 +0000)]
Merge "Check caller's uid before allowing notification policy access." into mnc-dev
Ricky Wai [Fri, 15 Jul 2016 10:09:39 +0000 (10:09 +0000)]
Merge "Remove tied profile encryption key cache in keystore" into nyc-mr1-dev
Tony Mak [Fri, 15 Jul 2016 07:17:42 +0000 (07:17 +0000)]
Merge "Whitelisting device provisioning package from app standby" into nyc-mr1-dev
Alan Leung [Fri, 15 Jul 2016 06:00:06 +0000 (06:00 +0000)]
Merge "Fix thread priority after boosting." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:44:03 +0000 (05:44 +0000)]
Merge "media: document new temporal layering schema values." into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 05:43:39 +0000 (05:43 +0000)]
Merge "media: clarify MediaFormat.KEY_I_FRAME_INTERVAL" into nyc-mr1-dev
Lajos Molnar [Fri, 15 Jul 2016 02:54:50 +0000 (19:54 -0700)]
media: clarify MediaFormat.KEY_I_FRAME_INTERVAL
Bug:
30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
TreeHugger Robot [Fri, 15 Jul 2016 03:59:48 +0000 (03:59 +0000)]
Merge "APF: filter unwanted ARP replies" into nyc-mr1-dev
Tony Mak [Thu, 14 Jul 2016 07:30:18 +0000 (15:30 +0800)]
Whitelisting device provisioning package from app standby
Change-Id: Ib9cb7a3fdf7aa16a97f22eacbed872880b7f9fbe
Fix:
29892977
Lajos Molnar [Fri, 15 Jul 2016 02:10:27 +0000 (19:10 -0700)]
media: document new temporal layering schema values.
Also fix doc as these are advertised on the output port.
Bug:
30150921
Bug:
27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
Andrew Solovay [Mon, 11 Jul 2016 22:05:56 +0000 (15:05 -0700)]
docs: Updating N Preview release notes for DP5
See first comment for doc stage location.
Change-Id: Ic5d6492b8eaf45016cf0711ef1833be220917ead
Svet Ganov [Thu, 14 Jul 2016 23:08:09 +0000 (16:08 -0700)]
Prevent apps to overlay other apps via toast windows
It was possible for apps to put toast type windows
that overlay other apps which toast winodws aren't
removed after a timeout like toasts are.
Now to add a toast window one needs to have a special
token. The token is added by the notificatoion manager
service only for the lifetime of the shown toast and
is then removed including all windows associated with
this token.
This prevents apps to add arbitrary toast windows. The
token is passed in the app domain in the request to
construt and add the toast window which allows a bad
app to add arbitrary toast windows. However, this is
fine since the token will be invalided and all of its
windows removed after the toast for which it was
create times out.
We do not care of braking apps that add toast windows
directly due to the security and privacy implications
of arbitrary UI redressing. Also we have dedicated
Toast APIs which are the way to add this time of UI.
bug:
30150688
Change-Id: I65372c81a791489de89fb2886cc96392c28680bb
Chris Tate [Fri, 15 Jul 2016 01:38:02 +0000 (01:38 +0000)]
Merge "Thread-safe pipe teardown during restore operations" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:37:19 +0000 (01:37 +0000)]
Merge "Dump the source uid of scheduled jobs" into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 01:36:46 +0000 (01:36 +0000)]
Merge "Test existence of wallpaper files before backing them up" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 01:33:32 +0000 (01:33 +0000)]
Merge "Fixed a bug where the burmese clock could overlap" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 00:39:04 +0000 (00:39 +0000)]
Merge "Handle locale change and pacakge change in different way" into nyc-mr1-dev
Chong Zhang [Thu, 14 Jul 2016 22:09:12 +0000 (15:09 -0700)]
Don't release surface if relayout is visible
There is a delay from the point we notify the client to go invisible,
to the point that request is handled. If a relayout VISIBLE happens
during this period, we need to give the client a surface so that any
pending draws will go through.
bug:
30066966
Change-Id: I0cd4e4be49f3d2d8f726963ed9e23bf0327e1d0f
Lajos Molnar [Fri, 15 Jul 2016 00:25:29 +0000 (00:25 +0000)]
Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev
Vladislav Kaznacheev [Fri, 15 Jul 2016 00:15:02 +0000 (17:15 -0700)]
Always return valid ClipDescription for ACTION_DRAG_EXITED
Bug:
30148704
Change-Id: I5f5cbb35a343e6ef61bed9ff92e3921a4ecce0c0
TreeHugger Robot [Fri, 15 Jul 2016 00:09:46 +0000 (00:09 +0000)]
Merge "Fixed the heads up disspearing bug for real" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 00:04:20 +0000 (00:04 +0000)]
Merge "Don't activate Night display until user setup is complete" into nyc-mr1-dev
Chris Craik [Fri, 15 Jul 2016 00:02:25 +0000 (00:02 +0000)]
Merge "Fix rotated clip regions" into nyc-mr1-dev
Doris Liu [Thu, 14 Jul 2016 23:00:52 +0000 (16:00 -0700)]
Ensure native allocation/free is correctly registered
This CL fixes an issue where one of the constructors creates a
native tree object without registering the allocation of its
root group with the NativeAllocationRegistry.
BUG:
28943866
Change-Id: Ic8db3f2fa8036dfabdbc1a1fcbd58d08a0379e2d
TreeHugger Robot [Thu, 14 Jul 2016 23:45:11 +0000 (23:45 +0000)]
Merge "Fix bug where swiping on the fp sensor when the screen is off causes blank screen" into nyc-mr1-dev
Selim Cinek [Thu, 14 Jul 2016 23:32:23 +0000 (16:32 -0700)]
Fixed a bug where the burmese clock could overlap
Change-Id: I9ccd2fd5fd89c973d937196aa16d459e46eca769
Fixes:
26015598
TreeHugger Robot [Thu, 14 Jul 2016 23:26:55 +0000 (23:26 +0000)]
Merge "Properly disable WiFi tethering" into nyc-mr1-dev
Bert McMeen [Thu, 14 Jul 2016 23:11:18 +0000 (16:11 -0700)]
Docs: Behavior changes such as activity dismissal
Bug:
29447512
Change-Id: I5360212eab317fab5198afd36780c2d3cfe4d255
Justin Klaassen [Tue, 12 Jul 2016 04:26:46 +0000 (21:26 -0700)]
Don't activate Night display until user setup is complete
Bug:
30042357
Change-Id: I575c5e44b4109816ae14cc139ff171f141e6088f
TreeHugger Robot [Thu, 14 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Merge "Fixed a bug where the header was positioned wrong" into nyc-mr1-dev
Philip Cuadra [Thu, 14 Jul 2016 22:26:20 +0000 (22:26 +0000)]
Merge "Call into ART to get the location of the odex/oat file to pin" into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:26:03 +0000 (22:26 +0000)]
Merge "Don't count zero width space in hasGlyph layout" into nyc-mr1-dev
Raph Levien [Thu, 14 Jul 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Treat U+2695, U+2640, U+2642 as emoji characters." into nyc-mr1-dev