| commit | 497b044e4bbb986cb612c3336e37ecbe472ca08e | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Mar 23 22:03:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:03:07 2015 +0000 |
| tree | d6543368a81783030ee3a2aef6f7bd4aecb6e8fa | |
| parent | 7754367c4d194337b6df1b87a3ce94e4103b0b74 [diff] | |
| parent | 9b2aba07335200f8a4e676b455706f165ee89ae0 [diff] |
am 9b2aba07: am ec574408: Merge "(Probably) fix the mac build." * commit '9b2aba07335200f8a4e676b455706f165ee89ae0': (Probably) fix the mac build.