commit | 2fa1cc1b0d9a4f614dd84b34f41d9212d7fd7e41 | [log] [tgz] |
---|---|---|
author | Alan Newberger <alann@google.com> | Fri Dec 19 22:32:34 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 19 22:32:34 2014 +0000 |
tree | 9e76b2d62de7650e0720afe43dd7fb863840a0eb | |
parent | d2e29c342d49c47790c5f98b508bf6f00f54c04e [diff] | |
parent | 4540b9fd5af80bd9508cb56f526560a38780b186 [diff] |
Merge "Restore activity lifecycle when OneCameraManager fails to initialize" into ub-camera-haleakala