| commit | 0c3d73fffec4e13a38cd959e8163625b35c2b603 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jun 25 21:39:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 21:39:07 2014 +0000 |
| tree | 23adae510a4572685a8715ff4dbe3c0b517d5f0a | |
| parent | f788016daaf66eab58496ae99093bb1b9d94d4c4 [diff] | |
| parent | 48e29b00b6dfcad2588f79fa67f6317d9d34008e [diff] |
am 48e29b00: am b849f6dd: Merge "Fix linux build." * commit '48e29b00b6dfcad2588f79fa67f6317d9d34008e': Fix linux build.