OSDN Git Service

Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Tue, 8 Aug 2017 11:11:48 +0000 (11:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 11:11:48 +0000 (11:11 +0000)
commit9e14ef5c67eb3665ef13a4ac2fbb3f6581702404
treec57ca2db70b656333f1c34b363b65a94a2c601f1
parentaac5431f6bc11e02d893199c40abb640110705ad
parentd58c6978a7c2d8c2726eb8bc7b28588c8670b95c
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
am: d58c6978a7

Change-Id: I077bc4252e9129960d20109920aa5783c46e0e2d