tree 8f3da2be417b57cfa18bde3ceb68d3bb2b7a67bc
parent 865560acfddce411fb12297fb74b93ba962ccfe9
parent 735318475bc8480cb15e528fc058d9800805a4a6
author Chen Xu <fionaxu@google.com> 1472061061 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472061061 +0000

Merge "avoid phone crash from exported activities" into nyc-mr1-dev