am c502ad99: Merge "Fix NPEs in ActionBarControllerTest" into lmp-mr1-dev

* commit 'c502ad9957b6e1c32ffa7c4043fe1cda103466be':
  Fix NPEs in ActionBarControllerTest
tree: 237ef34d0eff4ff53a6b8b891834beae9a63684a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags