diff options
| author | Scott Main <smain@google.com> | 2010-04-10 11:42:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:42:10 -0700 |
| commit | 67d6590d242397acbb95814139301d2e6efd3631 (patch) | |
| tree | 1ec15a3843134d70669c387bf95bf24c434952bf /include | |
| parent | 06af762033467bb578b9ed2be8af580cc11505a8 (diff) | |
| parent | 2a547829fe162c52ea1b1168f47d25fb1b40497d (diff) | |
| download | frameworks_base-67d6590d242397acbb95814139301d2e6efd3631.zip frameworks_base-67d6590d242397acbb95814139301d2e6efd3631.tar.gz frameworks_base-67d6590d242397acbb95814139301d2e6efd3631.tar.bz2 | |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions