| commit | 4c72a99b9b8849be391b62d6ba913a3d567707eb | [log] [tgz] |
|---|---|---|
| author | Xia Wang <xiaw@google.com> | Fri Jul 30 13:48:08 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 13:48:08 2010 -0700 |
| tree | 5f14dceb012a33f6fed94def4cd1a91bdcc0191d | |
| parent | faa530146be1fd6de3cbeba7d60d88fc451de3f3 [diff] | |
| parent | 2e977068a167ea597b6514501d2221c5a4e22574 [diff] |
am 2e977068: (-s ours) am 060f053e: DO NOT MERGE Merge commit '2e977068a167ea597b6514501d2221c5a4e22574' * commit '2e977068a167ea597b6514501d2221c5a4e22574': DO NOT MERGE