OSDN Git Service

resolve merge conflicts of 9600df0 to stage-aosp-master
authorJason Monk <jmonk@google.com>
Tue, 6 Dec 2016 16:43:38 +0000 (16:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 16:43:38 +0000 (16:43 +0000)
commit99db203f2942381b8c7765679bb0d44dbe0ec952
treeaf89a3e8b432c35a94b74d8702d8592809ced43f
parentfee17700af9d9be42d2c146514a7e9e66f64e55a
parentf120cf3d886753b4ae28bda48b1d2b10b754798c
resolve merge conflicts of 9600df0 to stage-aosp-master
am: f120cf3d88

Change-Id: Id2c5d4905fed661466929ed93e08e7b079c8c51d