tree 96eac85b9162bca78bd5be60d51fe62f93b7f3c5
parent ecd3935a154b3747bd9bdb18190004395cfd5eb9
parent fac07da66d69a7d98a33932f44d1712429a0b2c9
author Andreas Gampe <agampe@google.com> 1450923242 -0800
committer android-build-merger <android-build-merger@google.com> 1450923242 -0800

Merge "ART: Change Init{From,Without}Image to return bool" am: 0f0d5f370d am: 1291cfd7bd
am: fac07da66d

* commit 'fac07da66d69a7d98a33932f44d1712429a0b2c9':