| commit | 0ae35a8a26be0c2be53e5d149aead4d5d32ad07f | [log] [tgz] |
|---|---|---|
| author | Jinsuk Kim <jinsukkim@google.com> | Tue Jan 20 23:54:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 20 23:54:47 2015 +0000 |
| tree | d8cae5e8e1acc62ad7ac2b44c56802b7142d6fa9 | |
| parent | 0a5be32d7a70d510fcdda030bdb34e31ec22ebe0 [diff] | |
| parent | 00959a56e5869fcb8d05399656fddc9da54e86dc [diff] |
am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev automerge: 375ae7b * commit '00959a56e5869fcb8d05399656fddc9da54e86dc': Mark TimeUnit as @SystemApi