tree 999561222e8fc88c13bac2e9050cae5050d37c86
parent df66d4abf0c994b5f53ec0978ba97e746852e3e9
parent 350a930c68fa35d912e11d319848ac44bd868d59
author Jason Monk <jmonk@google.com> 1464811740 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464811740 +0000

Merge "onResume -> onStart, onPause -> onStop" into nyc-dev