commit | ebf0b42f0561e8af832d1bed4eb3cc340de3e946 | [log] [tgz] |
---|---|---|
author | Ed Heyl <edheyl@google.com> | Sun Jul 20 18:01:03 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 20 18:01:03 2014 +0000 |
tree | 5ba4edf28f061828465690e125640f45cb08c8ae | |
parent | 0efe173bd825df040e2c2fbcea65ceb79459bade [diff] | |
parent | 65834183bf18a5c03a8d7faf73c2a36fd008c99a [diff] |
am 65834183: am fad4676b: (-s ours) am 6190a0c3: back port cc6be0a3: wrap make. do not merge * commit '65834183bf18a5c03a8d7faf73c2a36fd008c99a': back port cc6be0a3: wrap make. do not merge