tree 27602d26045560fb9e27b02fcb8fd36f5ff746cf
parent 1955aa17aa83576ff02f068b29cd4998c4b1d8d6
parent 988f3bcb21b7026cfab89d22ef912f98c9c9f8a2
author Philip P. Moltmann <moltmann@google.com> 1463159655 +0000
committer android-build-merger <android-build-merger@google.com> 1463159655 +0000

Merge "Use badged icons for permissions." into nyc-dev
am: 988f3bcb21

* commit '988f3bcb21b7026cfab89d22ef912f98c9c9f8a2':
  Use badged icons for permissions.

Change-Id: I922e3df467d31be00c80128c91330b381853ce70