| commit | 375ae7ba3263ee8eceeb371b170e9181c801c612 | [log] [tgz] |
|---|---|---|
| author | Jinsuk Kim <jinsukkim@google.com> | Tue Jan 20 22:43:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 20 22:43:34 2015 +0000 |
| tree | c6b8a24313d0c1fa6e6e9141face5133acb53a0b | |
| parent | 03d7cc3c24e7d89d82394c9d0cfc8e0c3423687f [diff] | |
| parent | 054f2656a17a438aa6e8c8f6dcd61b1217f41b88 [diff] |
am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev * commit '054f2656a17a438aa6e8c8f6dcd61b1217f41b88': Mark TimeUnit as @SystemApi