OSDN Git Service

Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev
authorPaul Stewart <pstew@google.com>
Tue, 20 Dec 2016 05:04:55 +0000 (05:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 05:04:55 +0000 (05:04 +0000)
am: 7eaec196b7

Change-Id: I85c6652d8cdfc387b27fe2a11026c05b5df667a5


Trivial merge