| commit | c1d6685b158ac5e64bba9a461f5c6f0ee26efc82 | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Thu Mar 26 16:27:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 16:27:48 2015 +0000 |
| tree | c01c13ab344f6387e472298ef9b1e41ddee82974 | |
| parent | b042a2e8bdb932d13fd2684d90cf92db09b6039f [diff] | |
| parent | 825c2655b7bbd5f88d316a5a9b3a746c50282c24 [diff] |
am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build" * commit '825c2655b7bbd5f88d316a5a9b3a746c50282c24': Fix build