tree 003580652a9611802a8db7a021fdb843515a5bcd
parent 7b2faa9e987da0a5505161de447f56d091d7959f
parent 30acc25eb94b635f7b2924deb3d9be3d9812ed3c
author Dmitry Shmidt <dimitrysh@google.com> 1505935871 +0000
committer android-build-merger <android-build-merger@google.com> 1505935871 +0000

resolve merge conflicts of c313d91 to stage-aosp-master
am: 30acc25eb9

Change-Id: Ib45ff2fd0b081b3502228dca6b8a89d42ccf4b5a