tree c7468ca0fa04bd408fdfe4151bc16f59358bfa7b
parent f9f673b6d75a48a1ac33abb3c5372a9ee6cd3d4f
parent 458cfe9becb16b9b7a90784b813ad628f3114e6d
author Narayan Kamath <narayan@google.com> 1450958835 -0800
committer android-build-merger <android-build-merger@google.com> 1450958835 -0800

Merge "Add core-oj to the list of core library jars"
am: 458cfe9bec

* commit '458cfe9becb16b9b7a90784b813ad628f3114e6d':
  Add core-oj to the list of core library jars