Merge "Take reference data into account in memory usage tracking am: d923e3ef94 am...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 29 Apr 2016 05:55:36 +0000 (05:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 29 Apr 2016 05:55:36 +0000 (05:55 +0000)

Trivial merge