tree 0b1025ef6e6addd5884984aedadefbf39dff97ae
parent 518e6f3e932563d8a3ead37d04703ca4e5b0191a
author Fred Quintana <fredq@google.com> 1303417308 -0700
committer Fred Quintana <fredq@google.com> 1303417308 -0700

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.

Bug: 4182396
Change-Id: Ic10dc9aa33df01565fcacb8b3aef2852e2b3535b