tree 7e3c837095c24eead729058d8e577d19fed2e579
parent 53c5dadbb8ddf0898e91e129aee4a19f1028175a
parent 0a247995d79149b891ab6fad5dc0a1cb584d111c
author Zhentao Sun <robinvane@google.com> 1441069545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441069545 +0000

am 0a247995: am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev

* commit '0a247995d79149b891ab6fad5dc0a1cb584d111c':
  Don't launch the camera if it already in foreground.