author | Dan Albert <danalbert@google.com> | |
Mon, 16 Jun 2014 22:13:08 +0000 (22:13 +0000) | ||
committer | Android Git Automerger <android-git-automerger@android.com> | |
Mon, 16 Jun 2014 22:13:08 +0000 (22:13 +0000) |
* commit 'c732859d241a182dc0a9c8b2a2bca9ec5926cd39':
Revert "Revert "Remove ftime from bionic LP64""
Revert "Revert "Remove ftime from bionic LP64""
Trivial merge