| commit | 071f7ce2193f8686c8018d7c4533b04b2c7f25fb | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Mon Jun 16 15:05:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 16 15:05:35 2014 +0000 |
| tree | 4bd87fdbaa5f1e2e9f3caf4eac65475fc3ed51a8 | |
| parent | 3296e5541dfc25d5100bf9c929932c0935e9ef14 [diff] | |
| parent | ccd80c7277e2f63ac155127068cfad25de3ace4f [diff] |
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."