tree 4614cc0d2ee52869abc6962d36cf26a79eb6a2f6
parent 45d18e2834dcf895bccf6d413f832ba42c8b9016
parent 7f5805d0aa40087bb034b25fb1bb4cc342222010
author Adrian Roos <roosa@google.com> 1501854190 +0000
committer android-build-merger <android-build-merger@google.com> 1501854190 +0000

Merge changes I901908d9,Iac9835ad into oc-dr1-dev am: 47aac56746
am: 7f5805d0aa

Change-Id: Iba30c1811f16ed01194755cd59b8c78af156eb9c