tree 7f49e4bc77afaf6d4de54a0cce83635ccd7ffcda
parent d3c96cea7725faa318bfae9d2054a30b7db24333
parent 4921295f38dbc47bf2a4db5c90bdb30a046c438a
author Xin Li <delphij@google.com> 1469143503 +0000
committer android-build-merger <android-build-merger@google.com> 1469143503 +0000

Merge \\\"Update instructions for merging upstream changes.\\\" am: 17f8bff8b0 am: 783c166ae6
am: 4921295f38

Change-Id: I8473ce47313fda348bd730450c2da8ace7f0e11f