tree 8ccf571344ab2e2425beea48f179c998e5e35b47
parent 57e0e83427c4c2cfd8b6309f9342426661cfc10f
parent e285ab3aaeed9345b3a43d0a931c46ff326aba26
author Chen Xu <fionaxu@google.com> 1465440433 +0000
committer android-build-merger <android-build-merger@google.com> 1465440433 +0000

Merge \\"resolve merge conflicts of afed6f8 to nyc-dev\\" into nyc-dev am: 0c4f1c7e5c
am: e285ab3aae

Change-Id: I1bd157f297eb024a98e7d85551b7abdcc52bc37e