OSDN Git Service

Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 1 Jun 2016 20:09:00 +0000 (20:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 1 Jun 2016 20:09:00 +0000 (20:09 +0000)

Trivial merge