tree a3081109231817583ba1b60d7411f3c1f362432b
parent 909abc0bdb0e5e90390c61b9c42e91b0086374f2
parent 5b32ea3dec3dd00f3fabf1a7f5075221d9e796a6
author Jorim Jaggi <jjaggi@google.com> 1504007518 +0000
committer android-build-merger <android-build-merger@google.com> 1504007518 +0000

Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev am: 54f40fa1e6
am: 5b32ea3dec

Change-Id: I014873b33788ed6154e06d45d8f8177a5028e973