OSDN Git Service

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

Change-Id: Iea8951ca4ddc1b69ca57da6b9cbaf1bcdd860bcc


Trivial merge