OSDN Git Service

Merge "kernel.config: aslr test exception in std:stoll"
authorMark Salyzyn <salyzyn@google.com>
Tue, 27 Dec 2016 22:21:59 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Dec 2016 22:21:59 +0000 (22:21 +0000)
am: 55f50c6a4c

Change-Id: Ia46be19245b3d9cfd8fa117614fc0a957cd63bbd


Trivial merge