tree adb64c650885008a1b21eaedbeb3b9fc778f44aa
parent 186b7821c724d72d44d9d0b0a579fcdbbc4c5191
parent 082c81545be6cbdf14bc91bf42b09acf54ab0816
author Jeff Sharkey <jsharkey@android.com> 1386283259 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283259 +0000

am 082c8154: (-s ours) am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev

* commit '082c81545be6cbdf14bc91bf42b09acf54ab0816':