commit | 7bcbf264ebf8a38efb304069ece4840f58ca0b34 | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Tue Sep 09 17:46:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 17:46:55 2014 +0000 |
tree | 65a13d9a26906f8d3854169db2c4cb5445bee6a9 | |
parent | 51c4684c39346d9b0d5ad3f13adf7f9f715b22f2 [diff] | |
parent | 3298611e205a299612f2e403bfaeb955ec0a2bdd [diff] |
am 3298611e: Merge "Temporarily disable LOS on 64 bit" into lmp-dev * commit '3298611e205a299612f2e403bfaeb955ec0a2bdd': Temporarily disable LOS on 64 bit