tree 67dc0801e20a7b16834930057baf9de5d3f683e5
parent fc60583a2c494414840fa181438135d1926aba8a
parent a58a6dbe3d06aace0d1419838e162aa5267a4fc0
author Yabin Cui <yabinc@google.com> 1460165581 -0700
committer Yabin Cui <yabinc@google.com> 1460165581 -0700

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

Change-Id: I6d95fbd33f570d60e2caf42931ef6aa9f2634239