| commit | 53363f4fa0e8ab38f0b75252b105162b6d86354f | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Jun 04 00:11:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 00:11:52 2014 +0000 |
| tree | b0e42bfca33273a9e86da17a58764023af1694fd | |
| parent | 3c9f410e1679fe42257872e98ffa544ca0cdd691 [diff] | |
| parent | 5a8335c3185ec329bf43b1edc733aef38ce76c36 [diff] |
am 5a8335c3: am ed30b7ea: Merge "Fix build." * commit '5a8335c3185ec329bf43b1edc733aef38ce76c36': Fix build.