tree 4cf6824922c030f3a7e64b3e3a081ce36d680ebf
parent 27090c92b75ffa7eef84fdffff81dadaffc8f668
parent a760f21f3a8ce066b444f79d730a11ee86bdc1e9
author Fred Quintana <fredq@google.com> 1303418709 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1303418709 -0700

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