tree 0ba49c876e4ac8217e2520dd799bd3ab73a41094
parent aa72971ff3a72e5ff4e1fdcaea21a035f44867a9
parent 6efc3ac6d2094c72b6a2e288101a5349b017274d
author John Reck <jreck@google.com> 1422562614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422562614 +0000

am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev

* commit '6efc3ac6d2094c72b6a2e288101a5349b017274d':
  Allow ~Layer() to happen after onGLContextDestroyed