tree 0bdac7754dbbb5b287d3aa4d71fe686a228f0c51
parent 5b903deb74ff89bdff3856a317c87999417ec89a
parent 3d48bd3d08a433fda3135a6ab4fbf8803e9c50b3
author Narayan Kamath <narayan@google.com> 1450958705 +0000
committer android-build-merger <android-build-merger@google.com> 1450958705 +0000

Merge "Add core-oj to the list of dependencies"
am: 3d48bd3d08

* commit '3d48bd3d08a433fda3135a6ab4fbf8803e9c50b3':
  Add core-oj to the list of dependencies