tree cfebc3fae3a02f2edb778e80e3482d817c2c9092
parent 1e67422f3734abb41f5d57d539a41f70fe424161
parent 490fad67912dbef1281ebe7d943d3f95c79c370e
author Tao Bao <tbao@google.com> 1465868204 -0700
committer Tao Bao <tbao@google.com> 1465870366 -0700

resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp

Change-Id: I299fe15977c1a59d0c784728872c3a7f63c95e56