tree eab7b99c0a9f61b00303026fdc90a4cceb19db7e
parent 0772daa36261813df9c7853426a78ddaa7ec0643
parent 73cb9679fae917ffd72995339c92bd01a10a54e7
author Vinit Deshpande <vinitd@google.com> 1426452157 -0700
committer Vinit Deshpande <vinitd@google.com> 1426452157 -0700

am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e"

merged from goog/mirror-m-wireless-internal-release
73cb967 am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e