| commit | 9149c7abb29e94ff71a1a30dc9382b2638801ce6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 28 22:18:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 22:18:03 2014 +0000 |
| tree | 6bd031fc3934ef0408700334d561fbca23694863 | |
| parent | c9ad54e8ec76af06e30cdc38ec6af2d5ca0dc238 [diff] | |
| parent | a487fb77dff1a86fbd160694de41e32b74f10cb1 [diff] |
am a487fb77: am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." * commit 'a487fb77dff1a86fbd160694de41e32b74f10cb1': Updated Trace.h to recognize ATRACE_TAG_BIONIC.