tree 9e8ceeea8282755e45f415461413da96a0422bdb
parent c570b67705443047fc589abba516280a3e91720a
parent 8addd1f198c456255e171a9f6effd7400e5fa2d2
author Ian Rogers <irogers@google.com> 1400781471 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400781471 +0000

am 8addd1f1: am 65e3b69b: Merge "Move modify_ldt_lock into global lock order."

* commit '8addd1f198c456255e171a9f6effd7400e5fa2d2':
  Move modify_ldt_lock into global lock order.