tree 543d35d405abe2696c8addb97afab28c17d6bf71
parent 2f196e6c81e50b70d56c1cc06fd2aec147b58ed8
parent 7b5be4c0c741e44a8592ece40902eb0071f6d138
author Lorenzo Colitti <lorenzo@google.com> 1426146563 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1426146563 +0000

Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"