tree d130c4e550ab3859c85b8e88016c0693420ca19c
parent 45382e86f640ef098f613c9208a64d14ef50c9f9
parent 001dc31f0b6e78b70db83c6d9b8cc7872e540965
author Angus Kong <shkong@google.com> 1393551388 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1393551389 +0000

Merge "Show progress UI in secure camera." into gb-ub-photos-denali