Commit b35b58c6 authored by Trevor Johns's avatar Trevor Johns Committed by android-build-merger
Browse files

Resolve merge conflicts of d6a72ad7 to nyc-dev am: 72880489 

am: 98ac9d67

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

Change-Id: Ibe81a1f065c488e827e00b9a2f5671b087cbf006
parents 73df0651 98ac9d67
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