OSDN Git Service

Merge "Fix the build"
authorChris Craik <ccraik@google.com>
Wed, 13 Jan 2016 02:27:29 +0000 (02:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Jan 2016 02:27:29 +0000 (02:27 +0000)
commit860c7669fe84ba8560435bf759c5421eb8d4642e
treefb97a04b0a2fdf4a06bd40f9d98bfb4bfec68179
parente5d6e7c8f9187d6a9be4e303590d8a7587d2b49c
parent48cb62018c7d86f1c09935b511dfb8aa1c26ceab
Merge "Fix the build"