| commit | 825c2655b7bbd5f88d316a5a9b3a746c50282c24 | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Thu Mar 26 12:10:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 12:10:35 2015 +0000 |
| tree | 5eb5ccfbf321b4cd49a3dd759ef9e37bd30a06e4 | |
| parent | c28e2598af394834dbf6532f1cf252705fabd76b [diff] | |
| parent | 6ca1dbd442016c41244c59d05d9b3c680aa2d27a [diff] |
am 6ca1dbd4: am 6baab44e: Merge "Fix build" * commit '6ca1dbd442016c41244c59d05d9b3c680aa2d27a': Fix build