OSDN Git Service

Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926
authorAdam Seaton <aseaton@google.com>
Wed, 12 Apr 2017 23:07:46 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 23:07:46 +0000 (23:07 +0000)
am: 2596931e86

Change-Id: I3084760ec275de17fa024379decf98303799e213


Trivial merge