tree 1bfbded257abaafe163ea0a09326a8b24d712e40
parent 12db6c3cf40c198277e518a78047d5eccb6305ac
parent 25d580912de82d0e359182b36b5c519f5a0d6766
author David Turner <digit@google.com> 1466671393 +0000
committer android-build-merger <android-build-merger@google.com> 1466671393 +0000

resolve merge conflicts of ccd27b0 to stage-aosp-master
am: 25d580912d

Change-Id: I7afa0604b98b90256c47e806fbb8e11d9ac98594