tree c61fd3ce1368870c2ff7b8129216fcec4f2c0029
parent 60ce77aa3887973188d12d9c91174346b4840bfb
parent 44bd57ee25484bd74025c116f8a83d1df5990f34
author Chong Zhang <chz@google.com> 1471031051 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471031052 +0000

Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev