tree d8cb6f43f1d81b42f6093c289784fa8411cfad69
parent dd740c6817a20dd0be59eeec4c54b16e99c135c8
parent 538ed261ebdc1234b09c3a5289476764d3ab5f40
author Tao Bao <tbao@google.com> 1468253770 +0000
committer android-build-merger <android-build-merger@google.com> 1468253770 +0000

resolve merge conflicts of 4058a71 to stage-aosp-master
am: 538ed261eb

Change-Id: I2ef81a2279ba62bc00c2a40d703666411877058f