| commit | 93d1c2c54eaad2365ab100a9e8282a4a1a571724 | [log] [tgz] |
|---|---|---|
| author | shared_user android-merger-prebuild <android-merger@google.com> | Tue Jan 18 08:24:17 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 18 08:24:17 2011 -0800 |
| tree | f580f9cec1c429f891eecdc4819b1c4aa1bd4e69 | |
| parent | 04f4e772b1c6c40aedb6a68a5817a37586ce24f8 [diff] | |
| parent | be7ca98a86a6fc6de822a410c3234fbccd67fd0c [diff] |
am be7ca98a: reovle conflicts for cc089099 * commit 'be7ca98a86a6fc6de822a410c3234fbccd67fd0c': update sdk template... thought this was merged already, but also re-add section for offline preview