OSDN Git Service

am 572041e6: am ec0c99a6: Add atrace for supporting systrace tool
authorNick Vaccaro <nvaccaro@google.com>
Mon, 12 May 2014 23:18:07 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:18:07 +0000 (23:18 +0000)
* commit '572041e6d083f9eb056d91ae139fdde4b1162716':


Trivial merge