| commit | 41663542e572c06b1be98d0b4c0bc198a43242e0 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Nov 12 23:50:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:50:38 2014 +0000 |
| tree | e0a2b6c505f8337c8ebd4ac4fe515f8624b204a3 | |
| parent | 970244510e092d91c11b213440cfa6c194cfafca [diff] | |
| parent | 7ce2ce7d166d839eb62e03b4cdad7fad4b5e267a [diff] |
am 7ce2ce7d: Merge commit \'318eeb225f4567a8c2a6fe14baa06e8923ebe622\' into lmp-mr1-dev * commit '7ce2ce7d166d839eb62e03b4cdad7fad4b5e267a': Cleanup: handle API 1 error callback in CameraExceptionHandler.