Commit 98ac9d67 authored by Jeremy Walker's avatar Jeremy Walker Committed by android-build-merger
Browse files

Resolve merge conflicts of d6a72ad7 to nyc-dev 

am: 72880489

* commit '72880489':
  Removes BIND_LISTENER from manifests for RuntimePermissionsWear sample.

Change-Id: I532d10fe213cd4a405a035a315ca04a40e4ea303
parents 504783d0 72880489
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment