From: Dan Albert <danalbert@google.com>
Date: Mon, 8 Jan 2018 21:37:49 +0000 (+0000)
Subject: Merge "Move from stlport to libc++." am: 6924e012fd
X-Git-Tag: android-x86-9.0-r1~6^2^2~3
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Gallery2.git;a=commitdiff_plain;h=0d9941f3db

Merge "Move from stlport to libc++." am: 6924e012fd
am: 268c9153a3

Change-Id: I9562c0830a863e8db6d83b1a6e1c03d5d3b0fadc
---

0d9941f3db35f9eeddd51f8a26e2a13ef41da4a0