tree 5ae35f3b56d25e93e9337839c1a4a52314a06db8
parent a605d75628c1e3ad48236b92cfa05aaf138ee23f
parent 4424ddfba1e07a4f749dc1a6233d87c9a1206df2
author Jordan Liu <jminjie@google.com> 1506976749 +0000
committer android-build-merger <android-build-merger@google.com> 1506976749 +0000

Merge "Save and restore the instance state of StkDialogActivity correctly"
am: 4424ddfba1

Change-Id: Ic48e6556684f8ccaa9c24b60eef972ad0a5a1fa6