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