tree 29bef7c7ee1b4f302dc86d26dabcf37776987c22
parent 4a373829b099ba8aab9c4b88c25cd0391b5051dc
parent 7de829dfae22e9be8aa973a721d59c48d7f6fe7d
author Narayan Kamath <narayan@google.com> 1450958707 +0000
committer android-build-merger <android-build-merger@google.com> 1450958707 +0000

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

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