| commit | 1235625ef08397dfa21dadb1c42237ec66056185 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:31:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:31:07 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | b996340dbbed511b5546d3446c0988ba2e7db1fe [diff] | |
| parent | 4847baf9b21aa511837f50f4c38a4d0310df64c0 [diff] |
am 9eb6530c: am 5e6d1dcf: (-s ours) am 3d561748: am ec035950: Merge "Clean up -p handling slightly." * commit '9eb6530c80f304e58cbcd869a04ee213380fd482':