tree 233a3050fbea0ec4fbe948a48a598b4abd15176e
parent 13ea79dea443831c1936f9ac47109144705149f6
parent 6e02dc8cd69720043bd36ae29fe93e767e3b38a9
author Steve McKay <smckay@google.com> 1431361261 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431361262 +0000

Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev