| commit | e2e5a7adb959d0f48fc80a89990c9d911de570dc | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 20:15:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 20:15:50 2015 +0000 |
| tree | ff24fedbb27a46a702981e93f285925ec326e1f6 | |
| parent | b8772117632ab073c86d85e80f6050ff2f5d26fa [diff] | |
| parent | 2dd5ec2996d0d6685225e2d91bca87ee405a3c18 [diff] |
am b1640723: am 5d996053: am 3f68bc25: Merge "Probably fix the Mac build." * commit 'b164072341ca6b60d99675a9fa46565d0a11b4af': Probably fix the Mac build.