| commit | 65834183bf18a5c03a8d7faf73c2a36fd008c99a | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Sat Jul 19 00:41:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 19 00:41:22 2014 +0000 |
| tree | 85961c95785e9ab461cd681a2c5a5ec325b0478a | |
| parent | 1756474d873130d3340310782bc397733c80a8b6 [diff] | |
| parent | fad4676b67944acd14d2241ac666bbc5e69b6d54 [diff] |
am fad4676b: (-s ours) am 6190a0c3: back port cc6be0a3: wrap make. do not merge * commit 'fad4676b67944acd14d2241ac666bbc5e69b6d54': back port cc6be0a3: wrap make. do not merge