OSDN Git Service

resolve merge conflicts of 0783d5f to stage-aosp-master
authorDan Willemsen <dwillemsen@google.com>
Fri, 5 Aug 2016 22:57:47 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 22:57:47 +0000 (22:57 +0000)
commit35ea9f855639f74cc3a5aca38927977fc6a7c97e
tree5ff6a1b0d2106d520764f3fed25aec826d464522
parentfb4a57b5c4c0195358364d955050218936599c7b
parent2a001e8bfe0255242740df7d9674408820f13627
resolve merge conflicts of 0783d5f to stage-aosp-master
am: 2a001e8bfe

Change-Id: Ib0fc16f4a35761c0b2a3e3273800e1f27e527577