Merge "Take reference data into account in memory usage tracking am: d923e3ef94 am...
authorMika Isojärvi <misojarvi@google.com>
Fri, 29 Apr 2016 05:58:17 +0000 (05:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 05:58:17 +0000 (05:58 +0000)
am: 99b563c1bf

* commit '99b563c1bfd459a44a5cb95de65c0c23e9592a44':

Change-Id: I4fa80e8d492787901c709454cef53abb82798b68


Trivial merge