tree 2c8253f421d79332cdebc9378ba73eaf98f0aee5
parent 3896eec1ef4508afac2d7f86b820166fc16b80bc
parent 4eb16f23a5d4adccab0a8ca94d117f83a0a007af
author Fred Quintana <fredq@google.com> 1303420805 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303420805 -0700

am 4eb16f23: am d797c1b5: (-s ours) am 922fca93: Merge "Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well." into gingerbread

* commit '4eb16f23a5d4adccab0a8ca94d117f83a0a007af':
  Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.