Merge "Another attempt at capturing full removal list for 22713865" into marshmallow...
authorDaniel Xie <dxie@google.com>
Mon, 11 Apr 2016 19:05:17 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Apr 2016 19:05:17 +0000 (19:05 +0000)
am: d3905fb

* commit 'd3905fba06cf4e933d11f5963ae06cc392f64fdf':
  Another attempt at capturing full removal list for 22713865

Change-Id: I943eac4021b849761401b14f002dbbdfcf157f6d


Trivial merge