| commit | 88eb24dc50018b032c3485b1d1290b01b244ef73 | [log] [tgz] |
|---|---|---|
| author | Fred Quintana <fredq@google.com> | Thu Apr 21 14:20:05 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 21 14:20:05 2011 -0700 |
| tree | 2c8253f421d79332cdebc9378ba73eaf98f0aee5 | |
| parent | 3896eec1ef4508afac2d7f86b820166fc16b80bc [diff] | |
| parent | 4eb16f23a5d4adccab0a8ca94d117f83a0a007af [diff] |
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.