| commit | b7288e7f577057821a1181f3121dc1f20209b1b7 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Tue Nov 04 23:59:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 23:59:35 2014 +0000 |
| tree | 0667c77f8fa4e2971d9a02287507f89a8c2f57aa | |
| parent | 737b06fed84ee1cedc6f2b60a6eaac32ff9782d2 [diff] | |
| parent | 587e2ec64cbe56717bc978bff914c5f2f1455fe9 [diff] |
am 587e2ec6: Merge "Fix build." * commit '587e2ec64cbe56717bc978bff914c5f2f1455fe9': Fix build.