OSDN Git Service

Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev
authorVladislav Kaznacheev <kaznacheev@google.com>
Thu, 5 May 2016 23:16:07 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 May 2016 23:16:07 +0000 (23:16 +0000)
commitf1febf27006a98adc5de584e7703338b85208ed3
tree727f9ede89407f3d6c4e6e59f79bfed249642141
parent3f0db943c589738fc09e7bb45c10a319b41955fa
parent7d2a0a05715841b582cbaefa3fd0e0a542064556
Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I7996b43fa80b5965feb69028be2526faa379a134