| commit | 923fe7f9604ebf8509d32682459e4af9bfd6c028 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jun 23 10:40:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 10:40:04 2014 +0000 |
| tree | 5b0706235b35ec6b16f38045ed7b868100361823 | |
| parent | 7b721088c94a112af74d564fe94ffd1504f50369 [diff] | |
| parent | a1cb1d5cde420ef4169a4a76c9c72ad30803e4ad [diff] |
am a1cb1d5c: (-s ours) am 5a301aee: Merge "LP64 fixes for camera_metadata." * commit 'a1cb1d5cde420ef4169a4a76c9c72ad30803e4ad': LP64 fixes for camera_metadata.