tree dd621bd367b0fd0ae755d0cd7782e5287a8b9c70
parent 57280035f12f8fcc58374291137d2f1b2b65629d
parent 12f817a9273799606fa8b4fc1c5b94a1936083ca
author Esteban de la Canal <estebandlc@google.com> 1425402989 +0000
committer android-build-merger <android-build-merger@google.com> 1425402989 +0000

Merge "Fixes rendering of hiccups and oddities in CPU monitor." into studio-1.2-dev automerge: 5dc108b automerge: 04a5343
automerge: 12f817a

* commit '12f817a9273799606fa8b4fc1c5b94a1936083ca':
  Fixes rendering of hiccups and oddities in CPU monitor.