commit | 24dbfdaa701a729e3b231db63787e0d636b7cc3b | [log] [tgz] |
---|---|---|
author | Mark Salyzyn <salyzyn@google.com> | Wed Apr 16 19:51:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 19:51:10 2014 +0000 |
tree | 5fe1cc0b30c9a6674f5a5df2a467191254325377 | |
parent | 6c925305091e6df5eacbb8eb5baaf2c63062a5d9 [diff] | |
parent | 936e87e12dd1335c6f773705fd0a7edb32bc4385 [diff] |
am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" * commit '936e87e12dd1335c6f773705fd0a7edb32bc4385': frameworks: 64 bit compile issues