| commit | abf50ac4f7e381d9202ecd4bf05c41983e52bafc | [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 | 9fd80367d55de0597d0474e4a672ceef8ea5cd4d [diff] | |
| parent | b0d8854cfbfe725d413381a7e4b3ba587bdb32ab [diff] |
am 6baab44e: Merge "Fix build" * commit '6baab44eed58ed647cfd18a117e6ea9f9a52c2a5': Fix build