| commit | 48e29b00b6dfcad2588f79fa67f6317d9d34008e | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jun 25 21:35:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 21:35:38 2014 +0000 |
| tree | afe0dc3ed038d8b1d97548831a230e7f3160403b | |
| parent | 663ab27f1598042dd266b196124c735e0c45882c [diff] | |
| parent | b849f6dd638fd1246724160cd5c01ab1a5ff33bd [diff] |
am b849f6dd: Merge "Fix linux build." * commit 'b849f6dd638fd1246724160cd5c01ab1a5ff33bd': Fix linux build.