| commit | 0fe8eac25f44159c3d3ebd280dc82abf073eb8ec | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Mar 03 12:35:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 03 12:35:22 2014 +0000 |
| tree | e427da02a92e63857d165d56b26c6777908a6b84 | |
| parent | 3bbfddd2eae96b69be14baeca05726a70062ba6c [diff] | |
| parent | 05e89b22a0bc1bbed1579c1bc6139b45ef41aa88 [diff] |
am 05e89b22: am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp * commit '05e89b22a0bc1bbed1579c1bc6139b45ef41aa88': Amend 64 bit blacklist.