Merge "onResume -> onStart, onPause -> onStop" into nyc-dev am: 67e87fa4e9
am: 2cf7ecc1d4
-s ours
* commit '2cf7ecc1d436b4a37733af584867922700d3fcc2':
onResume -> onStart, onPause -> onStop
Change-Id: I9ed1382d6ecc6e3206af357e66fff986fa1914f6
This commit is contained in: