commit | e15dbad169f6d9fab6a11d158ebd0c8901aaa331 | [log] [tgz] |
---|---|---|
author | Dmitriy Ivanov <dimitry@google.com> | Tue Oct 14 23:23:03 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 23:23:03 2014 +0000 |
tree | 39c7e95031e72302091271ec230792b548bfc2fc | |
parent | 72ba4a75f6dd47979dfa682a74e12eff549848b2 [diff] | |
parent | 67555f1f1c890b12f5936bfa5a25efa70865970a [diff] |
am 67555f1f: Merge "Fixing mac build" * commit '67555f1f1c890b12f5936bfa5a25efa70865970a': Fixing mac build