diff options
| author | Scott Main <smain@google.com> | 2010-04-10 11:48:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-10 11:48:20 -0700 |
| commit | 8e60e09219bc1bfd8a3d514db919a5f7b69fcca3 (patch) | |
| tree | 7ef5429eaa4181c78b79ef7d1476bea87de134e9 /libs/camera/CameraParameters.cpp | |
| parent | e1b462d76d9466bf89771dd0a309d8fd92e2b1de (diff) | |
| parent | 67d6590d242397acbb95814139301d2e6efd3631 (diff) | |
| download | frameworks_base-8e60e09219bc1bfd8a3d514db919a5f7b69fcca3.zip frameworks_base-8e60e09219bc1bfd8a3d514db919a5f7b69fcca3.tar.gz frameworks_base-8e60e09219bc1bfd8a3d514db919a5f7b69fcca3.tar.bz2 | |
am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '67d6590d242397acbb95814139301d2e6efd3631' into kraken
* commit '67d6590d242397acbb95814139301d2e6efd3631':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
Diffstat (limited to 'libs/camera/CameraParameters.cpp')
0 files changed, 0 insertions, 0 deletions