tree 0cedcacc1580abb0a857d55d26badfdbfac8f986
parent 307e12d42944e9a91434f48a4cab473f31883372
parent 856441d07fcf3b4c19b0d0fe04527e30969379a7
author Tom Cherry <tomcherry@google.com> 1490668804 +0000
committer android-build-merger <android-build-merger@google.com> 1490668804 +0000

Merge "init: remove superfluous forward definitions" am: deb23ba2c1 am: 256c8f5076
am: 856441d07f

Change-Id: I6f3a642497d549a766146dfbb9b0cf72497ed85f