tree 2ac9d4b9b538316e08b5b52818a05a74bdb632a9
parent 25a93c3292315606bcf36cbd1165387f4e1bfd21
parent 49bb94e35180621090d443b7a6a6949a017a299b
author Stephen Li <stephenli@google.com> 1512690625 +0000
committer Stephen Li <stephenli@google.com> 1512690625 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ib6b9f9ffff6a0aaec14789bacaa2e4cf59a3d0d1