OSDN Git Service

am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp...
authorJohn Reck <jreck@google.com>
Thu, 14 May 2015 14:51:06 +0000 (14:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 14:51:06 +0000 (14:51 +0000)
commita0f6b87bbbbc10700aa14d2c4d9191fe1f064a60
treeff8a7b2404f4903f5404a49b02cec6c2a052df53
parentfa660f79e9551ca46efa6eaed26cff06095fbcd8
parent570b2052bb8eec8c510941b0a6d77262df28b922
am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

* commit '570b2052bb8eec8c510941b0a6d77262df28b922':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"