| commit | e8140b2cea92c30c1c4805b19ec15b30bd00edbf | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Wed Oct 12 15:34:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 12 15:34:28 2011 -0700 |
| tree | 4937e24115cc7b234486eae0c5d97194b2a520f8 | |
| parent | e25bc413d37a2043a888aff9e2fe576243c47b9a [diff] | |
| parent | a9a21c2aa900fe63c4e9ccce4d62387d921a4b74 [diff] |
am a9a21c2a: (-s ours) Merge "DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215" into ics-mr0 * commit 'a9a21c2aa900fe63c4e9ccce4d62387d921a4b74': DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215