| commit | 8113f0c6404fa80767946cc53b29df0dd43bfca3 | [log] [tgz] |
|---|---|---|
| author | Marc Blank <mblank@google.com> | Wed Nov 11 17:33:21 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 11 17:33:21 2009 -0800 |
| tree | e3bda551bb7fdfcfd91a1e12f2cac1531ccb3c40 | |
| parent | 07d76156a6608ce753ae02c8fbd48dde7c20114f [diff] | |
| parent | f8de941c955292a9705954bf5b68b469bf734954 [diff] |
am b68cc5b3: (-s ours) am 19887795: am 83b67e61: (-s ours) Fix #2251837; better response w/ security req\'d. DO NOT MERGE Merge commit 'b68cc5b3093b949b5e714d5d4205a8781272ce08' * commit 'b68cc5b3093b949b5e714d5d4205a8781272ce08': Fix #2251837; better response w/ security req'd. DO NOT MERGE