commit | d6acecc5235303e2a638da4d7f1d7e7de5274eb9 | [log] [tgz] |
---|---|---|
author | Andrew Hsieh <andrewhsieh@google.com> | Fri Oct 31 20:45:03 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 20:45:03 2014 +0000 |
tree | eed8f795578786c113abffab5e9c93375fb26c6f | |
parent | 14e9269784e4d7d6cac008f4e19b07a482813552 [diff] | |
parent | 669841a3bf194c263e305e9018839e6f1313dbb0 [diff] |
am 669841a3: Merge commit \'e00eb88c\' into manualmerge * commit '669841a3bf194c263e305e9018839e6f1313dbb0': Move 64-bit headers/libs to android-21