commit | 202573cd02bbdf518d2084c9a382be4f1552358b | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Fri Jun 07 17:36:51 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 07 17:36:51 2013 -0700 |
tree | ce4d5f76ff61f7d40f99ff6d8b45c5b40db05e7d | |
parent | 2aa1e0a8aa82d899672cecb9c7044bff49191d5a [diff] | |
parent | 520f6ab13b56bdaeb21ac99d105ac59a052539a7 [diff] |
am 520f6ab1: am 6531a977: Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library." * commit '520f6ab13b56bdaeb21ac99d105ac59a052539a7': Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.