tree 78b092df0f3cc508f2ed3860bb9500f521a7d8de
parent f61bfdb31eea34f90db88907e32e2b49fe18264c
parent 37bf373b98e7b516d2af7e03bc9b9804e9368142
author Keun young Park <keunyoung@google.com> 1339713533 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339713533 -0700

Merge "fix flaky opengl test" into jb-dev