OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0eb54f a0f6b87)
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)
* commit 'a0f6b87bbbbc10700aa14d2c4d9191fe1f064a60':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help