OSDN Git Service

am 7238435e: (-s ours) resolved conflicts for merge of e869835d to lmp-mr1-ub-dev
authorJohn Reck <jreck@google.com>
Thu, 14 May 2015 00:38:28 +0000 (00:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 00:38:28 +0000 (00:38 +0000)
commite3a6a69acb910890371ce741940e1d3e5293389f
treebde28fb62a3b2b5250a928a979d89a01a0941bd6
parent6495ef975f330d07370da46f69a7e808b3177467
parent7238435e9b3f133965b63abc7b352b34f9401af5
am 7238435e: (-s ours) resolved conflicts for merge of e869835d to lmp-mr1-ub-dev

* commit '7238435e9b3f133965b63abc7b352b34f9401af5':
  DO NOT MERGE Backport of limited jank-tracking metrics