tree 4d46680f72c4e9e96a499c49d15461f70aa86af2
parent a350db60bdcd0e05613466739dc6d41cd1caf639
parent 61196fef1fe1d1975765bf435729669764c2221b
author Bryce Lee <brycelee@google.com> 1498510740 +0000
committer android-build-merger <android-build-merger@google.com> 1498510740 +0000

Merge "Revert "Add ActivityInfo logging."" into oc-dev
am: 61196fef1f

Change-Id: I7f11b4a66def7cb49ba20a4ab4772eea0a25ef16