am 5e6d1dcf: (-s ours) am 3d561748: am ec035950: Merge "Clean up -p handling slightly."

* commit '5e6d1dcfac43422a135b1540c4bb245bfe89b294':
This commit is contained in:
Elliott Hughes 2015-08-27 11:49:49 +00:00 committed by Android Git Automerger
commit 9eb6530c80

Diff content is not available