commit | d60b0ca1f58301472c82efe8c610c3142b2d6d1b | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Sat Apr 10 11:42:10 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 10 11:42:10 2010 -0700 |
tree | 3e5f86120f1ff365c1753580da989ae35d07c503 | |
parent | 0d63616f229b038ceb42d51b7a5187b58326e4f2 [diff] | |
parent | 7765c25dfa13288b8cb2b021f9438ef52521e741 [diff] |
am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo Merge commit '2a547829fe162c52ea1b1168f47d25fb1b40497d' into froyo-plus-aosp * commit '2a547829fe162c52ea1b1168f47d25fb1b40497d': cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96