| commit | a96bca9abb7f31591af69c0cba08638bdf48dd79 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Apr 16 21:45:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 16 21:45:54 2015 +0000 |
| tree | 050e70169920ab955852346f8b85773a287b6c59 | |
| parent | c9dcc5775fe0cb23634df9f1e191b7f45de4de07 [diff] | |
| parent | 11c9cd45f2aadad5622fef4b3e81b9e2181ebae3 [diff] |
am 11c9cd45: Merge "Fix build" * commit '11c9cd45f2aadad5622fef4b3e81b9e2181ebae3': Fix build