tree 055023a36ec75e1ef184edf81e3abd22e0739657
parent 0a08f55f8ec8d938c416f11d6183b7b21f76002a
parent 8ad3b6b29c4a6e6ebab759b6c6c5046359c3d82f
author Stephen Li <stephenli@google.com> 1512689026 +0000
committer Stephen Li <stephenli@google.com> 1512689026 +0000

Manually merge changes from giant AOSP topic

Change-Id: Ie706753a6894f5175b2d00f376ab1966ed9eb4e3