| commit | dd4524e39b7d58615d8c1f862564a331e1b7b020 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Oct 27 21:47:51 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 27 21:47:51 2011 +0000 |
| tree | 14923f1995903d1150751466015d003c06a69f6c | |
| parent | f52717eccfde0e7523321eecc8d165e44b6ce6e9 [diff] | |
| parent | 91254c988c5ce1fd6c61c831c39065f9a4fb53a2 [diff] |
am b4e50fe0: Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1 * commit 'b4e50fe03c269e0c6b60db1702993ac0649bb5a2': docs: quick update for fragments guide to consider handsets and new figure (bigger update coming later)