tree 49db0f9281ef8d49650fa22af9dec7739810e350
parent 1f1fa8ba374b83eadeab27c98309a54e1e827394
parent 311f99eade1222575bc65a2fcbd9f9a5a40d2024
author Chih-Hung Hsieh <chh@google.com> 1471027926 +0000
committer android-build-merger <android-build-merger@google.com> 1471027926 +0000

resolve merge conflicts of 70066d9 to stage-aosp-master
am: 311f99eade

Change-Id: I8264ed7436d6ffce3106085efad14a58da2f50b5