tree 9ca1b86b92fd48a24ec75b35dd1209318fc1763d
parent fc7cbe465f7eb175e33e1939753d435c33c361cf
parent 9da825940d4a764b1ac5fe77d40367a4f052c57b
author Tianjie Xu <xunchang@google.com> 1469673998 +0000
committer android-build-merger <android-build-merger@google.com> 1469673998 +0000

Resolve merge conflicts of 286848e to stage-aosp-master
am: 9da825940d

Change-Id: Ibbb885ee643e909ff00cd302c62b112c645c68ca