tree 11e056bb3d72d766f16136e04a48afd77c52bf59
parent 39b7da6a8a76ba426d1a3f82b1599df88e3dc9ad
parent 5023ed031a81f04c01330d8cbaed7f63695c6864
author Stephen Li <stephenli@google.com> 1512689279 +0000
committer Stephen Li <stephenli@google.com> 1512689279 +0000

Manually merge changes from giant AOSP topic

Change-Id: I31829b5aab2a355d1093d51cef006b0277f3fe32