tree 4bd87fdbaa5f1e2e9f3caf4eac65475fc3ed51a8
parent 3296e5541dfc25d5100bf9c929932c0935e9ef14
parent ccd80c7277e2f63ac155127068cfad25de3ace4f
author Stephen Hines <srhines@google.com> 1402931135 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402931135 +0000

am ccd80c72: (-s ours) am 776d06e1: (-s ours) Merge "DO NOT MERGE: Disable GPU RS driver due to AOSP incompatibility."

* commit 'ccd80c7277e2f63ac155127068cfad25de3ace4f':
  Merge "DO NOT MERGE: Disable GPU RS driver due to AOSP incompatibility."