tree a0b4f256b28d0e3f5416012f64800575c1d25b4b
parent ccb1ecbe63389714be730cd7ba7366ec803d85fd
author Jeffrey Sharkey <> 1238207998 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238207998 -0700

AI 143382: am: CL 143232 am: CL 143057 Don't NPE when editing a folder name.
  Only happens when user changes orientation while editing, where getFolderById can return the wrong folder type for the given ID.
  Original author: jsharkey
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143382