tree b4c9b77ba1e9b435397796000fc522de8d8daf41
parent d6f1f46b2929ed56c73ba32357cde31b82972fbe
parent fe3697bf62d0812209d9355eee082914eaf05689
author Jason Sams <jsams@google.com> 1364425341 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364425341 +0000

Merge "Disable sampler optimization until bugs are fixed." into jb-mr2-dev