tree f74ea8239f2972433d34cbb6d5196db16765e4d5
parent 2a43dcbc106660ad3c5eeb17cdf30fc290b5850b
parent 54f40fa1e6bdd27e10738d09e1a123ca8c99f412
author Jorim Jaggi <jjaggi@google.com> 1504006886 +0000
committer android-build-merger <android-build-merger@google.com> 1504006886 +0000

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

Change-Id: I908fe0868bbc85b959e9d41afa709019669131da