Dan Cashman c3f9ebda33 Bulk-revert changes caused by AOSP cherry-picks. ... In order to bring AOSP development back in-line with master development, some CLs were cherry-picked individually from internal master to AOSP, which were then merged back into internal master (MERGED-IN was missing). Due to merge-conflict pain, these are being reverted in favor of one big diff. This CL reverts the changes that were auto-merged in as a result, and can be used as the target of MERGED-IN when reverting the individual cherry-picks in AOSP. This reverts commit a08fe91ee5, reversing changes made to 11481d1d95. This reverts commit 7ec5ecfbb7, reversing changes made to 6fecbbb27e. Bug: 37916906 Test: Builds 'n' boots.		2017-09-19 09:47:59 -07:00
..
26.0	Bulk-revert changes caused by AOSP cherry-picks.	2017-09-19 09:47:59 -07:00