| commit | 520f6ab13b56bdaeb21ac99d105ac59a052539a7 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Jun 07 15:38:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 07 15:38:01 2013 -0700 |
| tree | 8e1cb0c60520735b3ee5f680ee0e179ad3e2ff62 | |
| parent | e421d1188052f89988d6774b5375cf844dea1cd0 [diff] | |
| parent | 6531a9771a6b5bf32ea1a5febc067c8d39dede5f [diff] |
am 6531a977: Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library." * commit '6531a9771a6b5bf32ea1a5febc067c8d39dede5f': Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.