tree 63fdefb9c07ba807df10484fd591f4288a90a618
parent 0a2178e36cf0583c7a9771845a14bebcf365140f
parent 697e6d5bd679cb84a11e1f8abbf49f6e948c7b04
author android-build-team Robot <android-build-team-robot@google.com> 1495056157 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1495056157 +0000

Merge cherrypicks of [2279097, 2279204, 2279032, 2279240, 2279164, 2279228, 2279260, 2279055, 2279261, 2279111, 2279078, 2279265, 2279168, 2279211, 2279232, 2279234, 2279266, 2279301, 2279269, 2279405] into oc-release

Change-Id: Ife0300be589ebe856abe75adf8073fe9c4f9e93f