tree 46bd455a229ddc7865d90e867fadc8aec80f1c28
parent 56e22336c81ad304ba0dea470778ccc44fb947d1
parent d072ed36344ea06b53d6e821ccf58aef16c3c260
author Chih-Hung Hsieh <chh@google.com> 1470084294 -0700
committer Chih-Hung Hsieh <chh@google.com> 1470084294 -0700

resolve merge conflicts of d072ed3 to nyc-mr1-dev-plus-aosp

Change-Id: Ifdd67548e252fcd73833a9d017aa8205bf749f70