tree cadb278cc93c07fc8b84b52294e8f1dca9306c8d
parent 0723dbbcac4ef7dc2996d0287e3a7f0387b74795
parent 7a2a96d73c246d976491e294046719186e81ddd8
author John Reck <jreck@google.com> 1441738949 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441738949 +0000

Merge "Fix the framestats test to use its own activity" into mnc-dev