| commit | 66f3ca1c0570271e6c4893497eafd9b15f3745f4 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Jan 26 19:13:54 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 19:13:54 2011 -0800 |
| tree | 4b0bdfaf176ad456abb630090dbe5b654a2efc12 | |
| parent | 3a6b7be25d8158c471034029de138ce0ee8844a3 [diff] | |
| parent | 796f1af04567dab098f638c9166caebc2818efe4 [diff] |
am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp * commit '796f1af04567dab098f638c9166caebc2818efe4': enable preview mode for docs and add api level 10 flag for api level diffs