| commit | 5a8335c3185ec329bf43b1edc733aef38ce76c36 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Jun 03 22:48:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 22:48:05 2014 +0000 |
| tree | 159251e78da884a4e228970a64981085896f393f | |
| parent | 0d31d4877ca451c9e15a0651ab2b4827556afeff [diff] | |
| parent | ed30b7ea75532a5b2963acb8bae23e73493a851b [diff] |
am ed30b7ea: Merge "Fix build." * commit 'ed30b7ea75532a5b2963acb8bae23e73493a851b': Fix build.