tree 5ef9b3e8cc96be80b6bb3c2f410625232f37e87a
parent 036c643f40dc60a93b5ba1b40687175d03f972c7
parent 1f708c1f53a80cf9cdbe3d337adfad6e54feb819
author Colin Cross <ccross@android.com> 1558705416 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1558705416 +0000

Merge changes I243417e1,I2a40fe87

* changes:
  Convert KeyChain robotests to Android.bp
  Use tip-of-tree robolectric