tree 95df40add23e127030abe0cb224c606659a33932
parent 2fc7cd69fd93df4bf2fb415acfd04cb02e905830
parent 274d17dc0fa3d4c5c4271150c1acee271144b1f1
author Elliott Hughes <enh@google.com> 1466029685 +0000
committer android-build-merger <android-build-merger@google.com> 1466029685 +0000

resolve merge conflicts of 179c0d8 to stage-aosp-master
am: 274d17dc0f

Change-Id: I356adf332d5749a6d3f3e29b99bf3fca35de349a