tree cdbfbc1ba3091fece6c51f8f6428682d68693d68
parent 7a71f99866120de04613820a29c45c9e36678ab4
parent 0c6abc9dc5baa5d7f1a09df1ae82b2954e0f7285
author Jae Shin <jaeshin@google.com> 1505489947 +0000
committer android-build-merger <android-build-merger@google.com> 1505489947 +0000

resolve merge conflicts of 9414ec081 to stage-aosp-master am: 13d685964e am: 0f3bcdff99  -s ours
am: 0c6abc9dc5  -s ours

Change-Id: I2cf6b4793f06d7169af546ebecb692758911d781