| commit | 04aa0fdda60b6a492e572c2a79f21c732e8c33c8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jan 15 13:37:56 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 15 13:37:56 2013 -0800 |
| tree | 845fe08549ab94bc6ce50e427a67b1a613d55ae6 | |
| parent | d29c9fc18860a41f59d390b4aab937b61dd63ea1 [diff] | |
| parent | 42c5847d65d3e50a3efc4e32bb913dc66c9d0e4d [diff] |
am 42c5847d: (-s ours) am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""" * commit '42c5847d65d3e50a3efc4e32bb913dc66c9d0e4d': Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""