OSDN Git Service

Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io...
authorAurimas Liutikas <aurimas@google.com>
Tue, 14 Jun 2016 01:16:53 +0000 (01:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 01:16:53 +0000 (01:16 +0000)
am: 3f1741a19c

Change-Id: Ib7ecbfec74f43726fdd1c0b935d995c3f57f613d


Trivial merge