tree 30396f2384790c9b4a29fd7867b8e74417d57f25
parent 48d196b9c50afe9aff50f4f8ec6acc6a066bbfdb
parent 248ef6f9c414db26fd1bc7ec3d4ee4f3b87d54cf
author Yohann Roussel <yroussel@google.com> 1417685210 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417685214 +0000

Merge "Allow compilation with Jack."