| commit | f9eba6bfb98faa66d0e200f2a0ed55e404915400 | [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 | 0a9f2449ff1ecabfbf9ce5de6ad086fffc17e4d3 | |
| parent | 28e9733e35f3a3b7f7780bfe45507b6e79a05a6f [diff] | |
| parent | b4e50fe03c269e0c6b60db1702993ac0649bb5a2 [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)