| commit | 4c694b39279bdb09bb4c3ee8c29fe84d58931e41 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Aug 27 05:19:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:19:53 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 94ba4be8611a53c6a1b464f288e9c50578252def [diff] | |
| parent | b6166af7a4935ea42f548ec2b9c8aa7098e70f88 [diff] |
am b6166af7: (-s ours) am 45b821df: am ef426568: am 3b7ca5d1: am efc51f0f: am 93a8df0e: am 61934faf: am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp * commit 'b6166af7a4935ea42f548ec2b9c8aa7098e70f88':