Snap for 5590969 from 8279f3618c40dea389047bca07e9d580f245d690 to sdk-release

Change-Id: Ie97ed0eafe4014c75d9cbb42d7734f34d7ce8631
tree: ac6f7b1c49adc54092bcd2a3f4f0394a6bb071f8
  1. java/
  2. Android.bp