| commit | 4eb16f23a5d4adccab0a8ca94d117f83a0a007af | [log] [tgz] |
|---|---|---|
| author | Fred Quintana <fredq@google.com> | Thu Apr 21 14:17:31 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 21 14:17:31 2011 -0700 |
| tree | 41b43aba7b9cebf74505cc1b6d562c8ca5022e00 | |
| parent | fb4663a10a59dd662f281514a5ce262113f8bd56 [diff] | |
| parent | d797c1b5d95850828ff5d20f0842549d72839bfc [diff] |
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 'd797c1b5d95850828ff5d20f0842549d72839bfc': 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.