tree 755f2bcfc3af4e3a07c08ce29e5c9cadf62c2204
parent 67c542f374bde04aa39d96442bddadcac0da09c3
parent e58c7805711b76fcb92fad0b7c4a57651176cf50
author CY Cheng <cycheng@google.com> 1534407398 +0800
committer CY Cheng <cycheng@google.com> 1534416229 +0000

resolve merge conflicts of e58c7805711b76fcb92fad0b7c4a57651176cf50 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352