| commit | d676f3e69fce7bd67b672b270ab0240bfa69ce23 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Tue Jun 12 13:14:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 13:14:45 2012 -0700 |
| tree | 0ef0daf6d417d2c3aa4b9dfc281e198f2b9775d0 | |
| parent | d4e82e01ee14a8c586e50348bcfa3cdf5aecffd1 [diff] | |
| parent | 82c11caca04bc4e14e0a33057f484635dc1ae8dc [diff] |
am 82c11cac: am f3b1395a: Merge "Add atrace to core.mk" into jb-dev * commit '82c11caca04bc4e14e0a33057f484635dc1ae8dc': Add atrace to core.mk