tree c3ccc022fac4c6d7c575fe168b639f4a8ec708ad
parent 759dfad6b44993204412d69521e74c02d9566211
parent a1823d393a8840e13b7f62dc21aa24c6e7f8a13f
author Narayan Kamath <narayan@google.com> 1450958837 -0800
committer android-build-merger <android-build-merger@google.com> 1450958837 -0800

Merge "Add core-oj to the list of library jars."
am: a1823d393a

* commit 'a1823d393a8840e13b7f62dc21aa24c6e7f8a13f':
  Add core-oj to the list of library jars.