tree ed1a64585bf40b71d0265b15d3005eaed9ab6b4e
parent 62bbca8320c3861fa9b18a7eab26a42116bef9df
parent 1413860cab487d4dfeaf9856e553665dadc5ef1c
author Wei Huang <weih@google.com> 1327087352 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1327087352 -0800

Merge "Do not allow switching to other activities during panorama capture. (do not merge)" into ics-mr1