tree b3ad8af4469c88f93a633e5fea65ccdca308f6d7
parent 9c6f41e3eb2258d52480be04dd8916a10f8be8db
parent 2383f2200ab0c2dbd71708b5c1fb6af98db408fa
author Jason Sams <jsams@google.com> 1394067362 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1394067362 -0800

am 2383f220: Merge "Validate objects are from the correct context."

* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.