| commit | 6a87aed346563980ac29f441125ab0073086f363 | [log] [tgz] |
|---|---|---|
| author | Zhentao Sun <robinvane@google.com> | Tue Sep 01 16:10:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 16:10:18 2015 +0000 |
| tree | 80a978310d6035b1ab9ea717a5ffd793055b1892 | |
| parent | 6a89feae871e7c4c19ddc2a7d3b74930b85b4584 [diff] | |
| parent | eaed83137cd06312f96b2fc5c22de4c1e94e39ca [diff] |
am eaed8313: am 0a247995: am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev * commit 'eaed83137cd06312f96b2fc5c22de4c1e94e39ca': Don't launch the camera if it already in foreground.