| commit | a49fb2ea8dd1760e39023eb0bf03467c793aed7c | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Apr 16 22:20:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 16 22:20:33 2015 +0000 |
| tree | 050e70169920ab955852346f8b85773a287b6c59 | |
| parent | 4e9748cf01a96241be1066cb58057bb74a553ca6 [diff] | |
| parent | e8d0a6f0cc2ec86780409f578dfcf6f2988befb0 [diff] |
am e8d0a6f0: am a96bca9a: am 11c9cd45: Merge "Fix build" * commit 'e8d0a6f0cc2ec86780409f578dfcf6f2988befb0': Fix build