tree c25fbb3bb93cc49306bd03e660f3e4b3b8bb090e
parent a6d0b94b378c60dc187b74184c62bc26bff52fa1
parent bd400d88d90bed1e50584190a0f4ac703b3e22f7
author Inseob Kim <inseob@google.com> 1536116306 -0700
committer android-build-merger <android-build-merger@google.com> 1536116306 -0700

Merge "Fix improper transition from gallery to camera"
am: bd400d88d9

Change-Id: I0f805deaf14c21eb0a1ec340f8f649d78c983880