Merge "Another attempt at capturing full removal list for 22713865" into marshmallow...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Apr 2016 19:01:12 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Apr 2016 19:01:12 +0000 (19:01 +0000)
am: 32218a6

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

Change-Id: I542b57905584b81d525592f473a2f892cd9ca480


Trivial merge