| commit | ea0e39945f28665d2874e2f6a5fa3eb66e189737 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Nov 12 14:29:19 2014 -0800 |
| committer | Qiwen Zhao <zhao@google.com> | Wed Nov 12 14:29:19 2014 -0800 |
| tree | f02160ee48f3ea9749d35f90826a9813989a5373 | |
| parent | bc6bb3b6428d7e41282d3d171d73f5305b04c437 [diff] | |
| parent | 3f57f7a95e6f82bcb30df5bfc2870aa022fa4a17 [diff] |
Merge branch 'lmp-mr1-ub-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/packages/apps/Camera2 into lmp-mr1-ub-dev