| commit | 4847baf9b21aa511837f50f4c38a4d0310df64c0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:49:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:49:49 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 489bfee0a182a93c2a1606926d7ef3845604452b [diff] | |
| parent | 3080909fa87a1a19767d3f808f75b0df36ea2822 [diff] |
am 5e6d1dcf: (-s ours) am 3d561748: am ec035950: Merge "Clean up -p handling slightly." * commit '5e6d1dcfac43422a135b1540c4bb245bfe89b294':