tree 10184a6784738080475d87bba1a619e08e765176
parent acc7ebb92a583fd559b47fe297ce3e458cb0bcb2
parent 03539f5e8313eea9db616d93a53628a7307bcb0c
author Tianjie Xu <xunchang@google.com> 1469674610 +0000
committer android-build-merger <android-build-merger@google.com> 1469674610 +0000

Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d am: 53c34ebdc4
am: 03539f5e83

Change-Id: Iea45e9db6cc0719643f9804535916d283843e719