tree ec28e924c316e99a18f1036a6e78c2c698268ffe
parent 78ad129e12485df119c0294f19bd5f8828b9b992
parent 401c1f93403b6c349a6b11c815ce0d4388823010
author Inseob Kim <inseob@google.com> 1536116857 -0700
committer android-build-merger <android-build-merger@google.com> 1536116857 -0700

Merge "Fix improper transition from gallery to camera" am: bd400d88d9 am: 325f17593d
am: 401c1f9340

Change-Id: I781dd1bdea71e222b5b61c2869aef1624aeb1e93