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