diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-21 17:22:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 17:22:05 -0700 |
| commit | 27ca388728288c24ee1e784ff17bd6c9f4ca9a28 (patch) | |
| tree | 7c11c85aa19e50b746ae790bc99b946d8290d770 /opengl | |
| parent | 470ce098f82047304f78162646d65ed3a908e95e (diff) | |
| parent | 46beb43357e32507189203db4626d0df954abe62 (diff) | |
| download | frameworks_base-27ca388728288c24ee1e784ff17bd6c9f4ca9a28.zip frameworks_base-27ca388728288c24ee1e784ff17bd6c9f4ca9a28.tar.gz frameworks_base-27ca388728288c24ee1e784ff17bd6c9f4ca9a28.tar.bz2 | |
am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '46beb43357e32507189203db4626d0df954abe62'
* commit '46beb43357e32507189203db4626d0df954abe62':
Mirror the preview for front-facing cameras. do not merge
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions