tree f9ac0e9440ff058a879f7a1cff4e1746629612a9
parent 383ce580b1c9e706d1b06a23d81986f3b4ed83fb
parent 67ba2c7fa25a635c640956ff3a5e64164cb23396
author Dianne Hackborn <hackbod@google.com> 1433792779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433792784 +0000

Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev