| commit | d797c1b5d95850828ff5d20f0842549d72839bfc | [log] [tgz] |
|---|---|---|
| author | Fred Quintana <fredq@google.com> | Thu Apr 21 13:47:42 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 21 13:47:42 2011 -0700 |
| tree | 5e92d7c4d12f81195d6d5e1150632c75e7bd6295 | |
| parent | f6147419f455955e219ab0cd41c677817b817ff0 [diff] | |
| parent | 922fca939412e1090bf8f240b51057793c9c7bb6 [diff] |
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 '922fca939412e1090bf8f240b51057793c9c7bb6': 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.