tree 943d1e546887dd8d184d1e722e8146f56887df55
parent fd1bfa1743a281fdd00832420ba6df247197041d
parent e08ac9810b77de22840fc5550d93afaf8ea4bf3a
author Stephen Li <stephenli@google.com> 1512690813 +0000
committer Stephen Li <stephenli@google.com> 1512690813 +0000

Manually merge changes from giant AOSP topic

Change-Id: I86d31efe5216119c81a94bc6d2c499f2a4ba2016