tree eb512de5b12d43198ff926090b4138c62432166d
parent 5e7d2af82552221b633af9fa4d714fa084efe920
parent 0c06555dca7ae809d6d7a7b9c82276ee6cf39e5e
author Diego Perez <diegoperez@google.com> 1491843336 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1491843341 +0000

Merge "Inline some of the files into the tests"