tree dbe210462ed216718dac9ecd67dae5287869d6af
parent c480902bfedbdd69474ae1c77cabb92ab018dd1c
parent 61f5fb5025b6b62940cd4edf809a617d124b4f42
author Stephen Li <stephenli@google.com> 1512689400 +0000
committer Stephen Li <stephenli@google.com> 1512689400 +0000

Manually merge changes from giant AOSP topic

Change-Id: I7d3c3790c44c3d2bb8346c1edc5ff402ce78938b