tree 9e1a2d46ac99dcfba63f863d3bd5efb495a172ae
parent 4e02563aa136f7ab38677e9dae41848385537df6
parent 05ba2eca39c84f55a04e213c25a7417bcb6ab8ec
author Walter Jang <wjang@google.com> 1432762465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432762465 +0000

am 05ba2eca: am 24498d61: Merge "Distinguish between editor back button presses and framework stopage" into mnc-dev

* commit '05ba2eca39c84f55a04e213c25a7417bcb6ab8ec':
  Distinguish between editor back button presses and framework stopage