tree 38f40360e615301652b9d5d4b9a9e26e87d747ae
parent 5114840251f9085e3316ccf54e2abee758e677a9
parent 8a50a4aa4636bdc3e0443ea94f5042db18c03ed2
author Nicolas Geoffray <ngeoffray@google.com> 1444031018 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444031018 +0000

am 8a50a4aa: Merge "Change IllegalAccess/IncompatibleClassChange order."

* commit '8a50a4aa4636bdc3e0443ea94f5042db18c03ed2':
  Change IllegalAccess/IncompatibleClassChange order.