am 441cb04e: Merge change 5732 into donut
am 441cb04e: Merge change 5732 into donut

Merge commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62'

* commit '441cb04efc0048585b3a6e6fa3d564e3d1b26f62':
  Fix assertContentsInOrder (bug 1790350).

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base