OSDN Git Service

Merge changes If30bfa71,Ib8f78967 into oc-dev am: 1fbefc70df
authorAlex Vakulenko <avakulenko@google.com>
Wed, 19 Apr 2017 22:51:50 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 22:51:50 +0000 (22:51 +0000)
am: ad1c74c012

Change-Id: Ica0f63301759d1454fe7d665aaa5ae587cd13782


Trivial merge