OSDN Git Service

resolve merge conflicts of cf85fd5 to stage-aosp-master
authorColin Cross <ccross@android.com>
Fri, 15 Jul 2016 23:53:37 +0000 (23:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 23:53:37 +0000 (23:53 +0000)
commitfa3572cdec641131c6683467606f5e37e384d9cf
tree5854f3a3c011b17a50e66b86ead539eb72e42702
parentbba8702d7a22944413d5fb83229c9211d337df59
parent476950d104b31e3b22bea5ed207b3febbaa0f99b
resolve merge conflicts of cf85fd5 to stage-aosp-master
am: 476950d104

Change-Id: I9663cbb46481cc026728a0ada38b061a3260dba1