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)
commitcf896d4bcb12ddf101d6ee4f114126203b24e58d
tree938f290adffafa26f067732d9aa4a1a900fd94e9
parentd1174126d012ddad9402a9def92d46d73ab6706c
parent2596931e8676f5acdc5ef53cec7cc5b0e967e7c0
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926
am: 2596931e86

Change-Id: I3084760ec275de17fa024379decf98303799e213