tree 1b264154ea29495725cb8bd8ffe8870efc287ca1
parent 924939bf421665b8f4b3412b33e9144f1863fe79
parent 085abab5bab1364a66924fe0a07f277d43edd6dc
author Adam Lesinski <adamlesinski@google.com> 1493077033 +0000
committer android-build-merger <android-build-merger@google.com> 1493077033 +0000

Merge changes I7d2b7e50,I784406a6 into oc-dev am: 76831f7e39
am: 085abab5ba

Change-Id: Ic5e4a29f2b81aac05cf53b99190e92989163e412