OSDN Git Service

Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
authorChong Zhang <chz@google.com>
Wed, 8 Jun 2016 01:22:43 +0000 (01:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 01:22:43 +0000 (01:22 +0000)
am: 723e5afa9e

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc


Trivial merge