tree e4da097102db128f64797e073187d9e1230784c3
parent 07fed30c31e0a415ea6a57c359e7bc7318f7a3b3
parent af76df93e31c9e36fc3706c62b7a8b7df683a1a5
author Philip P. Moltmann <moltmann@google.com> 1529084914 -0700
committer android-build-merger <android-build-merger@google.com> 1529084914 -0700

Merge "Abbreviate permission labels less aggressively" into pi-dev
am: af76df93e3

Change-Id: I61a45dd4489c930f2c5b3fbcf6f7632771d6f18e