| commit | 2eda01018250d9253bc54da9f6896d58dba1f601 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Feb 27 13:59:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 27 13:59:26 2014 +0000 |
| tree | 814307122170c9af832cb97916b27a236d8516c6 | |
| parent | 0367389746e36b5d11288838ae086cc30606fd03 [diff] | |
| parent | de34aea544cb4222f24e4157b96962b09445e2c5 [diff] |
am de34aea5: am 5303f9d3: resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp * commit 'de34aea544cb4222f24e4157b96962b09445e2c5': Various fixes for LP64