OSDN Git Service

Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus...
authorRobert Sesek <rsesek@google.com>
Fri, 14 Oct 2016 14:13:27 +0000 (14:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 14:13:27 +0000 (14:13 +0000)
commit9a7c9a51f6bc977b60703c8168fd69f8eef6a7f5
treebedea28a617cb14bac919266fc1539a01e084750
parent856a791ddddf136f2da02a6f9a9b8097052e4bc0
parentadb4389cc1ef7e1a4547e52c67f3e1d10613e9ff
Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: adb4389cc1

Change-Id: Ic031be1b1efa6fc5555ad02a4e00f810213deda9