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)
commit99b563c1bfd459a44a5cb95de65c0c23e9592a44
tree9350857265c61d2c288ca6b5029e2dba2d024d43
parentb5031e5f4a5c247fcd182567298adfc73c98b4f0
parent9465b056a3d092c42fc8205694ee1f33babcf787
Merge "Take reference data into account in memory usage tracking am: d923e3ef94 am: f11d0aef46" into nyc-mr1-dev-plus-aosp