tree ecf7ef13fbe1e231db7f7c5b010924c2fad29ea6
parent e13a690c16a08fbcbcb13c4f271f24fc259f49b3
parent fe8e356b7da70853e8fd76e38ce90b9dbf238a4f
author Tao Bao <tbao@google.com> 1464991054 -0700
committer Tao Bao <tbao@google.com> 1464991054 -0700

resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp

Change-Id: I18ecc333a76860405028b90b0baf2fba78d3942e