tree 65410f83e121df55cbdec80e9b2f746096810cf7
parent 7e612db065bcbc36837703567ab395174d68473d
parent 7563bad2ac1c207985ee4c13a78e05c7b1d0846e
author Tao Bao <tbao@google.com> 1479283806 +0000
committer android-build-merger <android-build-merger@google.com> 1479283806 +0000

resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911
am: 7563bad2ac

Change-Id: Ief61d93f6e448da66a61052a180e650e15210e3e