commit | fa7970e0af52e35fd0dc7cf66b86e303eb58acba | [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 | 60b2fd51a2604df4278e30ccf2210665eb481d37 [diff] | |
parent | abf50ac4f7e381d9202ecd4bf05c41983e52bafc [diff] |
am 6ca1dbd4: am 6baab44e: Merge "Fix build" * commit '6ca1dbd442016c41244c59d05d9b3c680aa2d27a': Fix build