| commit | e0e9d181c2f47111868dc200852d39a18d590cf9 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Feb 20 19:39:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 19:39:48 2014 +0000 |
| tree | f23983d3456b16ed472698bc6370f171f6f2b92c | |
| parent | a628c31f3f202215789f170020f7cb5f8c4bb274 [diff] | |
| parent | 511612c31d183da01b4f35b108855433907fdf56 [diff] |
am 511612c3: (-s ours) am 4d2a9ab5: (-s ours) Merge "DO NOT MERGE: Disable GPU RS driver due to AOSP incompatibility." * commit '511612c31d183da01b4f35b108855433907fdf56': DO NOT MERGE: Disable GPU RS driver due to AOSP incompatibility.