tree f0c2cedca28a93ed999119a78ce541bd90de03c6
parent 669e3afeade265e0411d8eb10483410556677a5d
parent 1870114cf6c25748ab66dace4e639c812f43d875
author Tony Mantler <nicoya@google.com> 1453314805 +0000
committer android-build-merger <android-build-merger@google.com> 1453314805 +0000

Merge "Stash dialog info when constructing pref dialogs" into mnc-ub-dev am: 30cf890c76
am: 1870114cf6

* commit '1870114cf6c25748ab66dace4e639c812f43d875':
  Stash dialog info when constructing pref dialogs