commit | 8ad708c56570d81def649911bdfc42f5c350e4b8 | [log] [tgz] |
---|---|---|
author | Christopher Ferris <cferris@google.com> | Fri May 09 18:19:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 18:19:04 2014 +0000 |
tree | 0e22791c9929fa54f1d6516cd840858ad139b780 | |
parent | 3adbe79d2f14665ff55a9b0db245abebc105658d [diff] | |
parent | c1087e55c63f2c206eae676fd4c237585a64e8e5 [diff] |
am c1087e55: am bf6c2dbe: Merge "Fix mac build." * commit 'c1087e55c63f2c206eae676fd4c237585a64e8e5': Fix mac build.