OSDN Git Service

am a0f6b87b: am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of...
authorJohn Reck <jreck@google.com>
Thu, 14 May 2015 16:30:23 +0000 (16:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 16:30:23 +0000 (16:30 +0000)
commit24098a403ee1f1779a57df6f227d5a096f2d7c0f
treeb455752d80d5854761d8474314983c2ccb2aaa0f
parentf0eb54fe53231003281173e803d4b78bb79435f5
parenta0f6b87bbbbc10700aa14d2c4d9191fe1f064a60
am a0f6b87b: am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

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