tree 2d57c40afa64beb9e8c224eafbd740859ec31a15
parent 19bb6c35ca8e7ad7c6368b553fa76fcd22c9b4fa
parent 479d915db525e59af3fbbddb303d178dd9b58869
author Nikolas Bravo <ngbravo@google.com> 1499976355 +0000
committer android-build-merger <android-build-merger@google.com> 1499976355 +0000

Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
am: 479d915db5

Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b