OSDN Git Service

Merge changes I281c748a,Ia5b68d59 into pi-dev
authorChavi Weingarten <chaviw@google.com>
Fri, 18 May 2018 22:04:27 +0000 (15:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 22:04:27 +0000 (15:04 -0700)
commita65eba0132d5d48b86ee85e43d9b0ccc6f6849ce
tree398afb7f10ff8431154a92992adf7f9bcfbb22e9
parent89876010f173b7280bb6c095e0750c6c0103f51e
parent9335f1e3637af9c2b146ab1ff2cf60349d538e0d
Merge changes I281c748a,Ia5b68d59 into pi-dev
am: 9335f1e363

Change-Id: Ie9562fa69fe9dc52f0464d208e1153420bb7c872