tree 36c8583d4ad8238d7281daf816933ef93674c77b
parent d83b06cd318904628c4c3a3696210bf4682c2fd7
parent ac9b2c4fab42f731901960f72a796cbee0712a2a
author Brad Ebinger <breadley@google.com> 1487808227 -0800
committer Brad Ebinger <breadley@google.com> 1487808279 -0800

resolve merge conflicts of ac9b2c4fab42 to stage-aosp-master

Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0