tree 76723256a5a131192bef3abc9b84b9ceea367498
parent a83bbf35165dabab5da32cc37859319c6674dd01
parent 08498c32f4dcde61e7539f70910983d0766b9fd1
author Erik Kline <ek@google.com> 1515673891 +0000
committer android-build-merger <android-build-merger@google.com> 1515673891 +0000

Merge changes I47ccfa99,I5db1de3e
am: 08498c32f4

Change-Id: I8077e06fc9eeccbb776a3b09a117c66eb9074140