tree e8abe9c634ed821359ad3bf70a80170f9c7b3e52
parent 1709d22b4ec007da172e2d49ced99847c6f00225
parent ddf293aa0cfe6ba9562ad12bc8555e6f389db53f
author Tao Bao <tbao@google.com> 1476488453 +0000
committer android-build-merger <android-build-merger@google.com> 1476488453 +0000

resolve merge conflicts of 08d0ae9 to stage-aosp-master
am: ddf293aa0c

Change-Id: Ia4fb968c0b45b584a69f28401507826f837a978d